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
7e01e2c0
Commit
7e01e2c0
authored
Mar 12, 2015
by
Poul-Henning Kamp
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Use VTCP_listen_on()
parent
7b8e01ef
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
10 additions
and
9 deletions
+10
-9
vtc_server.c
bin/varnishtest/vtc_server.c
+6
-8
vtc_varnish.c
bin/varnishtest/vtc_varnish.c
+4
-1
No files found.
bin/varnishtest/vtc_server.c
View file @
7e01e2c0
...
...
@@ -156,19 +156,17 @@ server_delete(struct server *s)
static
void
server_start
(
struct
server
*
s
)
{
int
nadd
r
;
const
char
*
er
r
;
CHECK_OBJ_NOTNULL
(
s
,
SERVER_MAGIC
);
vtc_log
(
s
->
vl
,
2
,
"Starting server"
);
if
(
s
->
sock
<
0
)
{
naddr
=
VSS_resolve
(
s
->
listen
,
"0"
,
&
s
->
vss_add
r
);
if
(
naddr
!=
1
)
s
->
sock
=
VTCP_listen_on
(
s
->
listen
,
"0"
,
s
->
depth
,
&
er
r
);
if
(
err
!=
NULL
)
vtc_log
(
s
->
vl
,
0
,
"Server s listen address not unique"
"
\"
%s
\"
resolves to (%d) sockets"
,
s
->
listen
,
naddr
);
s
->
sock
=
VSS_listen
(
s
->
vss_addr
[
0
],
s
->
depth
);
assert
(
s
->
sock
>=
0
);
"Server s listen address cannot be resolved: %s"
,
err
);
assert
(
s
->
sock
>
0
);
VTCP_myname
(
s
->
sock
,
s
->
aaddr
,
sizeof
s
->
aaddr
,
s
->
aport
,
sizeof
s
->
aport
);
macro_def
(
s
->
vl
,
s
->
name
,
"addr"
,
"%s"
,
s
->
aaddr
);
...
...
bin/varnishtest/vtc_varnish.c
View file @
7e01e2c0
...
...
@@ -371,6 +371,7 @@ varnish_launch(struct varnish *v)
char
abuf
[
128
],
pbuf
[
128
];
struct
pollfd
fd
[
2
];
enum
VCLI_status_e
u
;
const
char
*
err
;
char
*
r
;
v
->
vd
=
VSM_New
();
...
...
@@ -378,7 +379,9 @@ varnish_launch(struct varnish *v)
/* Create listener socket */
nap
=
VSS_resolve
(
"127.0.0.1"
,
"0"
,
&
ap
);
AN
(
nap
);
v
->
cli_fd
=
VSS_listen
(
ap
[
0
],
1
);
v
->
cli_fd
=
VTCP_listen_on
(
"127.0.0.1:0"
,
NULL
,
1
,
&
err
);
if
(
err
!=
NULL
)
vtc_log
(
v
->
vl
,
0
,
"Create CLI listen socket failed: %s"
,
err
);
assert
(
v
->
cli_fd
>
0
);
VTCP_myname
(
v
->
cli_fd
,
abuf
,
sizeof
abuf
,
pbuf
,
sizeof
pbuf
);
...
...
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