Same control cleanup that was done for ospfd and ripd. Move the

control_state and ctl_conns structs into control.c nothing else
uses these structs.

diff --git a/usr.sbin/eigrpd/control.c b/usr.sbin/eigrpd/control.c
index a3d1aea..14e955d 100644 (file)
--- a/usr.sbin/eigrpd/control.c
+++ b/usr.sbin/eigrpd/control.c
@@ -1,4 +1,4 @@
-/*     $OpenBSD: control.c,v 1.8 2018/08/05 08:10:35 mestre Exp $ */
+/*     $OpenBSD: control.c,v 1.9 2021/01/19 10:37:25 claudio Exp $ */
 
 /*
  * Copyright (c) 2003, 2004 Henning Brauer <henning@openbsd.org>
@@ -30,6 +30,8 @@
 #include "control.h"
 #include "log.h"
 
+TAILQ_HEAD(ctl_conns, ctl_conn)        ctl_conns = TAILQ_HEAD_INITIALIZER(ctl_conns);
+
 #define        CONTROL_BACKLOG 5
 
 static void             control_accept(int, short, void *);
@@ -38,6 +40,13 @@ static struct ctl_conn       *control_connbypid(pid_t);
 static void             control_close(int);
 static void             control_dispatch_imsg(int, short, void *);
 
+struct {
+       struct event    ev;
+       struct event    evt;
+       int             fd;
+} control_state;
+
+
 int
 control_init(char *path)
 {
@@ -86,7 +95,6 @@ control_init(char *path)
 int
 control_listen(void)
 {
-
        if (listen(control_state.fd, CONTROL_BACKLOG) == -1) {
                log_warn("%s: listen", __func__);
                return (-1);

diff --git a/usr.sbin/eigrpd/control.h b/usr.sbin/eigrpd/control.h
index 4e395cf..fe9eb69 100644 (file)
--- a/usr.sbin/eigrpd/control.h
+++ b/usr.sbin/eigrpd/control.h
@@ -1,4 +1,4 @@
-/*     $OpenBSD: control.h,v 1.4 2018/08/05 08:10:35 mestre Exp $ */
+/*     $OpenBSD: control.h,v 1.5 2021/01/19 10:37:25 claudio Exp $ */
 
 /*
  * Copyright (c) 2003, 2004 Henning Brauer <henning@openbsd.org>
@@ -23,12 +23,6 @@
 
 #include <event.h>
 
-struct {
-       struct event    ev;
-       struct event    evt;
-       int             fd;
-} control_state;
-
 struct ctl_conn {
        TAILQ_ENTRY(ctl_conn)   entry;
        struct imsgev           iev;

diff --git a/usr.sbin/eigrpd/eigrpe.c b/usr.sbin/eigrpd/eigrpe.c
index 63f5321..2b1eb74 100644 (file)
--- a/usr.sbin/eigrpd/eigrpe.c
+++ b/usr.sbin/eigrpd/eigrpe.c
@@ -1,4 +1,4 @@
-/*     $OpenBSD: eigrpe.c,v 1.37 2021/01/19 10:31:12 claudio Exp $ */
+/*     $OpenBSD: eigrpe.c,v 1.38 2021/01/19 10:37:25 claudio Exp $ */
 
 /*
  * Copyright (c) 2015 Renato Westphal <renato@openbsd.org>
@@ -164,7 +164,6 @@ eigrpe(int debug, int verbose, char *sockname)
        event_add(&ev6, NULL);
 
        /* listen on eigrpd control socket */
-       TAILQ_INIT(&ctl_conns);
        control_listen();
 
        event_dispatch();

diff --git a/usr.sbin/eigrpd/eigrpe.h b/usr.sbin/eigrpd/eigrpe.h
index 2d0198b..847c7be 100644 (file)
--- a/usr.sbin/eigrpd/eigrpe.h
+++ b/usr.sbin/eigrpd/eigrpe.h
@@ -1,4 +1,4 @@
-/*     $OpenBSD: eigrpe.h,v 1.17 2021/01/19 10:31:12 claudio Exp $ */
+/*     $OpenBSD: eigrpe.h,v 1.18 2021/01/19 10:37:25 claudio Exp $ */
 
 /*
  * Copyright (c) 2015 Renato Westphal <renato@openbsd.org>
@@ -25,8 +25,6 @@
 
 #include <event.h>
 
-TAILQ_HEAD(ctl_conns, ctl_conn)        ctl_conns;
-
 struct pbuf {
        struct ibuf             *buf;
        int                      refcnt;
@@ -73,6 +71,8 @@ RB_PROTOTYPE(nbr_pid_head, nbr, pid_tree, nbr_pid_compare)
 
 extern struct eigrpd_conf        *econf;
 
+struct ctl_conn;
+
 /* eigrpe.c */
 void            eigrpe(int, int, char *);
 int             eigrpe_imsg_compose_parent(int, pid_t, void *, uint16_t);