ubus: use safe iterator

[project/odhcpd.git] / src / router.c

diff --git a/src/router.c b/src/router.c
index ddec21e..772d770 100644 (file)
--- a/src/router.c
+++ b/src/router.c
@@ -88,6 +88,9 @@ int init_router(void)
 
 int setup_router_interface(struct interface *iface, bool enable)
 {
+       if (!fp_route || router_event.uloop.fd < 0)
+               return -1;
+
        struct ipv6_mreq all_nodes = {ALL_IPV6_NODES, iface->ifindex};
        struct ipv6_mreq all_routers = {ALL_IPV6_ROUTERS, iface->ifindex};
 
@@ -276,7 +279,7 @@ static void send_router_advert(struct uloop_timeout *event)
        bool have_public = false;
        size_t cnt = 0;
 
-       struct in6_addr dns_pref, *dns_addr = &dns_pref;
+       struct in6_addr dns_pref = IN6ADDR_ANY_INIT, *dns_addr = &dns_pref;
        uint32_t dns_time = 0;
        size_t dns_cnt = 1;
 
@@ -344,7 +347,7 @@ static void send_router_advert(struct uloop_timeout *event)
                dns_time = 2 * MaxRtrAdvInterval;
        }
 
-       if (!dns_addr)
+       if (!dns_addr || IN6_IS_ADDR_UNSPECIFIED(dns_addr))
                dns_cnt = 0;
 
        struct {