X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fodhcpd.git;a=blobdiff_plain;f=src%2Frouter.c;h=bc228295706c1f62e2db513c71aaccca70e1f57c;hp=971197530918776d1f185dae9cab8a255fac5474;hb=df023adafeee1bf48fa1e0cce31e7130f8043dae;hpb=32b977a5336612a5c01f7426c4d165685fa8aca0

diff --git a/src/router.c b/src/router.c
index 9711975..bc22829 100644
--- a/src/router.c
+++ b/src/router.c
@@ -247,7 +247,7 @@ static uint64_t send_router_advert(struct interface *iface, const struct in6_add
 	odhcpd_get_mac(iface, adv.lladdr.data);
 
 	// If not currently shutting down
-	struct odhcpd_ipaddr addrs[8];
+	struct odhcpd_ipaddr addrs[RELAYD_MAX_ADDRS];
 	ssize_t ipcnt = 0;
 	int64_t minvalid = INT64_MAX;
 
@@ -257,10 +257,10 @@ static uint64_t send_router_advert(struct interface *iface, const struct in6_add
 		memcpy(addrs, iface->ia_addr, ipcnt * sizeof(*addrs));
 
 		// Check default route
-		if (parse_routes(addrs, ipcnt))
-			adv.h.nd_ra_router_lifetime = htons(1);
 		if (iface->default_router > 1)
 			adv.h.nd_ra_router_lifetime = htons(iface->default_router);
+		else if (parse_routes(addrs, ipcnt))
+			adv.h.nd_ra_router_lifetime = htons(1);
 	}
 
 	// Construct Prefix Information options