Move TAILQ initialization to files where they are used.

These priv-sep daemons all follow a similar design and use TAILQs
for tracking control process connections. In most cases, the TAILQs
are initialized separate from where they are used. Since the scope
of use is generally confined to a specific control process file,
this commit also removes any extern definitions and exposing the
TAILQ structures to other compilation units.

ok bluhm@, tb@

diff --git a/sbin/iked/control.c b/sbin/iked/control.c
index 4328f5a..17b7280 100644 (file)
--- a/sbin/iked/control.c
+++ b/sbin/iked/control.c
@@ -1,4 +1,4 @@
-/*     $OpenBSD: control.c,v 1.30 2020/10/09 08:59:15 tobhe Exp $      */
+/*     $OpenBSD: control.c,v 1.31 2021/04/20 21:11:56 dv Exp $ */
 
 /*
  * Copyright (c) 2010-2013 Reyk Floeter <reyk@openbsd.org>
@@ -35,7 +35,7 @@
 
 #define        CONTROL_BACKLOG 5
 
-struct ctl_connlist ctl_conns;
+struct ctl_connlist ctl_conns = TAILQ_HEAD_INITIALIZER(ctl_conns);
 
 void
         control_accept(int, short, void *);

diff --git a/sbin/iked/iked.h b/sbin/iked/iked.h
index a58b08f..06c566d 100644 (file)
--- a/sbin/iked/iked.h
+++ b/sbin/iked/iked.h
@@ -1,4 +1,4 @@
-/*     $OpenBSD: iked.h,v 1.189 2021/03/05 22:26:04 tobhe Exp $        */
+/*     $OpenBSD: iked.h,v 1.190 2021/04/20 21:11:56 dv Exp $   */
 
 /*
  * Copyright (c) 2019 Tobias Heider <tobias.heider@stusta.de>
@@ -97,7 +97,6 @@ struct ctl_conn {
        struct imsgev            iev;
 };
 TAILQ_HEAD(ctl_connlist, ctl_conn);
-extern  struct ctl_connlist ctl_conns;
 
 extern enum privsep_procid privsep_process;
 

diff --git a/sbin/iked/proc.c b/sbin/iked/proc.c
index ad89aa8..076fec4 100644 (file)
--- a/sbin/iked/proc.c
+++ b/sbin/iked/proc.c
@@ -1,4 +1,4 @@
-/*     $OpenBSD: proc.c,v 1.34 2021/01/28 01:20:37 mortimer Exp $      */
+/*     $OpenBSD: proc.c,v 1.35 2021/04/20 21:11:56 dv Exp $    */
 
 /*
  * Copyright (c) 2010 - 2014 Reyk Floeter <reyk@openbsd.org>
@@ -431,7 +431,6 @@ proc_run(struct privsep *ps, struct privsep_proc *p,
        proc_listen(ps, procs, nproc);
 
        if (p->p_id == PROC_CONTROL && ps->ps_instance == 0) {
-               TAILQ_INIT(&ctl_conns);
                if (control_listen(&ps->ps_csock) == -1)
                        fatalx(__func__);
                TAILQ_FOREACH(rcs, &ps->ps_rcsocks, cs_entry)

diff --git a/usr.sbin/httpd/control.c b/usr.sbin/httpd/control.c
index 7eea19a..d282a85 100644 (file)
--- a/usr.sbin/httpd/control.c
+++ b/usr.sbin/httpd/control.c
@@ -1,4 +1,4 @@
-/*     $OpenBSD: control.c,v 1.13 2017/01/09 14:49:22 reyk Exp $       */
+/*     $OpenBSD: control.c,v 1.14 2021/04/20 21:11:56 dv Exp $ */
 
 /*
  * Copyright (c) 2003, 2004 Henning Brauer <henning@openbsd.org>
@@ -34,7 +34,7 @@
 
 #define        CONTROL_BACKLOG 5
 
-struct ctl_connlist ctl_conns;
+struct ctl_connlist ctl_conns = TAILQ_HEAD_INITIALIZER(ctl_conns);
 
 void            control_accept(int, short, void *);
 void            control_close(int, struct control_sock *);

diff --git a/usr.sbin/httpd/httpd.h b/usr.sbin/httpd/httpd.h
index 39b1089..b3a40b3 100644 (file)
--- a/usr.sbin/httpd/httpd.h
+++ b/usr.sbin/httpd/httpd.h
@@ -1,4 +1,4 @@
-/*     $OpenBSD: httpd.h,v 1.155 2021/04/10 10:10:07 claudio Exp $     */
+/*     $OpenBSD: httpd.h,v 1.156 2021/04/20 21:11:56 dv Exp $  */
 
 /*
  * Copyright (c) 2006 - 2015 Reyk Floeter <reyk@openbsd.org>
@@ -613,8 +613,6 @@ void         control_imsg_forward(struct privsep *, struct imsg *);
 struct ctl_conn        *
         control_connbyfd(int);
 
-extern  struct ctl_connlist ctl_conns;
-
 /* parse.y */
 int     parse_config(const char *, struct httpd *);
 int     load_config(const char *, struct httpd *);

diff --git a/usr.sbin/httpd/proc.c b/usr.sbin/httpd/proc.c
index f1ac469..2444d50 100644 (file)
--- a/usr.sbin/httpd/proc.c
+++ b/usr.sbin/httpd/proc.c
@@ -1,4 +1,4 @@
-/*     $OpenBSD: proc.c,v 1.39 2020/08/03 10:57:21 benno Exp $ */
+/*     $OpenBSD: proc.c,v 1.40 2021/04/20 21:11:56 dv Exp $    */
 
 /*
  * Copyright (c) 2010 - 2016 Reyk Floeter <reyk@openbsd.org>
@@ -588,7 +588,6 @@ proc_run(struct privsep *ps, struct privsep_proc *p,
        proc_setup(ps, procs, nproc);
        proc_accept(ps, PROC_PARENT_SOCK_FILENO, PROC_PARENT, 0);
        if (p->p_id == PROC_CONTROL && ps->ps_instance == 0) {
-               TAILQ_INIT(&ctl_conns);
                if (control_listen(&ps->ps_csock) == -1)
                        fatalx("%s: control_listen", __func__);
                TAILQ_FOREACH(rcs, &ps->ps_rcsocks, cs_entry)

diff --git a/usr.sbin/ldapd/control.c b/usr.sbin/ldapd/control.c
index fa48e1b..ffeb80b 100644 (file)
--- a/usr.sbin/ldapd/control.c
+++ b/usr.sbin/ldapd/control.c
@@ -1,4 +1,4 @@
-/*     $OpenBSD: control.c,v 1.16 2018/05/15 11:19:21 reyk Exp $       */
+/*     $OpenBSD: control.c,v 1.17 2021/04/20 21:11:56 dv Exp $ */
 
 /*
  * Copyright (c) 2010 Martin Hedenfalk <martin@bzero.se>
@@ -39,7 +39,7 @@
 
 #define        CONTROL_BACKLOG 5
 
-struct ctl_connlist ctl_conns;
+struct ctl_connlist ctl_conns = TAILQ_HEAD_INITIALIZER(ctl_conns);
 
 struct ctl_conn        *control_connbyfd(int);
 void            control_close(int, struct control_sock *);

diff --git a/usr.sbin/ldapd/ldapd.h b/usr.sbin/ldapd/ldapd.h
index 257995e..0f9988d 100644 (file)
--- a/usr.sbin/ldapd/ldapd.h
+++ b/usr.sbin/ldapd/ldapd.h
@@ -1,4 +1,4 @@
-/*     $OpenBSD: ldapd.h,v 1.34 2021/01/27 07:21:54 deraadt Exp $ */
+/*     $OpenBSD: ldapd.h,v 1.35 2021/04/20 21:11:56 dv Exp $ */
 
 /*
  * Copyright (c) 2009, 2010 Martin Hedenfalk <martin@bzero.se>
@@ -229,7 +229,7 @@ struct conn {
        struct buffertls         buftls;
        unsigned int             s_flags;
 };
-extern TAILQ_HEAD(conn_list, conn)      conn_list;
+TAILQ_HEAD(conn_list, conn);
 
 struct ssl {
        SPLAY_ENTRY(ssl)         ssl_nodes;
@@ -316,8 +316,6 @@ struct ctl_conn {
        struct imsgev            iev;
 };
 TAILQ_HEAD(ctl_connlist, ctl_conn);
-extern  struct ctl_connlist ctl_conns;
-
 
 struct control_sock {
        const char              *cs_name;

diff --git a/usr.sbin/ldapd/ldape.c b/usr.sbin/ldapd/ldape.c
index 7756534..4a716b9 100644 (file)
--- a/usr.sbin/ldapd/ldape.c
+++ b/usr.sbin/ldapd/ldape.c
@@ -1,4 +1,4 @@
-/*     $OpenBSD: ldape.c,v 1.33 2019/10/26 17:52:55 martijn Exp $ */
+/*     $OpenBSD: ldape.c,v 1.34 2021/04/20 21:11:56 dv Exp $ */
 
 /*
  * Copyright (c) 2009, 2010 Martin Hedenfalk <martin@bzero.se>
@@ -373,7 +373,6 @@ ldape(int debug, int verbose, char *csockpath)
        csock.cs_name = csockpath;
        control_init(&csock);
        control_listen(&csock);
-       TAILQ_INIT(&ctl_conns);
 
        /* Initialize LDAP listeners.
         */

diff --git a/usr.sbin/relayd/control.c b/usr.sbin/relayd/control.c
index 85a6f65..b02cef7 100644 (file)
--- a/usr.sbin/relayd/control.c
+++ b/usr.sbin/relayd/control.c
@@ -1,4 +1,4 @@
-/*     $OpenBSD: control.c,v 1.56 2017/01/09 14:49:21 reyk Exp $       */
+/*     $OpenBSD: control.c,v 1.57 2021/04/20 21:11:56 dv Exp $ */
 
 /*
  * Copyright (c) 2003, 2004 Henning Brauer <henning@openbsd.org>
@@ -34,7 +34,7 @@
 
 #define        CONTROL_BACKLOG 5
 
-struct ctl_connlist ctl_conns;
+struct ctl_connlist ctl_conns = TAILQ_HEAD_INITIALIZER(ctl_conns);
 
 void            control_accept(int, short, void *);
 void            control_close(int, struct control_sock *);

diff --git a/usr.sbin/relayd/proc.c b/usr.sbin/relayd/proc.c
index 55083dc..1b26a5e 100644 (file)
--- a/usr.sbin/relayd/proc.c
+++ b/usr.sbin/relayd/proc.c
@@ -1,4 +1,4 @@
-/*     $OpenBSD: proc.c,v 1.40 2018/09/09 21:06:51 bluhm Exp $ */
+/*     $OpenBSD: proc.c,v 1.41 2021/04/20 21:11:56 dv Exp $    */
 
 /*
  * Copyright (c) 2010 - 2016 Reyk Floeter <reyk@openbsd.org>
@@ -588,7 +588,6 @@ proc_run(struct privsep *ps, struct privsep_proc *p,
        proc_setup(ps, procs, nproc);
        proc_accept(ps, PROC_PARENT_SOCK_FILENO, PROC_PARENT, 0);
        if (p->p_id == PROC_CONTROL && ps->ps_instance == 0) {
-               TAILQ_INIT(&ctl_conns);
                if (control_listen(&ps->ps_csock) == -1)
                        fatalx("%s: control_listen", __func__);
                TAILQ_FOREACH(rcs, &ps->ps_rcsocks, cs_entry)

diff --git a/usr.sbin/relayd/relayd.h b/usr.sbin/relayd/relayd.h
index 27a2d37..d83ec82 100644 (file)
--- a/usr.sbin/relayd/relayd.h
+++ b/usr.sbin/relayd/relayd.h
@@ -1,4 +1,4 @@
-/*     $OpenBSD: relayd.h,v 1.266 2021/03/23 16:34:31 claudio Exp $    */
+/*     $OpenBSD: relayd.h,v 1.267 2021/04/20 21:11:56 dv Exp $ */
 
 /*
  * Copyright (c) 2006 - 2016 Reyk Floeter <reyk@openbsd.org>
@@ -1157,8 +1157,6 @@ void       control_imsg_forward(struct privsep *ps, struct imsg *);
 struct ctl_conn        *
         control_connbyfd(int);
 
-extern  struct ctl_connlist ctl_conns;
-
 /* parse.y */
 int     parse_config(const char *, struct relayd *);
 int     load_config(const char *, struct relayd *);

diff --git a/usr.sbin/switchd/control.c b/usr.sbin/switchd/control.c
index 1d12bca..50ceb10 100644 (file)
--- a/usr.sbin/switchd/control.c
+++ b/usr.sbin/switchd/control.c
@@ -1,4 +1,4 @@
-/*     $OpenBSD: control.c,v 1.9 2018/08/05 08:16:24 mestre Exp $      */
+/*     $OpenBSD: control.c,v 1.10 2021/04/20 21:11:56 dv Exp $ */
 
 /*
  * Copyright (c) 2010-2016 Reyk Floeter <reyk@openbsd.org>
@@ -39,7 +39,7 @@
 
 #define        CONTROL_BACKLOG 5
 
-struct ctl_connlist ctl_conns;
+struct ctl_connlist ctl_conns = TAILQ_HEAD_INITIALIZER(ctl_conns);
 
 void
         control_accept(int, short, void *);

diff --git a/usr.sbin/switchd/proc.c b/usr.sbin/switchd/proc.c
index 3e1b175..6f6a87f 100644 (file)
--- a/usr.sbin/switchd/proc.c
+++ b/usr.sbin/switchd/proc.c
@@ -1,4 +1,4 @@
-/*     $OpenBSD: proc.c,v 1.14 2018/09/10 13:21:39 akoshibe Exp $      */
+/*     $OpenBSD: proc.c,v 1.15 2021/04/20 21:11:56 dv Exp $    */
 
 /*
  * Copyright (c) 2010 - 2016 Reyk Floeter <reyk@openbsd.org>
@@ -585,7 +585,6 @@ proc_run(struct privsep *ps, struct privsep_proc *p,
        proc_setup(ps, procs, nproc);
        proc_accept(ps, PROC_PARENT_SOCK_FILENO, PROC_PARENT, 0);
        if (p->p_id == PROC_CONTROL && ps->ps_instance == 0) {
-               TAILQ_INIT(&ctl_conns);
                if (control_listen(&ps->ps_csock) == -1)
                        fatalx("%s: control_listen", __func__);
                TAILQ_FOREACH(rcs, &ps->ps_rcsocks, cs_entry)

diff --git a/usr.sbin/switchd/proc.h b/usr.sbin/switchd/proc.h
index 37a1466..b79c51e 100644 (file)
--- a/usr.sbin/switchd/proc.h
+++ b/usr.sbin/switchd/proc.h
@@ -1,4 +1,4 @@
-/*     $OpenBSD: proc.h,v 1.8 2018/09/10 13:21:39 akoshibe Exp $       */
+/*     $OpenBSD: proc.h,v 1.9 2021/04/20 21:11:56 dv Exp $     */
 
 /*
  * Copyright (c) 2010-2015 Reyk Floeter <reyk@openbsd.org>
@@ -123,7 +123,6 @@ struct ctl_conn {
        int                              restricted;
 };
 TAILQ_HEAD(ctl_connlist, ctl_conn);
-extern  struct ctl_connlist ctl_conns;
 
 /* proc.c */
 void    proc_init(struct privsep *, struct privsep_proc *, unsigned int, int,

diff --git a/usr.sbin/vmd/control.c b/usr.sbin/vmd/control.c
index 50139da..d6b266e 100644 (file)
--- a/usr.sbin/vmd/control.c
+++ b/usr.sbin/vmd/control.c
@@ -1,4 +1,4 @@
-/*     $OpenBSD: control.c,v 1.33 2021/04/11 18:53:23 dv Exp $ */
+/*     $OpenBSD: control.c,v 1.34 2021/04/20 21:11:56 dv Exp $ */
 
 /*
  * Copyright (c) 2010-2015 Reyk Floeter <reyk@openbsd.org>
@@ -39,7 +39,7 @@
 
 #define        CONTROL_BACKLOG 5
 
-struct ctl_connlist ctl_conns;
+struct ctl_connlist ctl_conns = TAILQ_HEAD_INITIALIZER(ctl_conns);
 
 void
         control_accept(int, short, void *);

diff --git a/usr.sbin/vmd/proc.c b/usr.sbin/vmd/proc.c
index fde9899..f115210 100644 (file)
--- a/usr.sbin/vmd/proc.c
+++ b/usr.sbin/vmd/proc.c
@@ -1,4 +1,4 @@
-/*     $OpenBSD: proc.c,v 1.18 2018/09/10 10:36:01 bluhm Exp $ */
+/*     $OpenBSD: proc.c,v 1.19 2021/04/20 21:11:56 dv Exp $    */
 
 /*
  * Copyright (c) 2010 - 2016 Reyk Floeter <reyk@openbsd.org>
@@ -585,7 +585,6 @@ proc_run(struct privsep *ps, struct privsep_proc *p,
        proc_setup(ps, procs, nproc);
        proc_accept(ps, PROC_PARENT_SOCK_FILENO, PROC_PARENT, 0);
        if (p->p_id == PROC_CONTROL && ps->ps_instance == 0) {
-               TAILQ_INIT(&ctl_conns);
                if (control_listen(&ps->ps_csock) == -1)
                        fatalx("%s: control_listen", __func__);
                TAILQ_FOREACH(rcs, &ps->ps_rcsocks, cs_entry)

diff --git a/usr.sbin/vmd/proc.h b/usr.sbin/vmd/proc.h
index 454d5b0..2e49694 100644 (file)
--- a/usr.sbin/vmd/proc.h
+++ b/usr.sbin/vmd/proc.h
@@ -1,4 +1,4 @@
-/*     $OpenBSD: proc.h,v 1.18 2021/04/11 18:53:23 dv Exp $    */
+/*     $OpenBSD: proc.h,v 1.19 2021/04/20 21:11:56 dv Exp $    */
 
 /*
  * Copyright (c) 2010-2015 Reyk Floeter <reyk@openbsd.org>
@@ -74,7 +74,6 @@ struct ctl_conn {
        struct sockpeercred      peercred;
 };
 TAILQ_HEAD(ctl_connlist, ctl_conn);
-extern  struct ctl_connlist ctl_conns;
 
 /* privsep */
 enum privsep_procid {