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
46bfa187
Commit
46bfa187
authored
Mar 11, 2015
by
Poul-Henning Kamp
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Split the -M event handler into the two different handlers it is.
parent
14d8ae32
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
32 additions
and
26 deletions
+32
-26
mgt_cli.c
bin/varnishd/mgt/mgt_cli.c
+32
-26
No files found.
bin/varnishd/mgt/mgt_cli.c
View file @
46bfa187
...
@@ -578,16 +578,16 @@ Marg_closer(void *priv)
...
@@ -578,16 +578,16 @@ Marg_closer(void *priv)
M_fd
=
-
1
;
M_fd
=
-
1
;
}
}
static
int
static
int
__match_proto__
(
vev_cb_f
)
Marg_
poker
(
const
struct
vev
*
e
,
int
what
)
Marg_
connect
(
const
struct
vev
*
e
,
int
what
)
{
{
struct
vsb
*
vsb
;
struct
vsb
*
vsb
;
int
s
,
k
;
int
k
;
socklen_t
l
;
socklen_t
l
;
(
void
)
what
;
/* XXX: ??? */
assert
(
e
==
M_conn
);
(
void
)
what
;
if
(
e
==
M_conn
)
{
/* Our connect(2) returned, check result */
/* Our connect(2) returned, check result */
l
=
sizeof
k
;
l
=
sizeof
k
;
AZ
(
getsockopt
(
M_fd
,
SOL_SOCKET
,
SO_ERROR
,
&
k
,
&
l
));
AZ
(
getsockopt
(
M_fd
,
SOL_SOCKET
,
SO_ERROR
,
&
k
,
&
l
));
...
@@ -609,9 +609,15 @@ Marg_poker(const struct vev *e, int what)
...
@@ -609,9 +609,15 @@ Marg_poker(const struct vev *e, int what)
VSB_delete
(
vsb
);
VSB_delete
(
vsb
);
M_poll
=
1
;
M_poll
=
1
;
return
(
1
);
return
(
1
);
}
}
static
int
__match_proto__
(
vev_cb_f
)
Marg_poker
(
const
struct
vev
*
e
,
int
what
)
{
int
s
;
assert
(
e
==
M_poker
);
assert
(
e
==
M_poker
);
(
void
)
what
;
M_poker
->
timeout
=
M_poll
;
/* XXX nasty ? */
M_poker
->
timeout
=
M_poll
;
/* XXX nasty ? */
if
(
M_fd
>=
0
)
if
(
M_fd
>=
0
)
...
@@ -626,7 +632,7 @@ Marg_poker(const struct vev *e, int what)
...
@@ -626,7 +632,7 @@ Marg_poker(const struct vev *e, int what)
M_conn
=
vev_new
();
M_conn
=
vev_new
();
AN
(
M_conn
);
AN
(
M_conn
);
M_conn
->
callback
=
Marg_
poker
;
M_conn
->
callback
=
Marg_
connect
;
M_conn
->
name
=
"-M connector"
;
M_conn
->
name
=
"-M connector"
;
M_conn
->
fd_flags
=
EV_WR
;
M_conn
->
fd_flags
=
EV_WR
;
M_conn
->
fd
=
s
;
M_conn
->
fd
=
s
;
...
...
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