X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=src%2Fra.c;h=f1a5f7fdb5747d0160283adff8a2dc9c43db12b1;hb=e69df66491b6d6d244c3274ae36f7b640bd07a5e;hp=68746016781c7d4b1b3dc111159f074bf01d015c;hpb=806ebbc1f4dd848c2d19b56f5be84db16fada612;p=odhcp6c.git

diff --git a/src/ra.c b/src/ra.c
index 6874601..f1a5f7f 100644
--- a/src/ra.c
+++ b/src/ra.c
@@ -21,7 +21,7 @@
 static int sock = -1, rtnl_sock = -1;
 static unsigned if_index = 0;
 static char if_name[IF_NAMESIZE] = {0};
-static volatile int rs_attempt = 1;
+static volatile int rs_attempt = 0;
 static struct in6_addr lladdr = IN6ADDR_ANY_INIT;
 
 static void ra_send_rs(int signal __attribute__((unused)));
@@ -97,7 +97,7 @@ static void ra_send_rs(int signal __attribute__((unused)))
 	const struct sockaddr_in6 dest = {AF_INET6, 0, 0, ALL_IPV6_ROUTERS, if_index};
 	sendto(sock, &rs, sizeof(rs), MSG_DONTWAIT, (struct sockaddr*)&dest, sizeof(dest));
 
-	if (++rs_attempt < 3)
+	if (++rs_attempt <= 3)
 		alarm(4);
 }
 
@@ -105,8 +105,8 @@ static void ra_send_rs(int signal __attribute__((unused)))
 static int16_t pref_to_priority(uint8_t flags)
 {
 	flags = (flags >> 3) & 0x03;
-	return (flags == 0x00) ? 1024 : (flags == 0x01) ? 512 :
-			(flags == 0x11) ? 2048 : -1;
+	return (flags == 0x0) ? 1024 : (flags == 0x1) ? 512 :
+			(flags == 0x3) ? 2048 : -1;
 }
 
 
@@ -145,13 +145,13 @@ bool ra_rtnl_process(void)
 		if (len < 0)
 			break;
 
-		for (struct nlmsghdr *nh = (struct nlmsghdr*)buf; NLMSG_OK(nh, len);
+		for (struct nlmsghdr *nh = (struct nlmsghdr*)buf; NLMSG_OK(nh, (size_t)len);
 					nh = NLMSG_NEXT(nh, len)) {
 			struct ifaddrmsg *ifa = NLMSG_DATA(nh);
 			struct in6_addr *addr = NULL;
-			if (nh->nlmsg_type != RTM_NEWADDR || NLMSG_PAYLOAD(nh, 0) < sizeof(*ifa) ||
-					!(ifa->ifa_flags & IFA_F_DADFAILED) ||
-					ifa->ifa_index != if_index)
+			if (NLMSG_PAYLOAD(nh, 0) < sizeof(*ifa) || ifa->ifa_index != if_index ||
+					(nh->nlmsg_type == RTM_NEWADDR && !(ifa->ifa_flags & IFA_F_DADFAILED)) ||
+					(nh->nlmsg_type == RTM_DELADDR && !(ifa->ifa_flags & IFA_F_TENTATIVE)))
 				continue;
 
 			ssize_t alen = NLMSG_PAYLOAD(nh, sizeof(*ifa));
@@ -193,13 +193,14 @@ bool ra_process(void)
 		}
 
 		found = true;
+		uint32_t router_valid = ntohs(adv->nd_ra_router_lifetime);
 
 		// Parse default route
 		entry.router = from.sin6_addr;
 		entry.priority = pref_to_priority(adv->nd_ra_flags_reserved);
 		if (entry.priority < 0)
 			entry.priority = pref_to_priority(0);
-		entry.valid = ntohs(adv->nd_ra_router_lifetime);
+		entry.valid = router_valid;
 		entry.preferred = entry.valid;
 		odhcp6c_update_entry(STATE_RA_ROUTE, &entry);
 
@@ -210,6 +211,7 @@ bool ra_process(void)
 		if (adv->nd_ra_retransmit)
 			update_proc("neigh", "retrans_time_ms", ntohl(adv->nd_ra_retransmit));
 
+
 		// Evaluate options
 		struct icmpv6_opt *opt;
 		icmpv6_for_each_option(opt, &adv[1], &buf[len]) {
@@ -246,7 +248,7 @@ bool ra_process(void)
 					continue;
 
 				if (pinfo->nd_opt_pi_flags_reserved & ND_OPT_PI_FLAG_ONLINK)
-					odhcp6c_update_entry_safe(STATE_RA_ROUTE, &entry, 7201);
+					odhcp6c_update_entry_safe(STATE_RA_ROUTE, &entry, 7200);
 
 				if (!(pinfo->nd_opt_pi_flags_reserved & ND_OPT_PI_FLAG_AUTO) ||
 						pinfo->nd_opt_pi_prefix_len != 64)
@@ -255,10 +257,30 @@ bool ra_process(void)
 				entry.target.s6_addr32[2] = lladdr.s6_addr32[2];
 				entry.target.s6_addr32[3] = lladdr.s6_addr32[3];
 
-				odhcp6c_update_entry_safe(STATE_RA_PREFIX, &entry, 7201);
-			}
+				odhcp6c_update_entry_safe(STATE_RA_PREFIX, &entry, 7200);
+			} else if (opt->type == ND_OPT_RECURSIVE_DNS && opt->len > 2) {
+				entry.router = from.sin6_addr;
+				entry.priority = 0;
+				entry.length = 128;
+				entry.valid = ntohl(*((uint32_t*)&opt->data[2]));
+				entry.preferred = 0;
 
+				for (ssize_t i = 0; i < (opt->len - 1) / 2; ++i) {
+					memcpy(&entry.target, &opt->data[6 + i * sizeof(entry.target)],
+							sizeof(entry.target));
+					odhcp6c_update_entry(STATE_RA_DNS, &entry);
+				}
+			}
 		}
+
+		size_t ra_dns_len;
+		struct odhcp6c_entry *entry = odhcp6c_get_state(STATE_RA_DNS, &ra_dns_len);
+		for (size_t i = 0; i < ra_dns_len / sizeof(*entry); ++i)
+			if (IN6_ARE_ADDR_EQUAL(&entry[i].router, &from.sin6_addr) &&
+					entry[i].valid > router_valid)
+				entry[i].valid = router_valid;
 	}
+
+	odhcp6c_expire();
 	return found;
 }