router: fix lingering uloop socket descriptor

In case setting one of the socket options fails; make sure the raw
socket is removed from the uloop file descriptor list before the
socket is closed.
In case this is not done and a new raw socket is created with the
same fd value odhcpd will not be triggered by uloop in case RS messages
are received on the socket as reported in https://github.com/openwrt/odhcpd/issues/135

Signed-off-by: Hans Dedecker <dedeckeh@gmail.com>

diff --git a/src/router.c b/src/router.c
index 0040e7a1f8bdd12d0950f1e97c26a6cd89af9c4c..c68d0d53c08caa9760884547e40998c3bac1d249 100644 (file)
--- a/src/router.c
+++ b/src/router.c
@@ -213,6 +213,9 @@ int router_setup_interface(struct interface *iface, bool enable)
        }
 out:
        if (ret < 0 && iface->router_event.uloop.fd >= 0) {
+               if (iface->router_event.uloop.registered)
+                       uloop_fd_delete(&iface->router_event.uloop);
+
                close(iface->router_event.uloop.fd);
                iface->router_event.uloop.fd = -1;
        }