X-Git-Url: https://git.decadent.org.uk/gitweb/?p=odhcp6c.git;a=blobdiff_plain;f=src%2Fra.c;h=b700c9a8270a10aba5a162f10d0c4c061e785e27;hp=570ff6fef28c7e5950c989d79b365a6844835982;hb=67b311ab81736b35858664219d345844ab08fcc7;hpb=b146f9adc80cc2c2cdf2b04bfeec4c861a2a0e23

diff --git a/src/ra.c b/src/ra.c
index 570ff6f..b700c9a 100644
--- a/src/ra.c
+++ b/src/ra.c
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2012-2013 Steven Barth <steven@midlink.org>
+ * Copyright (C) 2012-2014 Steven Barth <steven@midlink.org>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License v2 as published by
@@ -26,6 +26,7 @@
 #include <arpa/inet.h>
 #include <sys/socket.h>
 #include <sys/types.h>
+#include <sys/ioctl.h>
 #include <netinet/in.h>
 #include <netinet/icmp6.h>
 
@@ -132,9 +133,26 @@ int ra_init(const char *ifname, const struct in6_addr *ifid)
 
 static void ra_send_rs(int signal __attribute__((unused)))
 {
-	const struct icmp6_hdr rs = {ND_ROUTER_SOLICIT, 0, 0, {{0}}};
+	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};
-	sendto(sock, &rs, sizeof(rs), MSG_DONTWAIT, (struct sockaddr*)&dest, sizeof(dest));
+	size_t len = sizeof(rs);
+
+	struct ifreq ifr;
+	memset(&ifr, 0, sizeof(ifr));
+	strncpy(ifr.ifr_name, if_name, sizeof(ifr.ifr_name));
+	if (!ioctl(sock, SIOCGIFHWADDR, &ifr)
+			&& memcmp(rs.lladdr.data, ifr.ifr_hwaddr.sa_data, 6))
+		memcpy(rs.lladdr.data, ifr.ifr_hwaddr.sa_data, 6);
+	else
+		len = sizeof(struct icmp6_hdr);
+
+	sendto(sock, &rs, len, MSG_DONTWAIT, (struct sockaddr*)&dest, sizeof(dest));
 
 	if (++rs_attempt <= 3)
 		alarm(4);
@@ -311,11 +329,13 @@ bool ra_process(void)
 			update_proc("conf", "hop_limit", adv->nd_ra_curhoplimit);
 
 		// Parse ND parameters
-		if (ntohl(adv->nd_ra_reachable) <= 3600000)
-			update_proc("neigh", "base_reachable_time_ms", ntohl(adv->nd_ra_reachable));
+		uint32_t reachable = ntohl(adv->nd_ra_reachable);
+		if (reachable > 0 && reachable <= 3600000)
+			update_proc("neigh", "base_reachable_time_ms", reachable);
 
-		if (ntohl(adv->nd_ra_retransmit) <= 60000)
-			update_proc("neigh", "retrans_time_ms", ntohl(adv->nd_ra_retransmit));
+		uint32_t retransmit = ntohl(adv->nd_ra_retransmit);
+		if (retransmit > 0 && retransmit <= 60000)
+			update_proc("neigh", "retrans_time_ms", retransmit);
 
 
 		// Evaluate options