From: Vincent Bernat <vincent@bernat.im>
Date: Wed, 18 Mar 2015 07:35:53 +0000 (+0100)
Subject: event: don't remember (in cfg) control socket event
X-Git-Tag: 0.7.14~23
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=50efc5f74521617d08c297d08f8233ac7d5b96e9;p=thirdparty%2Flldpd.git

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 89cc46e2..1ac5b5b3 100644
--- 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 1e5ae287..72d52317 100644
--- 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 */