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
7a28f076
Commit
7a28f076
authored
Nov 13, 2019
by
Dridi Boukelmoune
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Move the VTC client connection to its own function
parent
da8ea916
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
27 additions
and
17 deletions
+27
-17
vtc_client.c
bin/varnishtest/vtc_client.c
+27
-17
No files found.
bin/varnishtest/vtc_client.c
View file @
7a28f076
...
@@ -54,6 +54,7 @@ struct client {
...
@@ -54,6 +54,7 @@ struct client {
char
*
spec
;
char
*
spec
;
char
connect
[
256
];
char
connect
[
256
];
const
char
*
addr
;
int
rcvbuf
;
int
rcvbuf
;
char
*
proxy_spec
;
char
*
proxy_spec
;
...
@@ -180,6 +181,27 @@ client_uds_connect(struct vtclog *vl, const char *path, double tmo,
...
@@ -180,6 +181,27 @@ client_uds_connect(struct vtclog *vl, const char *path, double tmo,
return
(
fd
);
return
(
fd
);
}
}
static
int
client_connect
(
struct
vtclog
*
vl
,
struct
client
*
c
)
{
const
char
*
err
;
int
fd
;
vtc_log
(
vl
,
3
,
"Connect to %s"
,
c
->
addr
);
if
(
*
c
->
addr
==
'/'
)
fd
=
client_uds_connect
(
vl
,
c
->
addr
,
10
.,
&
err
);
else
fd
=
client_tcp_connect
(
vl
,
c
->
addr
,
10
.,
&
err
);
if
(
fd
<
0
)
vtc_fatal
(
c
->
vl
,
"Failed to open %s: %s"
,
c
->
addr
,
err
);
/* VTCP_blocking does its own checks, trust it */
VTCP_blocking
(
fd
);
if
(
c
->
proxy_spec
!=
NULL
)
client_proxy
(
vl
,
fd
,
c
->
proxy_version
,
c
->
proxy_spec
);
return
(
fd
);
}
/**********************************************************************
/**********************************************************************
* Client thread
* Client thread
*/
*/
...
@@ -192,7 +214,6 @@ client_thread(void *priv)
...
@@ -192,7 +214,6 @@ client_thread(void *priv)
int
fd
;
int
fd
;
int
i
;
int
i
;
struct
vsb
*
vsb
;
struct
vsb
*
vsb
;
const
char
*
err
;
CAST_OBJ_NOTNULL
(
c
,
priv
,
CLIENT_MAGIC
);
CAST_OBJ_NOTNULL
(
c
,
priv
,
CLIENT_MAGIC
);
AN
(
*
c
->
connect
);
AN
(
*
c
->
connect
);
...
@@ -202,6 +223,7 @@ client_thread(void *priv)
...
@@ -202,6 +223,7 @@ client_thread(void *priv)
vsb
=
macro_expand
(
vl
,
c
->
connect
);
vsb
=
macro_expand
(
vl
,
c
->
connect
);
AN
(
vsb
);
AN
(
vsb
);
c
->
addr
=
VSB_data
(
vsb
);
if
(
c
->
repeat
==
0
)
if
(
c
->
repeat
==
0
)
c
->
repeat
=
1
;
c
->
repeat
=
1
;
...
@@ -209,27 +231,15 @@ client_thread(void *priv)
...
@@ -209,27 +231,15 @@ client_thread(void *priv)
vtc_log
(
vl
,
2
,
"Started (%u iterations%s)"
,
c
->
repeat
,
vtc_log
(
vl
,
2
,
"Started (%u iterations%s)"
,
c
->
repeat
,
c
->
keepalive
?
" using keepalive"
:
""
);
c
->
keepalive
?
" using keepalive"
:
""
);
for
(
i
=
0
;
i
<
c
->
repeat
;
i
++
)
{
for
(
i
=
0
;
i
<
c
->
repeat
;
i
++
)
{
char
*
addr
=
VSB_data
(
vsb
);
fd
=
client_connect
(
vl
,
c
);
vtc_log
(
vl
,
3
,
"Connect to %s"
,
addr
);
if
(
*
addr
==
'/'
)
fd
=
client_uds_connect
(
vl
,
addr
,
10
.,
&
err
);
else
fd
=
client_tcp_connect
(
vl
,
VSB_data
(
vsb
),
10
.,
&
err
);
if
(
fd
<
0
)
vtc_fatal
(
c
->
vl
,
"Failed to open %s: %s"
,
VSB_data
(
vsb
),
err
);
/* VTCP_blocking does its own checks, trust it */
VTCP_blocking
(
fd
);
if
(
c
->
proxy_spec
!=
NULL
)
client_proxy
(
vl
,
fd
,
c
->
proxy_version
,
c
->
proxy_spec
);
if
(
!
c
->
keepalive
)
if
(
!
c
->
keepalive
)
fd
=
http_process
(
vl
,
c
->
spec
,
fd
,
NULL
,
addr
,
fd
=
http_process
(
vl
,
c
->
spec
,
fd
,
NULL
,
c
->
addr
,
c
->
rcvbuf
);
c
->
rcvbuf
);
else
else
while
(
fd
>=
0
&&
i
++
<
c
->
repeat
)
while
(
fd
>=
0
&&
i
++
<
c
->
repeat
)
fd
=
http_process
(
vl
,
c
->
spec
,
fd
,
NULL
,
addr
,
fd
=
http_process
(
vl
,
c
->
spec
,
fd
,
NULL
,
c
->
rcvbuf
);
c
->
addr
,
c
->
rcvbuf
);
vtc_log
(
vl
,
3
,
"closing fd %d"
,
fd
);
vtc_log
(
vl
,
3
,
"closing fd %d"
,
fd
);
VTCP_close
(
&
fd
);
VTCP_close
(
&
fd
);
}
}
...
...
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