X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fodhcpd.git;a=blobdiff_plain;f=src%2Frouter.c;h=f8ba5d7aac0332daa0c8776e12183c4c06e48edd;hp=b29e531ef48aa07f3a92842e18312e7a12b4bbc3;hb=1bbf34a1df3e16865b3b9330b338952076bc26f9;hpb=79d005edf35a363e2d254e37ca2edcd743c2b4f6;ds=inline

diff --git a/src/router.c b/src/router.c
index b29e531..f8ba5d7 100644
--- a/src/router.c
+++ b/src/router.c
@@ -30,7 +30,7 @@ static void forward_router_solicitation(const struct interface *iface);
 static void forward_router_advertisement(uint8_t *data, size_t len);
 
 static void handle_icmpv6(void *addr, void *data, size_t len,
-		struct interface *iface);
+		struct interface *iface, void *dest);
 static void send_router_advert(struct uloop_timeout *event);
 static void sigusr1_refresh(int signal);
 
@@ -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};
 
@@ -167,7 +170,7 @@ static bool router_icmpv6_valid(struct sockaddr_in6 *source, uint8_t *data, size
 
 // Event handler for incoming ICMPv6 packets
 static void handle_icmpv6(void *addr, void *data, size_t len,
-		struct interface *iface)
+		struct interface *iface, _unused void *dest)
 {
 	struct icmp6_hdr *hdr = data;
 
@@ -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_addr = NULL;
+	struct in6_addr dns_pref = IN6ADDR_ANY_INIT, *dns_addr = &dns_pref;
 	uint32_t dns_time = 0;
 	size_t dns_cnt = 1;
 
@@ -327,7 +330,7 @@ static void send_router_advert(struct uloop_timeout *event)
 
 		if (addr->preferred > dns_time) {
 			dns_time = addr->preferred;
-			dns_addr = &addr->addr;
+			dns_pref = addr->addr;
 		}
 	}
 
@@ -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 {
@@ -427,8 +430,8 @@ static void send_router_advert(struct uloop_timeout *event)
 		routes[routes_cnt].lifetime = htonl(addr->valid);
 		routes[routes_cnt].addr[0] = addr->addr.s6_addr32[0];
 		routes[routes_cnt].addr[1] = addr->addr.s6_addr32[1];
-		routes[routes_cnt].addr[2] = addr->addr.s6_addr32[2];
-		routes[routes_cnt].addr[3] = addr->addr.s6_addr32[3];
+		routes[routes_cnt].addr[2] = 0;
+		routes[routes_cnt].addr[3] = 0;
 
 		++routes_cnt;
 	}