[master] 0d0bac7 Polish
Poul-Henning Kamp
phk at FreeBSD.org
Tue Feb 13 13:34:08 UTC 2018
commit 0d0bac740f40d92b78777c2cf99647d7c6ec1f74
Author: Poul-Henning Kamp <phk at FreeBSD.org>
Date: Tue Feb 13 13:33:22 2018 +0000
Polish
diff --git a/bin/varnishd/cache/cache_acceptor.c b/bin/varnishd/cache/cache_acceptor.c
index e2fecec..bb1f000 100644
--- a/bin/varnishd/cache/cache_acceptor.c
+++ b/bin/varnishd/cache/cache_acceptor.c
@@ -374,10 +374,7 @@ vca_make_session(struct worker *wrk, void *arg)
VSL(SLT_Begin, sp->vxid, "sess 0 %s",
wa->acceptlsock->transport->name);
VSL(SLT_SessOpen, sp->vxid, "%s %s %s %s %s %.6f %d",
- raddr, rport,
- wa->acceptlsock->name != NULL ?
- wa->acceptlsock->name : wa->acceptlsock->endpoint,
- laddr, lport,
+ raddr, rport, wa->acceptlsock->name, laddr, lport,
sp->t_open, sp->fd);
WS_Release(wrk->aws, 0);
diff --git a/bin/varnishd/common/heritage.h b/bin/varnishd/common/heritage.h
index 9e26079..e59261e 100644
--- a/bin/varnishd/common/heritage.h
+++ b/bin/varnishd/common/heritage.h
@@ -36,16 +36,6 @@ struct listen_sock;
struct transport;
struct VCLS;
-struct listen_arg {
- unsigned magic;
-#define LISTEN_ARG_MAGIC 0xbb2fc333
- VTAILQ_ENTRY(listen_arg) list;
- const char *endpoint;
- const char *name;
- VTAILQ_HEAD(,listen_sock) socks;
- const struct transport *transport;
-};
-
struct listen_sock {
unsigned magic;
#define LISTEN_SOCK_MAGIC 0x999e4b57
diff --git a/bin/varnishd/mgt/mgt_acceptor.c b/bin/varnishd/mgt/mgt_acceptor.c
index 0006716..af09013 100644
--- a/bin/varnishd/mgt/mgt_acceptor.c
+++ b/bin/varnishd/mgt/mgt_acceptor.c
@@ -48,6 +48,16 @@
#include "vss.h"
#include "vtcp.h"
+struct listen_arg {
+ unsigned magic;
+#define LISTEN_ARG_MAGIC 0xbb2fc333
+ VTAILQ_ENTRY(listen_arg) list;
+ const char *endpoint;
+ const char *name;
+ VTAILQ_HEAD(,listen_sock) socks;
+ const struct transport *transport;
+};
+
static VTAILQ_HEAD(,listen_arg) listen_args =
VTAILQ_HEAD_INITIALIZER(listen_args);
More information about the varnish-commit
mailing list