[master] 017278b Collect the management of listen/acceptor sockets in its own file.
Poul-Henning Kamp
phk at FreeBSD.org
Sat Mar 7 14:32:39 CET 2015
commit 017278babfc0eb458936a73feb5ee86d1fcc95bc
Author: Poul-Henning Kamp <phk at FreeBSD.org>
Date: Sat Mar 7 09:22:43 2015 +0000
Collect the management of listen/acceptor sockets in its own file.
diff --git a/bin/varnishd/Makefile.am b/bin/varnishd/Makefile.am
index aeef7c1..e619d33 100644
--- a/bin/varnishd/Makefile.am
+++ b/bin/varnishd/Makefile.am
@@ -62,6 +62,7 @@ varnishd_SOURCES = \
http1/cache_http1_pipe.c \
http1/cache_http1_proto.c \
http1/cache_http1_vfp.c \
+ mgt/mgt_acceptor.c \
mgt/mgt_child.c \
mgt/mgt_cli.c \
mgt/mgt_jail.c \
diff --git a/bin/varnishd/mgt/mgt.h b/bin/varnishd/mgt/mgt.h
index 7d734ee..551c689 100644
--- a/bin/varnishd/mgt/mgt.h
+++ b/bin/varnishd/mgt/mgt.h
@@ -45,8 +45,8 @@ void MGT_Run(void);
void mgt_stop_child(void);
void mgt_got_fd(int fd);
void MGT_Child_Cli_Fail(void);
-int MGT_open_sockets(void);
-void MGT_close_sockets(void);
+int MAC_open_sockets(void);
+void MAC_close_sockets(void);
/* mgt_cli.c */
diff --git a/bin/varnishd/mgt/mgt_acceptor.c b/bin/varnishd/mgt/mgt_acceptor.c
new file mode 100644
index 0000000..6c2402f
--- /dev/null
+++ b/bin/varnishd/mgt/mgt_acceptor.c
@@ -0,0 +1,184 @@
+/*-
+ * Copyright (c) 2006 Verdens Gang AS
+ * Copyright (c) 2006-2014 Varnish Software AS
+ * All rights reserved.
+ *
+ * Author: Poul-Henning Kamp <phk at phk.freebsd.dk>
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL AUTHOR OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ *
+ * Acceptor socket management
+ */
+
+#include "config.h"
+
+#include <fcntl.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
+
+#include "mgt/mgt.h"
+#include "mgt/mgt_param.h"
+#include "common/heritage.h"
+#include "common/params.h"
+
+#include "vav.h"
+#include "vss.h"
+
+/*=====================================================================
+ * Open and close the accept sockets.
+ *
+ * (The child is priv-sep'ed, so it can't do it.)
+ */
+
+int
+MAC_open_sockets(void)
+{
+ struct listen_sock *ls;
+ int good = 0;
+
+ VJ_master(JAIL_MASTER_HIGH);
+ VTAILQ_FOREACH(ls, &heritage.socks, list) {
+ if (ls->sock >= 0) {
+ good++;
+ continue;
+ }
+ ls->sock = VSS_bind(ls->addr);
+ if (ls->sock < 0)
+ continue;
+
+ mgt_child_inherit(ls->sock, "sock");
+
+ good++;
+ }
+ VJ_master(JAIL_MASTER_LOW);
+ if (!good)
+ return (1);
+ return (0);
+}
+
+/*--------------------------------------------------------------------*/
+
+void
+MAC_close_sockets(void)
+{
+ struct listen_sock *ls;
+
+ VTAILQ_FOREACH(ls, &heritage.socks, list) {
+ if (ls->sock < 0)
+ continue;
+ mgt_child_inherit(ls->sock, NULL);
+ AZ(close(ls->sock));
+ ls->sock = -1;
+ }
+}
+
+/*--------------------------------------------------------------------*/
+
+static void
+clean_listen_sock_head(struct listen_sock_head *lsh)
+{
+ struct listen_sock *ls, *ls2;
+
+ VTAILQ_FOREACH_SAFE(ls, lsh, list, ls2) {
+ CHECK_OBJ_NOTNULL(ls, LISTEN_SOCK_MAGIC);
+ VTAILQ_REMOVE(lsh, ls, list);
+ free(ls->name);
+ free(ls->addr);
+ FREE_OBJ(ls);
+ }
+}
+
+int
+tweak_listen_address(struct vsb *vsb, const struct parspec *par,
+ const char *arg)
+{
+ char **av;
+ int i, retval = 0;
+ struct listen_sock *ls;
+ struct listen_sock_head lsh;
+
+ (void)par;
+ if (arg == NULL) {
+ VSB_quote(vsb, mgt_param.listen_address, -1, 0);
+ return (0);
+ }
+
+ av = VAV_Parse(arg, NULL, ARGV_COMMA);
+ if (av == NULL) {
+ VSB_printf(vsb, "Parse error: out of memory");
+ return(-1);
+ }
+ if (av[0] != NULL) {
+ VSB_printf(vsb, "Parse error: %s", av[0]);
+ VAV_Free(av);
+ return(-1);
+ }
+ if (av[1] == NULL) {
+ VSB_printf(vsb, "Empty listen address");
+ VAV_Free(av);
+ return(-1);
+ }
+ VTAILQ_INIT(&lsh);
+ for (i = 1; av[i] != NULL; i++) {
+ struct vss_addr **ta;
+ int j, n;
+
+ n = VSS_resolve(av[i], "http", &ta);
+ if (n == 0) {
+ VSB_printf(vsb, "Invalid listen address ");
+ VSB_quote(vsb, av[i], -1, 0);
+ retval = -1;
+ break;
+ }
+ for (j = 0; j < n; ++j) {
+ ALLOC_OBJ(ls, LISTEN_SOCK_MAGIC);
+ AN(ls);
+ ls->sock = -1;
+ ls->addr = ta[j];
+ ls->name = strdup(av[i]);
+ AN(ls->name);
+ VTAILQ_INSERT_TAIL(&lsh, ls, list);
+ }
+ free(ta);
+ }
+ VAV_Free(av);
+ if (retval) {
+ clean_listen_sock_head(&lsh);
+ return (-1);
+ }
+
+ REPLACE(mgt_param.listen_address, arg);
+
+ clean_listen_sock_head(&heritage.socks);
+ heritage.nsocks = 0;
+
+ while (!VTAILQ_EMPTY(&lsh)) {
+ ls = VTAILQ_FIRST(&lsh);
+ VTAILQ_REMOVE(&lsh, ls, list);
+ CHECK_OBJ_NOTNULL(ls, LISTEN_SOCK_MAGIC);
+ VTAILQ_INSERT_TAIL(&heritage.socks, ls, list);
+ heritage.nsocks++;
+ }
+ return (0);
+}
diff --git a/bin/varnishd/mgt/mgt_child.c b/bin/varnishd/mgt/mgt_child.c
index c116c5f..ae9033d 100644
--- a/bin/varnishd/mgt/mgt_child.c
+++ b/bin/varnishd/mgt/mgt_child.c
@@ -52,7 +52,6 @@
#include "vcli_priv.h"
#include "vev.h"
#include "vlu.h"
-#include "vss.h"
#include "vtim.h"
#include "mgt_cli.h"
@@ -218,53 +217,6 @@ mgt_child_inherit(int fd, const char *what)
}
/*=====================================================================
- * Open and close the accept sockets.
- *
- * (The child is priv-sep'ed, so it can't do it.)
- */
-
-int
-MGT_open_sockets(void)
-{
- struct listen_sock *ls;
- int good = 0;
-
- VJ_master(JAIL_MASTER_HIGH);
- VTAILQ_FOREACH(ls, &heritage.socks, list) {
- if (ls->sock >= 0) {
- good++;
- continue;
- }
- ls->sock = VSS_bind(ls->addr);
- if (ls->sock < 0)
- continue;
-
- mgt_child_inherit(ls->sock, "sock");
-
- good++;
- }
- VJ_master(JAIL_MASTER_LOW);
- if (!good)
- return (1);
- return (0);
-}
-
-/*--------------------------------------------------------------------*/
-
-void
-MGT_close_sockets(void)
-{
- struct listen_sock *ls;
-
- VTAILQ_FOREACH(ls, &heritage.socks, list) {
- if (ls->sock < 0)
- continue;
- mgt_child_inherit(ls->sock, NULL);
- closex(&ls->sock);
- }
-}
-
-/*=====================================================================
* Listen to stdout+stderr from the child
*/
@@ -351,7 +303,7 @@ mgt_launch_child(struct cli *cli)
if (child_state != CH_STOPPED && child_state != CH_DIED)
return;
- if (MGT_open_sockets() != 0) {
+ if (MAC_open_sockets() != 0) {
child_state = CH_STOPPED;
if (cli != NULL) {
VCLI_SetResult(cli, CLIS_CANT);
@@ -442,7 +394,7 @@ mgt_launch_child(struct cli *cli)
mgt_child_inherit(heritage.cli_out, NULL);
closex(&heritage.cli_out);
- MGT_close_sockets();
+ MAC_close_sockets();
child_std_vlu = VLU_New(NULL, child_line, 0);
AN(child_std_vlu);
diff --git a/bin/varnishd/mgt/mgt_main.c b/bin/varnishd/mgt/mgt_main.c
index 896f2dd..2ea0cc6 100644
--- a/bin/varnishd/mgt/mgt_main.c
+++ b/bin/varnishd/mgt/mgt_main.c
@@ -629,9 +629,9 @@ main(int argc, char * const *argv)
ARGV_ERR("-C only good with -b or -f\n");
if (!d_flag) {
- if (MGT_open_sockets())
+ if (MAC_open_sockets())
ARGV_ERR("Failed to open (any) accept sockets.\n");
- MGT_close_sockets();
+ MAC_close_sockets();
if (b_arg == NULL && f_arg == NULL) {
fprintf(stderr,
diff --git a/bin/varnishd/mgt/mgt_param_tweak.c b/bin/varnishd/mgt/mgt_param_tweak.c
index 3fe28dc..f75a5b5 100644
--- a/bin/varnishd/mgt/mgt_param_tweak.c
+++ b/bin/varnishd/mgt/mgt_param_tweak.c
@@ -40,14 +40,12 @@
#include <unistd.h>
#include "mgt/mgt.h"
-#include "common/heritage.h"
#include "common/params.h"
#include "mgt/mgt_param.h"
#include "waiter/waiter.h"
#include "vav.h"
#include "vnum.h"
-#include "vss.h"
/*--------------------------------------------------------------------
* Generic handling of double typed parameters
@@ -365,96 +363,6 @@ tweak_vsl_reclen(struct vsb *vsb, const struct parspec *par, const char *arg)
/*--------------------------------------------------------------------*/
-static void
-clean_listen_sock_head(struct listen_sock_head *lsh)
-{
- struct listen_sock *ls, *ls2;
-
- VTAILQ_FOREACH_SAFE(ls, lsh, list, ls2) {
- CHECK_OBJ_NOTNULL(ls, LISTEN_SOCK_MAGIC);
- VTAILQ_REMOVE(lsh, ls, list);
- free(ls->name);
- free(ls->addr);
- FREE_OBJ(ls);
- }
-}
-
-int
-tweak_listen_address(struct vsb *vsb, const struct parspec *par,
- const char *arg)
-{
- char **av;
- int i, retval = 0;
- struct listen_sock *ls;
- struct listen_sock_head lsh;
-
- (void)par;
- if (arg == NULL) {
- VSB_quote(vsb, mgt_param.listen_address, -1, 0);
- return (0);
- }
-
- av = VAV_Parse(arg, NULL, ARGV_COMMA);
- if (av == NULL) {
- VSB_printf(vsb, "Parse error: out of memory");
- return(-1);
- }
- if (av[0] != NULL) {
- VSB_printf(vsb, "Parse error: %s", av[0]);
- VAV_Free(av);
- return(-1);
- }
- if (av[1] == NULL) {
- VSB_printf(vsb, "Empty listen address");
- VAV_Free(av);
- return(-1);
- }
- VTAILQ_INIT(&lsh);
- for (i = 1; av[i] != NULL; i++) {
- struct vss_addr **ta;
- int j, n;
-
- n = VSS_resolve(av[i], "http", &ta);
- if (n == 0) {
- VSB_printf(vsb, "Invalid listen address ");
- VSB_quote(vsb, av[i], -1, 0);
- retval = -1;
- break;
- }
- for (j = 0; j < n; ++j) {
- ALLOC_OBJ(ls, LISTEN_SOCK_MAGIC);
- AN(ls);
- ls->sock = -1;
- ls->addr = ta[j];
- ls->name = strdup(av[i]);
- AN(ls->name);
- VTAILQ_INSERT_TAIL(&lsh, ls, list);
- }
- free(ta);
- }
- VAV_Free(av);
- if (retval) {
- clean_listen_sock_head(&lsh);
- return (-1);
- }
-
- REPLACE(mgt_param.listen_address, arg);
-
- clean_listen_sock_head(&heritage.socks);
- heritage.nsocks = 0;
-
- while (!VTAILQ_EMPTY(&lsh)) {
- ls = VTAILQ_FIRST(&lsh);
- VTAILQ_REMOVE(&lsh, ls, list);
- CHECK_OBJ_NOTNULL(ls, LISTEN_SOCK_MAGIC);
- VTAILQ_INSERT_TAIL(&heritage.socks, ls, list);
- heritage.nsocks++;
- }
- return (0);
-}
-
-/*--------------------------------------------------------------------*/
-
int
tweak_string(struct vsb *vsb, const struct parspec *par, const char *arg)
{
More information about the varnish-commit
mailing list