X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=src%2Fra.c;h=9a579851524786704875d675100d8fded72ef6b7;hb=5217b2bb6c26f70f6fe570a340045a372020d06b;hp=7d1ded0199a512eca16828b86d32d75c75b44bab;hpb=2e9e12c3d737a851ae651d7bbfe440b60ff2e0fc;p=odhcp6c.git

diff --git a/src/ra.c b/src/ra.c
index 7d1ded0..9a57985 100644
--- a/src/ra.c
+++ b/src/ra.c
@@ -42,11 +42,12 @@ static struct in6_addr lladdr = IN6ADDR_ANY_INIT;
 
 static void ra_send_rs(int signal __attribute__((unused)));
 
-int ra_init(const char *ifname)
+int ra_init(const char *ifname, const struct in6_addr *ifid)
 {
 	sock = socket(AF_INET6, SOCK_RAW | SOCK_CLOEXEC, IPPROTO_ICMPV6);
 	if_index = if_nametoindex(ifname);
 	strncpy(if_name, ifname, sizeof(if_name) - 1);
+	lladdr = *ifid;
 
 	// Filter ICMPv6 package types
 	struct icmp6_filter filt;
@@ -74,17 +75,19 @@ int ra_init(const char *ifname)
 	fcntl(sock, F_SETOWN, ourpid);
 	fcntl(sock, F_SETFL, fcntl(sock, F_GETFL) | O_ASYNC);
 
-	// Get LL-addr
-	FILE *fp = fopen("/proc/net/if_inet6", "r");
-	if (fp) {
-		char addrbuf[33], ifbuf[16];
-		while (fscanf(fp, "%32s %*x %*x %*x %*x %15s", addrbuf, ifbuf) == 2) {
-			if (!strcmp(ifbuf, if_name)) {
-				script_unhexlify((uint8_t*)&lladdr, sizeof(lladdr), addrbuf);
-				break;
+	if (IN6_IS_ADDR_UNSPECIFIED(&lladdr)) {
+		// Autodetect interface-id if not specified
+		FILE *fp = fopen("/proc/net/if_inet6", "r");
+		if (fp) {
+			char addrbuf[33], ifbuf[16];
+			while (fscanf(fp, "%32s %*x %*x %*x %*x %15s", addrbuf, ifbuf) == 2) {
+				if (!strcmp(ifbuf, if_name)) {
+					script_unhexlify((uint8_t*)&lladdr, sizeof(lladdr), addrbuf);
+					break;
+				}
 			}
+			fclose(fp);
 		}
-		fclose(fp);
 	}
 
 	// Open rtnetlink socket
@@ -139,7 +142,7 @@ static void update_proc(const char *sect, const char *opt, uint32_t value)
 
 static bool ra_deduplicate(const struct in6_addr *any, uint8_t length)
 {
-	struct odhcp6c_entry entry = {IN6ADDR_ANY_INIT, length, 0, *any, 0, 0};
+  struct odhcp6c_entry entry = {IN6ADDR_ANY_INIT, length, 0, *any, 0, 0, 0};
 	struct odhcp6c_entry *x = odhcp6c_find_entry(STATE_RA_PREFIX, &entry);
 	if (x && IN6_ARE_ADDR_EQUAL(&x->target, any)) {
 		odhcp6c_random(&x->target.s6_addr32[2], 2 * sizeof(uint32_t));
@@ -155,12 +158,16 @@ static bool ra_deduplicate(const struct in6_addr *any, uint8_t length)
 bool ra_rtnl_process(void)
 {
 	bool found = false;
+	uint32_t elapsed = odhcp6c_elapsed();
 	uint8_t buf[8192];
 	while (true) {
 		ssize_t len = recv(rtnl_sock, buf, sizeof(buf), MSG_DONTWAIT);
 		if (len < 0)
 			break;
 
+		if (elapsed > 10)
+			continue;
+
 		for (struct nlmsghdr *nh = (struct nlmsghdr*)buf; NLMSG_OK(nh, (size_t)len);
 					nh = NLMSG_NEXT(nh, len)) {
 			struct ifaddrmsg *ifa = NLMSG_DATA(nh);
@@ -195,9 +202,8 @@ bool ra_process(void)
 	bool found = false;
 	uint8_t buf[1500];
 	struct nd_router_advert *adv = (struct nd_router_advert*)buf;
-	struct odhcp6c_entry entry = {IN6ADDR_ANY_INIT, 0, 0, IN6ADDR_ANY_INIT, 0, 0};
+	struct odhcp6c_entry entry = {IN6ADDR_ANY_INIT, 0, 0, IN6ADDR_ANY_INIT, 0, 0, 0};
 	const struct in6_addr any = IN6ADDR_ANY_INIT;
-	odhcp6c_expire();
 
 	while (true) {
 		struct sockaddr_in6 from;
@@ -214,10 +220,15 @@ bool ra_process(void)
 			rs_attempt = 0;
 		}
 
-		found = true;
+		if (!found) {
+			odhcp6c_expire();
+			found = true;
+		}
 		uint32_t router_valid = ntohs(adv->nd_ra_router_lifetime);
 
 		// Parse default route
+		entry.target = any;
+		entry.length = 0;
 		entry.router = from.sin6_addr;
 		entry.priority = pref_to_priority(adv->nd_ra_flags_reserved);
 		if (entry.priority < 0)
@@ -227,10 +238,10 @@ bool ra_process(void)
 		odhcp6c_update_entry(STATE_RA_ROUTE, &entry);
 
 		// Parse ND parameters
-		if (adv->nd_ra_reachable)
+		if (ntohl(adv->nd_ra_reachable) <= 3600000)
 			update_proc("neigh", "base_reachable_time_ms", ntohl(adv->nd_ra_reachable));
 
-		if (adv->nd_ra_retransmit)
+		if (ntohl(adv->nd_ra_retransmit) <= 60000)
 			update_proc("neigh", "retrans_time_ms", ntohl(adv->nd_ra_retransmit));
 
 
@@ -239,7 +250,8 @@ bool ra_process(void)
 		icmpv6_for_each_option(opt, &adv[1], &buf[len]) {
 			if (opt->type == ND_OPT_MTU) {
 				uint32_t *mtu = (uint32_t*)&opt->data[2];
-				update_proc("conf", "mtu", ntohl(*mtu));
+				if (ntohl(*mtu) >= 1280 && ntohl(*mtu) <= 65535)
+					update_proc("conf", "mtu", ntohl(*mtu));
 			} else if (opt->type == ND_OPT_ROUTE_INFORMATION && opt->len <= 3) {
 				entry.router = from.sin6_addr;
 				entry.target = any;
@@ -306,6 +318,8 @@ bool ra_process(void)
 				entry[i].valid = router_valid;
 	}
 
-	odhcp6c_expire();
+	if (found)
+		odhcp6c_expire();
+
 	return found;
 }