Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
varnish-cache
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Commits
Open sidebar
varnishcache
varnish-cache
Commits
22600aac
Commit
22600aac
authored
Jan 08, 2015
by
Poul-Henning Kamp
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Add an official VSA_Clone() function.
parent
356144b7
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
15 additions
and
17 deletions
+15
-17
cache_backend_cfg.c
bin/varnishd/cache/cache_backend_cfg.c
+2
-17
vsa.h
include/vsa.h
+1
-0
vsa.c
lib/libvarnish/vsa.c
+12
-0
No files found.
bin/varnishd/cache/cache_backend_cfg.c
View file @
22600aac
...
...
@@ -154,21 +154,6 @@ VBE_DropRefConn(struct backend *b, const struct acct_bereq *acct_bereq)
VBE_DropRefLocked
(
b
,
acct_bereq
);
}
/*--------------------------------------------------------------------
* See lib/libvcc/vcc_backend.c::emit_sockaddr()
*/
static
void
copy_sockaddr
(
struct
suckaddr
**
sa
,
const
struct
suckaddr
*
src
)
{
assert
(
VSA_Sane
(
src
));
*
sa
=
calloc
(
1
,
vsa_suckaddr_len
);
XXXAN
(
*
sa
);
memcpy
(
*
sa
,
src
,
vsa_suckaddr_len
);
assert
(
VSA_Sane
(
*
sa
));
}
/*--------------------------------------------------------------------
* Add a backend/director instance when loading a VCL.
* If an existing backend is matched, grab a refcount and return.
...
...
@@ -232,9 +217,9 @@ VBE_AddBackend(struct cli *cli, const struct vrt_backend *vb)
* Copy over the sockaddrs
*/
if
(
vb
->
ipv4_suckaddr
!=
NULL
)
copy_sockaddr
(
&
b
->
ipv4
,
vb
->
ipv4_suckaddr
);
b
->
ipv4
=
VSA_Clone
(
vb
->
ipv4_suckaddr
);
if
(
vb
->
ipv6_suckaddr
!=
NULL
)
copy_sockaddr
(
&
b
->
ipv6
,
vb
->
ipv6_suckaddr
);
b
->
ipv6
=
VSA_Clone
(
vb
->
ipv6_suckaddr
);
assert
(
b
->
ipv4
!=
NULL
||
b
->
ipv6
!=
NULL
);
...
...
include/vsa.h
View file @
22600aac
...
...
@@ -37,6 +37,7 @@ int VSA_Sane(const struct suckaddr *);
socklen_t
VSA_Len
(
const
struct
suckaddr
*
);
unsigned
VSA_Port
(
const
struct
suckaddr
*
);
int
VSA_Compare
(
const
struct
suckaddr
*
,
const
struct
suckaddr
*
);
struct
suckaddr
*
VSA_Clone
(
const
struct
suckaddr
*
sua
);
const
struct
sockaddr
*
VSA_Get_Sockaddr
(
const
struct
suckaddr
*
,
socklen_t
*
sl
);
...
...
lib/libvarnish/vsa.c
View file @
22600aac
...
...
@@ -323,6 +323,18 @@ VSA_Compare(const struct suckaddr *sua1, const struct suckaddr *sua2)
return
(
memcmp
(
sua1
,
sua2
,
vsa_suckaddr_len
));
}
struct
suckaddr
*
VSA_Clone
(
const
struct
suckaddr
*
sua
)
{
struct
suckaddr
*
sua2
;
assert
(
VSA_Sane
(
sua
));
sua2
=
calloc
(
1
,
vsa_suckaddr_len
);
XXXAN
(
sua2
);
memcpy
(
sua2
,
sua
,
vsa_suckaddr_len
);
return
(
sua2
);
}
unsigned
VSA_Port
(
const
struct
suckaddr
*
sua
)
{
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment