X-Git-Url: https://git.decadent.org.uk/gitweb/?p=odhcp6c.git;a=blobdiff_plain;f=src%2Fra.c;h=b21bc5615e5acb65ea1938e742437a80bac22f98;hp=baaee9bcb6c410d21edf2368a7aeda9989f209f5;hb=46ba6f6aeb8055e872c57dc2b90a383fb280f440;hpb=3e52a1448eee0fbf7ff67c123265bedcbc9c26d0

diff --git a/src/ra.c b/src/ra.c
index baaee9b..b21bc56 100644
--- a/src/ra.c
+++ b/src/ra.c
@@ -26,7 +26,6 @@
 #include <arpa/inet.h>
 #include <sys/socket.h>
 #include <sys/types.h>
-#include <sys/ioctl.h>
 #include <netinet/in.h>
 #include <netinet/icmp6.h>
 
@@ -56,6 +55,15 @@ static char if_name[IF_NAMESIZE] = {0};
 static volatile int rs_attempt = 0;
 static struct in6_addr lladdr = IN6ADDR_ANY_INIT;
 
+struct {
+	struct icmp6_hdr hdr;
+	struct icmpv6_opt lladdr;
+} rs = {
+	.hdr = {ND_ROUTER_SOLICIT, 0, 0, {{0}}},
+	.lladdr = {ND_OPT_SOURCE_LINKADDR, 1, {0}},
+};
+
+
 static void ra_send_rs(int signal __attribute__((unused)));
 
 int ra_init(const char *ifname, const struct in6_addr *ifid)
@@ -93,6 +101,7 @@ int ra_init(const char *ifname, const struct in6_addr *ifid)
 		.ifi = {.ifi_index = if_index}
 	};
 	send(rtnl, &req, sizeof(req), 0);
+	ra_link_up();
 
 	// Filter ICMPv6 package types
 	struct icmp6_filter filt;
@@ -133,22 +142,12 @@ int ra_init(const char *ifname, const struct in6_addr *ifid)
 
 static void ra_send_rs(int signal __attribute__((unused)))
 {
-	struct {
-		struct icmp6_hdr hdr;
-		struct icmpv6_opt lladdr;
-	} rs = {
-		.hdr = {ND_ROUTER_SOLICIT, 0, 0, {{0}}},
-		.lladdr = {ND_OPT_SOURCE_LINKADDR, 1, {0}},
-	};
 	const struct sockaddr_in6 dest = {AF_INET6, 0, 0, ALL_IPV6_ROUTERS, if_index};
-	size_t len = sizeof(rs);
-
-	struct ifreq ifr;
-	memset(&ifr, 0, sizeof(ifr));
-	strncpy(ifr.ifr_name, if_name, sizeof(ifr.ifr_name));
-	if ((rs_attempt % 2 == 0) && !ioctl(sock, SIOCGIFHWADDR, &ifr)
-			&& memcmp(rs.lladdr.data, ifr.ifr_hwaddr.sa_data, 6))
-		memcpy(rs.lladdr.data, ifr.ifr_hwaddr.sa_data, 6);
+	const struct icmpv6_opt llnull = {ND_OPT_SOURCE_LINKADDR, 1, {0}};
+	size_t len;
+
+	if ((rs_attempt % 2 == 0) && memcmp(&rs.lladdr, &llnull, sizeof(llnull)))
+		len = sizeof(rs);
 	else
 		len = sizeof(struct icmp6_hdr);
 
@@ -197,6 +196,14 @@ bool ra_link_up(void)
 				resp.msg.ifi_index != if_index)
 			continue;
 
+		ssize_t alen = NLMSG_PAYLOAD(&resp.hdr, sizeof(resp.msg));
+		for (struct rtattr *rta = (struct rtattr*)(resp.pad);
+				RTA_OK(rta, alen); rta = RTA_NEXT(rta, alen)) {
+			if (rta->rta_type == IFLA_ADDRESS &&
+					RTA_PAYLOAD(rta) >= sizeof(rs.lladdr.data))
+				memcpy(rs.lladdr.data, RTA_DATA(rta), sizeof(rs.lladdr.data));
+		}
+
 		bool hascarrier = resp.msg.ifi_flags & IFF_LOWER_UP;
 		if (!firstcall && nocarrier != !hascarrier)
 			ret = true;
@@ -322,7 +329,7 @@ bool ra_process(void)
 			entry.priority = pref_to_priority(0);
 		entry.valid = router_valid;
 		entry.preferred = entry.valid;
-		changed |= odhcp6c_update_entry(STATE_RA_ROUTE, &entry);
+		changed |= odhcp6c_update_entry(STATE_RA_ROUTE, &entry, 0, true);
 
 		// Parse hoplimit
 		if (adv->nd_ra_curhoplimit)
@@ -360,7 +367,7 @@ bool ra_process(void)
 					continue;
 
 				if (entry.priority > 0)
-					changed |= odhcp6c_update_entry(STATE_RA_ROUTE, &entry);
+					changed |= odhcp6c_update_entry(STATE_RA_ROUTE, &entry, 0, true);
 			} else if (opt->type == ND_OPT_PREFIX_INFORMATION && opt->len == 4) {
 				struct nd_opt_prefix_info *pinfo = (struct nd_opt_prefix_info*)opt;
 				entry.router = any;
@@ -377,7 +384,7 @@ bool ra_process(void)
 					continue;
 
 				if (pinfo->nd_opt_pi_flags_reserved & ND_OPT_PI_FLAG_ONLINK)
-					changed |= odhcp6c_update_entry_safe(STATE_RA_ROUTE, &entry, 7200);
+					changed |= odhcp6c_update_entry(STATE_RA_ROUTE, &entry, 7200, true);
 
 				if (!(pinfo->nd_opt_pi_flags_reserved & ND_OPT_PI_FLAG_AUTO) ||
 						pinfo->nd_opt_pi_prefix_len != 64)
@@ -386,7 +393,7 @@ bool ra_process(void)
 				entry.target.s6_addr32[2] = lladdr.s6_addr32[2];
 				entry.target.s6_addr32[3] = lladdr.s6_addr32[3];
 
-				changed |= odhcp6c_update_entry_safe(STATE_RA_PREFIX, &entry, 7200);
+				changed |= odhcp6c_update_entry(STATE_RA_PREFIX, &entry, 7200, true);
 			} else if (opt->type == ND_OPT_RECURSIVE_DNS && opt->len > 2) {
 				entry.router = from.sin6_addr;
 				entry.priority = 0;
@@ -398,7 +405,7 @@ bool ra_process(void)
 				for (ssize_t i = 0; i < (opt->len - 1) / 2; ++i) {
 					memcpy(&entry.target, &opt->data[6 + i * sizeof(entry.target)],
 							sizeof(entry.target));
-					changed |= odhcp6c_update_entry(STATE_RA_DNS, &entry);
+					changed |= odhcp6c_update_entry(STATE_RA_DNS, &entry, 0, true);
 				}
 			}
 		}