X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fodhcpd.git;a=blobdiff_plain;f=src%2Frouter.c;h=36267bea6d36269ac96866e83cb6484d776096d6;hp=971197530918776d1f185dae9cab8a255fac5474;hb=68ee0b59040625d2ab5830b1c1cc8eca2da0dcf1;hpb=c5cb11650a1f7ff321b4ac190c8be7f533cf9636;ds=sidebyside

diff --git a/src/router.c b/src/router.c
index 9711975..36267be 100644
--- a/src/router.c
+++ b/src/router.c
@@ -20,6 +20,7 @@
 #include <stdlib.h>
 #include <unistd.h>
 #include <stdbool.h>
+#include <arpa/inet.h>
 #include <net/route.h>
 
 #include "router.h"
@@ -34,7 +35,7 @@ static void handle_icmpv6(void *addr, void *data, size_t len,
 static void trigger_router_advert(struct uloop_timeout *event);
 static void sigusr1_refresh(int signal);
 
-static struct odhcpd_event router_event = {{.fd = -1}, handle_icmpv6, NULL};
+static struct odhcpd_event router_event = {.uloop = {.fd = -1}, .handle_dgram = handle_icmpv6, };
 
 static FILE *fp_route = NULL;
 #define RA_IOV_LEN 6
@@ -247,7 +248,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 +258,13 @@ 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);
+
+		syslog(LOG_INFO, "Initial RA router lifetime %d, %d address(es) available on %s",
+				ntohs(adv.h.nd_ra_router_lifetime), (int)ipcnt, iface->ifname);
 	}
 
 	// Construct Prefix Information options
@@ -273,8 +277,15 @@ static uint64_t send_router_advert(struct interface *iface, const struct in6_add
 
 	for (ssize_t i = 0; i < ipcnt; ++i) {
 		struct odhcpd_ipaddr *addr = &addrs[i];
-		if (addr->prefix > 96 || addr->valid <= (uint32_t)now)
-			continue; // Address not suitable
+
+		if (addr->prefix > 96 || addr->valid <= (uint32_t)now) {
+			char namebuf[INET6_ADDRSTRLEN];
+
+			inet_ntop(AF_INET6, addr, namebuf, sizeof(namebuf));
+			syslog(LOG_INFO, "Address %s (prefix %d, valid %u) not suitable as RA prefix on %s",
+					namebuf, addr->prefix, addr->valid, iface->ifname);
+			continue;
+		}
 
 		struct nd_opt_prefix_info *p = NULL;
 		for (size_t i = 0; i < cnt; ++i) {
@@ -298,11 +309,14 @@ static uint64_t send_router_advert(struct interface *iface, const struct in6_add
 		uint32_t this_lifetime = TIME_LEFT(addr->valid, now);
 		if (this_lifetime > UINT16_MAX)
 			this_lifetime = UINT16_MAX;
-		if (((addr->addr.s6_addr[0] & 0xfe) != 0xfc || iface->default_router)
+		if ((!IN6_IS_ADDR_ULA(&addr->addr) || iface->default_router)
 				&& adv.h.nd_ra_router_lifetime
-				&& ntohs(adv.h.nd_ra_router_lifetime) < this_lifetime)
+				&& ntohs(adv.h.nd_ra_router_lifetime) < this_lifetime) {
 			adv.h.nd_ra_router_lifetime = htons(this_lifetime);
 
+			syslog(LOG_INFO, "Updating RA router lifetime to %d on %s", this_lifetime, iface->ifname);
+		}
+
 		odhcpd_bmemcpy(&p->nd_opt_pi_prefix, &addr->addr,
 				(iface->ra_advrouter) ? 128 : addr->prefix);
 		p->nd_opt_pi_type = ND_OPT_PREFIX_INFORMATION;