event: don't remember (in cfg) control socket event

We don't need it outside of event loop initialization.

diff --git a/src/daemon/event.c b/src/daemon/event.c
index 89cc46e29ad587f0421ab9879344f9781461fed0..1ac5b5b3d4c8c7cda778bf680b3da697d2458112 100644 (file)
--- a/src/daemon/event.c
+++ b/src/daemon/event.c
@@ -462,13 +462,14 @@ levent_init(struct lldpd *cfg)
        event_active(cfg->g_main_loop, EV_TIMEOUT, 1);
 
        /* Setup unix socket */
+       struct event *ctl_event;
        log_debug("event", "register Unix socket");
        TAILQ_INIT(&lldpd_clients);
        levent_make_socket_nonblocking(cfg->g_ctl);
-       if ((cfg->g_ctl_event = event_new(cfg->g_base, cfg->g_ctl,
+       if ((ctl_event = event_new(cfg->g_base, cfg->g_ctl,
                    EV_READ|EV_PERSIST, levent_ctl_accept, cfg)) == NULL)
                fatalx("unable to setup control socket event");
-       event_add(cfg->g_ctl_event, NULL);
+       event_add(ctl_event, NULL);
 
        /* Signals */
        log_debug("event", "register signals");

diff --git a/src/daemon/lldpd.h b/src/daemon/lldpd.h
index 1e5ae287d9e71db5c483ee38eefee333e5d753c7..72d523172440a0df163542bb149cd7783ed656ab 100644 (file)
--- a/src/daemon/lldpd.h
+++ b/src/daemon/lldpd.h
@@ -119,7 +119,6 @@ struct lldpd {
        /* Unix socket handling */
        const char              *g_ctlname;
        int                      g_ctl;
-       struct event            *g_ctl_event;
        struct event            *g_iface_event; /* Triggered when there is an interface change */
        struct event            *g_iface_timer_event; /* Triggered one second after last interface change */