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
32ad2869
Commit
32ad2869
authored
Mar 23, 2015
by
Poul-Henning Kamp
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Pick up first session step from acceptor socket.
Complain about unrecognized protocols.
parent
539961be
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
12 additions
and
12 deletions
+12
-12
cache_acceptor.c
bin/varnishd/cache/cache_acceptor.c
+2
-6
mgt_acceptor.c
bin/varnishd/mgt/mgt_acceptor.c
+8
-4
c00003.vtc
bin/varnishtest/tests/c00003.vtc
+2
-2
No files found.
bin/varnishd/cache/cache_acceptor.c
View file @
32ad2869
...
...
@@ -296,8 +296,6 @@ vca_make_session(struct worker *wrk, void *arg)
struct
wrk_accept
*
wa
;
struct
sockaddr_storage
ss
;
struct
suckaddr
*
sa
;
enum
sess_step
first_step
;
const
char
*
proto_name
;
socklen_t
sl
;
char
laddr
[
VTCP_ADDRBUFSIZE
];
char
lport
[
VTCP_PORTBUFSIZE
];
...
...
@@ -307,8 +305,6 @@ vca_make_session(struct worker *wrk, void *arg)
CHECK_OBJ_NOTNULL
(
wrk
,
WORKER_MAGIC
);
CAST_OBJ_NOTNULL
(
wa
,
arg
,
WRK_ACCEPT_MAGIC
);
pp
=
wa
->
sesspool
;
first_step
=
wa
->
acceptlsock
->
first_step
;
proto_name
=
wa
->
acceptlsock
->
proto_name
;
/* Turn accepted socket into a session */
AN
(
wrk
->
aws
->
r
);
...
...
@@ -334,6 +330,7 @@ vca_make_session(struct worker *wrk, void *arg)
sp
->
fd
=
wa
->
acceptsock
;
wa
->
acceptsock
=
-
1
;
sp
->
sess_step
=
wa
->
acceptlsock
->
first_step
;
assert
(
wa
->
acceptaddrlen
<=
vsa_suckaddr_len
);
SES_Reserve_remote_addr
(
sp
,
&
sa
);
...
...
@@ -352,7 +349,7 @@ vca_make_session(struct worker *wrk, void *arg)
VTCP_name
(
sa
,
laddr
,
sizeof
laddr
,
lport
,
sizeof
lport
);
VSL
(
SLT_Begin
,
sp
->
vxid
,
"sess 0 %s"
,
proto_name
);
VSL
(
SLT_Begin
,
sp
->
vxid
,
"sess 0 %s"
,
wa
->
acceptlsock
->
proto_name
);
VSL
(
SLT_SessOpen
,
sp
->
vxid
,
"%s %s %s %s %s %.6f %d"
,
raddr
,
rport
,
wa
->
acceptlsock
->
name
,
laddr
,
lport
,
sp
->
t_open
,
sp
->
fd
);
...
...
@@ -368,7 +365,6 @@ vca_make_session(struct worker *wrk, void *arg)
}
vca_tcp_opt_set
(
sp
->
fd
,
0
);
xxxassert
(
first_step
==
S_STP_H1NEWSESS
);
/* SES_Proto_Sess() must be sceduled with reserved WS */
assert
(
8
==
WS_Reserve
(
sp
->
ws
,
8
));
wrk
->
task
.
func
=
SES_Proto_Sess
;
...
...
bin/varnishd/mgt/mgt_acceptor.c
View file @
32ad2869
...
...
@@ -175,15 +175,19 @@ MAC_Arg(const char *arg)
ARGV_ERR
(
"Parse error: out of memory
\n
"
);
if
(
av
[
0
]
!=
NULL
)
ARGV_ERR
(
"%s
\n
"
,
av
[
0
]);
if
(
av
[
2
]
!=
NULL
)
ARGV_ERR
(
"XXX: not yet
\n
"
);
ALLOC_OBJ
(
mh
,
MAC_HELP_MAGIC
);
AN
(
mh
);
mh
->
name
=
av
[
1
];
mh
->
err
=
&
err
;
if
(
av
[
2
]
==
NULL
||
!
strcmp
(
av
[
2
],
"HTTP/1"
))
{
mh
->
first_step
=
S_STP_H1NEWSESS
;
mh
->
proto_name
=
"HTTP/1"
;
}
else
{
ARGV_ERR
(
"Unknown protocol '%s'
\n
"
,
av
[
2
]);
}
mh
->
err
=
&
err
;
error
=
VSS_resolver
(
av
[
1
],
"80"
,
mac_callback
,
mh
,
&
err
);
if
(
mh
->
good
==
0
||
err
!=
NULL
)
ARGV_ERR
(
"Could not bind to address %s: %s
\n
"
,
av
[
1
],
err
);
...
...
bin/varnishtest/tests/c00003.vtc
View file @
32ad2869
...
...
@@ -6,5 +6,5 @@ varnishtest "Check that we fail to start if any listen address does not work"
# All bad listen addresses
err_shell "Could not bind to address 192.0.2.255:0" {${varnishd} -F -a "${bad_ip}:0" -b /// -n ${tmpdir} 2>&1 }
#
Just one bad listen addresses
err_shell "
Error: XXX: not yet
" {${varnishd} -F -a "127.0.0.1:0,${bad_ip}:0" -b /// -n ${tmpdir} 2>&1 }
#
old style address list
err_shell "
Unknown protocol
" {${varnishd} -F -a "127.0.0.1:0,${bad_ip}:0" -b /// -n ${tmpdir} 2>&1 }
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