Merge pull request #8 from dedeckeh/bugfixes

Don't rearm RS timer if callback is not set

1 files changed, 8 insertions, 6 deletions

diff --git a/src/router.c b/src/router.c
index a75b847..dfbcf60 100644
--- a/src/router.c
+++ b/src/router.c
@@ -451,12 +451,14 @@ static void send_router_advert(struct uloop_timeout *event)
 	odhcpd_send(router_event.uloop.fd,
 			&all_nodes, iov, ARRAY_SIZE(iov), iface);
 
-	// Rearm timer
-	int msecs;
-	odhcpd_urandom(&msecs, sizeof(msecs));
-	msecs = (labs(msecs) % (1000 * (MaxRtrAdvInterval
-			- MinRtrAdvInterval))) + (MinRtrAdvInterval * 1000);
-	uloop_timeout_set(&iface->timer_rs, msecs);
+	// Rearm timer if not shut down
+	if (event->cb) {
+		int msecs;
+		odhcpd_urandom(&msecs, sizeof(msecs));
+		msecs = (labs(msecs) % (1000 * (MaxRtrAdvInterval
+				- MinRtrAdvInterval))) + (MinRtrAdvInterval * 1000);
+		uloop_timeout_set(&iface->timer_rs, msecs);
+	}
 }