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
f44b0c31
Commit
f44b0c31
authored
Jan 05, 2021
by
Poul-Henning Kamp
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Retire preformatted backend addresses, TcpPool provides those in case of panic.
parent
0664f1da
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
3 additions
and
15 deletions
+3
-15
vrt.h
include/vrt.h
+0
-6
vcc_backend.c
lib/libvcc/vcc_backend.c
+0
-3
vmod_debug_dyn.c
lib/libvmod_debug/vmod_debug_dyn.c
+3
-6
No files found.
include/vrt.h
View file @
f44b0c31
...
...
@@ -395,9 +395,6 @@ struct vrt_endpoint {
#define VRT_BACKEND_FIELDS(rigid) \
rigid char *vcl_name; \
rigid char *ipv4_addr; \
rigid char *ipv6_addr; \
rigid char *port; \
rigid char *hosthdr; \
vtim_dur connect_timeout; \
vtim_dur first_byte_timeout; \
...
...
@@ -408,9 +405,6 @@ struct vrt_endpoint {
#define VRT_BACKEND_HANDLE() \
do { \
DA(vcl_name); \
DA(ipv4_addr); \
DA(ipv6_addr); \
DA(port); \
DA(hosthdr); \
DN(connect_timeout); \
DN(first_byte_timeout); \
...
...
lib/libvcc/vcc_backend.c
View file @
f44b0c31
...
...
@@ -77,15 +77,12 @@ Emit_Sockaddr(struct vcc *tl, struct vsb *vsb1, const struct token *t_host,
VSB_printf
(
vsb1
,
"
\t
.ipv4 = (const struct suckaddr *)%s,
\n
"
,
ipv4
);
Fb
(
tl
,
0
,
"
\t
.ipv4_addr =
\"
%s
\"
,
\n
"
,
ipv4a
);
}
if
(
ipv6
!=
NULL
)
{
VSB_printf
(
vsb1
,
"
\t
.ipv6 = (const struct suckaddr *)%s,
\n
"
,
ipv6
);
Fb
(
tl
,
0
,
"
\t
.ipv6_addr =
\"
%s
\"
,
\n
"
,
ipv6a
);
}
Fb
(
tl
,
0
,
"
\t
.port =
\"
%s
\"
,
\n
"
,
pa
);
VSB_printf
(
vsb1
,
"
\t
.uds_path = (void *) 0,
\n
"
);
}
...
...
lib/libvmod_debug/vmod_debug_dyn.c
View file @
f44b0c31
...
...
@@ -75,20 +75,17 @@ dyn_dir_init(VRT_CTX, struct xyzzy_debug_dyn *dyn,
INIT_OBJ
(
&
vep
,
VRT_ENDPOINT_MAGIC
);
INIT_OBJ
(
&
vrt
,
VRT_BACKEND_MAGIC
);
vrt
.
endpoint
=
&
vep
;
vrt
.
port
=
port
;
vrt
.
vcl_name
=
dyn
->
vcl_name
;
vrt
.
hosthdr
=
addr
;
vrt
.
probe
=
probe
;
sa
=
VSS_ResolveOne
(
NULL
,
addr
,
port
,
AF_UNSPEC
,
SOCK_STREAM
,
0
);
AN
(
sa
);
if
(
VSA_Get_Proto
(
sa
)
==
AF_INET
)
{
vrt
.
ipv4_addr
=
addr
;
if
(
VSA_Get_Proto
(
sa
)
==
AF_INET
)
vep
.
ipv4
=
sa
;
}
else
if
(
VSA_Get_Proto
(
sa
)
==
AF_INET6
)
{
vrt
.
ipv6_addr
=
addr
;
else
if
(
VSA_Get_Proto
(
sa
)
==
AF_INET6
)
vep
.
ipv6
=
sa
;
}
else
else
WRONG
(
"Wrong proto family"
);
dir
=
VRT_new_backend
(
ctx
,
&
vrt
);
...
...
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