From 56920baef21f23307c3df9719914e75fe729e0b8 Mon Sep 17 00:00:00 2001
From: Steven Barth <steven@midlink.org>
Date: Fri, 31 May 2013 15:45:42 +0200
Subject: [PATCH 01/16] Work around false-positive DAD-hits

---
 src/odhcp6c.c | 12 +++++++++---
 src/odhcp6c.h |  1 +
 src/ra.c      | 14 +++++++++++---
 3 files changed, 21 insertions(+), 6 deletions(-)

diff --git a/src/odhcp6c.c b/src/odhcp6c.c
index d70546b..4fefcd7 100644
--- a/src/odhcp6c.c
+++ b/src/odhcp6c.c
@@ -42,6 +42,7 @@ static size_t state_len[_STATE_MAX] = {0};
 static volatile int do_signal = 0;
 static int urandom_fd = -1, allow_slaac_only = 0;
 static bool bound = false, release = true;
+static time_t last_update = 0;
 
 
 int main(_unused int argc, char* const argv[])
@@ -357,9 +358,10 @@ bool odhcp6c_signal_process(void)
 {
 	if (do_signal == SIGIO) {
 		do_signal = 0;
+		bool ra_rtnled = ra_rtnl_process();
 		bool ra_updated = ra_process();
 
-		if (ra_rtnl_process() || (ra_updated && (bound || allow_slaac_only == 0)))
+		if (ra_rtnled || (ra_updated && (bound || allow_slaac_only == 0)))
 			script_call("ra-updated"); // Immediate process urgent events
 		else if (ra_updated && !bound && allow_slaac_only > 0)
 			script_delay_call("ra-updated", allow_slaac_only);
@@ -467,9 +469,7 @@ static void odhcp6c_expire_list(enum odhcp6c_state state, uint32_t elapsed)
 
 void odhcp6c_expire(void)
 {
-	static time_t last_update = 0;
 	time_t now = odhcp6c_get_milli_time() / 1000;
-
 	uint32_t elapsed = (last_update > 0) ? now - last_update : 0;
 	last_update = now;
 
@@ -481,6 +481,12 @@ void odhcp6c_expire(void)
 }
 
 
+uint32_t odhcp6c_elapsed(void)
+{
+	return odhcp6c_get_milli_time() / 1000 - last_update;
+}
+
+
 void odhcp6c_random(void *buf, size_t len)
 {
 	read(urandom_fd, buf, len);
diff --git a/src/odhcp6c.h b/src/odhcp6c.h
index b0a1980..2e7107c 100644
--- a/src/odhcp6c.h
+++ b/src/odhcp6c.h
@@ -244,3 +244,4 @@ void odhcp6c_update_entry(enum odhcp6c_state state, struct odhcp6c_entry *new);
 void odhcp6c_update_entry_safe(enum odhcp6c_state state, struct odhcp6c_entry *new, uint32_t safe);
 
 void odhcp6c_expire(void);
+uint32_t odhcp6c_elapsed(void);
diff --git a/src/ra.c b/src/ra.c
index 24c99c5..1b2f729 100644
--- a/src/ra.c
+++ b/src/ra.c
@@ -155,12 +155,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);
@@ -197,7 +201,6 @@ bool ra_process(void)
 	struct nd_router_advert *adv = (struct nd_router_advert*)buf;
 	struct odhcp6c_entry entry = {IN6ADDR_ANY_INIT, 0, 0, IN6ADDR_ANY_INIT, 0, 0};
 	const struct in6_addr any = IN6ADDR_ANY_INIT;
-	odhcp6c_expire();
 
 	while (true) {
 		struct sockaddr_in6 from;
@@ -214,7 +217,10 @@ 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
@@ -308,6 +314,8 @@ bool ra_process(void)
 				entry[i].valid = router_valid;
 	}
 
-	odhcp6c_expire();
+	if (found)
+		odhcp6c_expire();
+
 	return found;
 }
-- 
2.39.2


From 3e286ae023682c7681c72a8cd18457036b1f7d85 Mon Sep 17 00:00:00 2001
From: Steven Barth <steven@midlink.org>
Date: Fri, 31 May 2013 16:05:00 +0200
Subject: [PATCH 02/16] Update README

---
 README | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README b/README
index a6fa298..16ac904 100644
--- a/README
+++ b/README
@@ -68,7 +68,7 @@ Environment:
 * SIP_DOMAIN		A space-separated list of SIP domains
 * OPTION_<num>		Custom option received as base-16
 * PREFIXES		A space-separated list of prefixes currently assigned
-				Format: <prefix>/<length>,preferred,valid,<excluded-prefix>/<length>
+				Format: <prefix>/<length>,preferred,valid[,excluded=<excluded-prefix>/<length>]
 * ADDRESSES		A space-separated list of addresses currently assigned
 				Format: <address>/<length>,preferred,valid
 * RA_ADDRESSES		A space-separated list of addresses from RA-prefixes
-- 
2.39.2


From 83114b179091cb080f09cf4142ee1c9949ea4e30 Mon Sep 17 00:00:00 2001
From: Steven Barth <steven@midlink.org>
Date: Thu, 13 Jun 2013 08:36:31 +0200
Subject: [PATCH 03/16] Add sanity checks for NDP and MTU parameters from RAs

---
 src/ra.c | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/ra.c b/src/ra.c
index 1b2f729..b1526ae 100644
--- a/src/ra.c
+++ b/src/ra.c
@@ -235,10 +235,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));
 
 
@@ -247,7 +247,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;
-- 
2.39.2


From eaf3a11cad8a5dd389d5f52cc76e424e0242074b Mon Sep 17 00:00:00 2001
From: Steven Barth <steven@midlink.org>
Date: Tue, 18 Jun 2013 14:44:43 +0200
Subject: [PATCH 04/16] Allow overriding the interface-identifier for public
 addresses

---
 src/odhcp6c.c | 12 ++++++++++--
 src/ra.c      | 23 +++++++++++++----------
 src/ra.h      |  2 +-
 3 files changed, 24 insertions(+), 13 deletions(-)

diff --git a/src/odhcp6c.c b/src/odhcp6c.c
index 4fefcd7..df89eb9 100644
--- a/src/odhcp6c.c
+++ b/src/odhcp6c.c
@@ -27,6 +27,7 @@
 #include <net/if.h>
 #include <sys/wait.h>
 #include <sys/syscall.h>
+#include <arpa/inet.h>
 
 #include "odhcp6c.h"
 #include "ra.h"
@@ -55,11 +56,12 @@ int main(_unused int argc, char* const argv[])
 	char *optpos;
 	uint16_t opttype;
 	enum odhcp6c_ia_mode ia_na_mode = IA_MODE_TRY;
+	static struct in6_addr ifid = IN6ADDR_ANY_INIT;
 
 	bool help = false, daemonize = false;
 	int logopt = LOG_PID;
 	int c, request_pd = 0;
-	while ((c = getopt(argc, argv, "S::N:P:c:r:s:khedp:")) != -1) {
+	while ((c = getopt(argc, argv, "S::N:P:c:i:r:s:khedp:")) != -1) {
 		switch (c) {
 		case 'S':
 			allow_slaac_only = (optarg) ? atoi(optarg) : -1;
@@ -98,6 +100,11 @@ int main(_unused int argc, char* const argv[])
 			}
 			break;
 
+		case 'i':
+			if (inet_pton(AF_INET6, optarg, &ifid) != 1)
+				help = true;
+			break;
+
 		case 'r':
 			optpos = optarg;
 			while (optpos[0]) {
@@ -151,7 +158,7 @@ int main(_unused int argc, char* const argv[])
 	signal(SIGUSR2, sighandler);
 
 	if ((urandom_fd = open("/dev/urandom", O_CLOEXEC | O_RDONLY)) < 0 ||
-			init_dhcpv6(ifname, request_pd) || ra_init(ifname) ||
+			init_dhcpv6(ifname, request_pd) || ra_init(ifname, &ifid) ||
 			script_init(script, ifname)) {
 		syslog(LOG_ERR, "failed to initialize: %s", strerror(errno));
 		return 3;
@@ -314,6 +321,7 @@ static int usage(void)
 	"	-N <mode>	Mode for requesting addresses [try|force|none]\n"
 	"	-P <length>	Request IPv6-Prefix (0 = auto)\n"
 	"	-c <clientid>	Override client-ID (base-16 encoded)\n"
+	"	-i <iface-id>	Use a custom interface identifier for RA handling\n"
 	"	-r <options>	Options to be requested (comma-separated)\n"
 	"	-s <script>	Status update script (/usr/sbin/odhcp6c-update)\n"
 	"	-k		Don't send a RELEASE when stopping\n"
diff --git a/src/ra.c b/src/ra.c
index b1526ae..4690d41 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
diff --git a/src/ra.h b/src/ra.h
index f87c4f7..f66ff26 100644
--- a/src/ra.h
+++ b/src/ra.h
@@ -34,6 +34,6 @@ struct icmpv6_opt {
 	(void*)(opt + opt->len) <= (void*)(end); opt += opt->len)
 
 
-int ra_init(const char *ifname);
+int ra_init(const char *ifname, const struct in6_addr *ifid);
 bool ra_process(void);
 bool ra_rtnl_process(void);
-- 
2.39.2


From 007ae1a6ae8092878adccde1f610ea9dd86e5aad Mon Sep 17 00:00:00 2001
From: Steven Barth <steven@midlink.org>
Date: Wed, 3 Jul 2013 19:15:36 +0200
Subject: [PATCH 05/16] Add better overflow safety in resend

---
 src/dhcpv6.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/dhcpv6.c b/src/dhcpv6.c
index ed6b8f8..64c0cb4 100644
--- a/src/dhcpv6.c
+++ b/src/dhcpv6.c
@@ -350,14 +350,14 @@ static int64_t dhcpv6_rand_delay(int64_t time)
 {
 	int random;
 	odhcp6c_random(&random, sizeof(random));
-	return (time * (random % 1000)) / 10000;
+	return (time * ((int64_t)random % 1000LL)) / 10000LL;
 }
 
 
 int dhcpv6_request(enum dhcpv6_msg type)
 {
 	uint8_t buf[1536];
-	uint32_t timeout = UINT32_MAX;
+	uint64_t timeout = UINT32_MAX;
 	struct dhcpv6_retx *retx = &dhcpv6_retx[type];
 
 	if (retx->delay) {
@@ -378,7 +378,7 @@ int dhcpv6_request(enum dhcpv6_msg type)
 	if (timeout == 0)
 		return -1;
 
-	syslog(LOG_NOTICE, "Sending %s (timeout %us)", retx->name, timeout);
+	syslog(LOG_NOTICE, "Sending %s (timeout %us)", retx->name, (unsigned)timeout);
 
 	uint64_t start = odhcp6c_get_milli_time(), round_start = start, elapsed;
 
-- 
2.39.2


From 5217b2bb6c26f70f6fe570a340045a372020d06b Mon Sep 17 00:00:00 2001
From: Maico Le Pape <mlepape@cisco.com>
Date: Tue, 30 Jul 2013 23:10:54 +0200
Subject: [PATCH 06/16] Add support for colored address in IA_NA

Signed-off-by: Maico Le Pape <mlepape@cisco.com>
---
 src/dhcpv6.c | 9 +++++++++
 src/script.c | 2 +-
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/src/dhcpv6.c b/src/dhcpv6.c
index 7f2aa1a..01d1494 100644
--- a/src/dhcpv6.c
+++ b/src/dhcpv6.c
@@ -885,6 +885,15 @@ static uint32_t dhcpv6_parse_ia(void *opt, void *end)
 			entry.length = 128;
 			entry.target = addr->addr;
 
+			uint16_t stype, slen;
+			uint8_t *sdata;
+			
+			// Find prefix class, if any
+			dhcpv6_for_each_option(&addr[1], odata + olen,
+					       stype, slen, sdata)
+			  if (stype == DHCPV6_OPT_PREFIX_CLASS && slen == 2) 
+                            entry.prefix_class = ntohs(*((uint16_t*)sdata));
+			
 			odhcp6c_update_entry(STATE_IA_NA, &entry);
 		}
 
diff --git a/src/script.c b/src/script.c
index 3cc7e2b..74aea64 100644
--- a/src/script.c
+++ b/src/script.c
@@ -187,7 +187,7 @@ static void entry_to_env(const char *name, const void *data, size_t len, enum en
 			} else {
 				buf_len += snprintf(&buf[buf_len], 24, ",%u,%u", e[i].preferred, e[i].valid);
 			}
-                        if (type == ENTRY_PREFIX && e[i].prefix_class) {
+			if ((type == ENTRY_PREFIX || type == ENTRY_ADDRESS) && e[i].prefix_class) {
                           buf_len += snprintf(&buf[buf_len], 12, ",class=%u", e[i].prefix_class);
                         }
 
-- 
2.39.2


From b5c20853fcbc081ad950ef2083a4f5c31d6ecb54 Mon Sep 17 00:00:00 2001
From: Steven Barth <steven@midlink.org>
Date: Wed, 31 Jul 2013 19:05:55 +0200
Subject: [PATCH 07/16] Include IAs in Request to be more compatible with some
 servers

---
 src/dhcpv6.c  | 33 ++++++++++++++++++++++++++++++---
 src/odhcp6c.c | 23 ++++++++++++++++++++++-
 src/odhcp6c.h |  5 +++++
 3 files changed, 57 insertions(+), 4 deletions(-)

diff --git a/src/dhcpv6.c b/src/dhcpv6.c
index 64c0cb4..9742c39 100644
--- a/src/dhcpv6.c
+++ b/src/dhcpv6.c
@@ -559,12 +559,12 @@ static int dhcpv6_handle_reconfigure(_unused enum dhcpv6_msg orig,
 
 
 // Collect all advertised servers
-static int dhcpv6_handle_advert(_unused enum dhcpv6_msg orig,
+static int dhcpv6_handle_advert(enum dhcpv6_msg orig,
 		const void *opt, const void *end)
 {
 	uint16_t olen, otype;
 	uint8_t *odata;
-	struct dhcpv6_server_cand cand = {false, false, 0, 0, {0}};
+	struct dhcpv6_server_cand cand = {false, false, 0, 0, {0}, NULL, NULL, 0, 0};
 
 	dhcpv6_for_each_option(opt, end, otype, olen, odata) {
 		if (otype == DHCPV6_OPT_SERVERID && olen <= 130) {
@@ -598,10 +598,25 @@ static int dhcpv6_handle_advert(_unused enum dhcpv6_msg orig,
 					cand.preference -= 2000;
 			}
 		}
+
+		if (orig == DHCPV6_MSG_SOLICIT &&
+				(otype == DHCPV6_OPT_IA_PD || otype == DHCPV6_OPT_IA_NA) &&
+				olen > sizeof(struct dhcpv6_ia_hdr)) {
+			struct dhcpv6_ia_hdr *ia_hdr = (void*)(&odata[-4]);
+			dhcpv6_parse_ia(&ia_hdr[1], odata + olen);
+		}
 	}
 
-	if (cand.duid_len > 0)
+	if (cand.duid_len > 0) {
+		cand.ia_na = odhcp6c_move_state(STATE_IA_NA, &cand.ia_na_len);
+		cand.ia_pd = odhcp6c_move_state(STATE_IA_PD, &cand.ia_pd_len);
 		odhcp6c_add_state(STATE_SERVER_CAND, &cand, sizeof(cand));
+	}
+
+	if (orig == DHCPV6_MSG_SOLICIT) {
+		odhcp6c_clear_state(STATE_IA_NA);
+		odhcp6c_clear_state(STATE_IA_PD);
+	}
 
 	return -1;
 }
@@ -634,8 +649,14 @@ static int dhcpv6_commit_advert(void)
 		odhcp6c_add_state(STATE_SERVER_ID, hdr, sizeof(hdr));
 		odhcp6c_add_state(STATE_SERVER_ID, c->duid, c->duid_len);
 		accept_reconfig = c->wants_reconfigure;
+		odhcp6c_add_state(STATE_IA_NA, c->ia_na, c->ia_na_len);
+		odhcp6c_add_state(STATE_IA_PD, c->ia_pd, c->ia_pd_len);
 	}
 
+	for (size_t i = 0; i < cand_len / sizeof(*c); ++i) {
+		free(cand[i].ia_na);
+		free(cand[i].ia_pd);
+	}
 	odhcp6c_clear_state(STATE_SERVER_CAND);
 
 	if (!c)
@@ -691,6 +712,12 @@ static int dhcpv6_handle_reply(enum dhcpv6_msg orig,
 		t1 = t2 = t3 = UINT32_MAX;
 	}
 
+	if (orig == DHCPV6_MSG_REQUEST) {
+		// Delete NA and PD we have in the state from the Advert
+		odhcp6c_clear_state(STATE_IA_NA);
+		odhcp6c_clear_state(STATE_IA_PD);
+	}
+
 	if (opt) {
 		odhcp6c_clear_state(STATE_DNS);
 		odhcp6c_clear_state(STATE_SEARCH);
diff --git a/src/odhcp6c.c b/src/odhcp6c.c
index df89eb9..f732d9e 100644
--- a/src/odhcp6c.c
+++ b/src/odhcp6c.c
@@ -192,7 +192,7 @@ int main(_unused int argc, char* const argv[])
 
 	while (do_signal != SIGTERM) { // Main logic
 		odhcp6c_clear_state(STATE_SERVER_ID);
-		odhcp6c_clear_state(STATE_SERVER_CAND);
+		odhcp6c_clear_state(STATE_IA_NA);
 		odhcp6c_clear_state(STATE_IA_PD);
 		odhcp6c_clear_state(STATE_SNTP_IP);
 		odhcp6c_clear_state(STATE_SNTP_FQDN);
@@ -201,6 +201,15 @@ int main(_unused int argc, char* const argv[])
 		dhcpv6_set_ia_na_mode(ia_na_mode);
 		bound = false;
 
+		// Server candidates need deep-delete
+		size_t cand_len;
+		struct dhcpv6_server_cand *cand = odhcp6c_get_state(STATE_SERVER_CAND, &cand_len);
+		for (size_t i = 0; i < cand_len / sizeof(*cand); ++i) {
+			free(cand[i].ia_na);
+			free(cand[i].ia_pd);
+		}
+		odhcp6c_clear_state(STATE_SERVER_CAND);
+
 		syslog(LOG_NOTICE, "(re)starting transaction on %s", ifname);
 
 		do_signal = 0;
@@ -405,6 +414,18 @@ size_t odhcp6c_remove_state(enum odhcp6c_state state, size_t offset, size_t len)
 }
 
 
+void* odhcp6c_move_state(enum odhcp6c_state state, size_t *len)
+{
+	*len = state_len[state];
+	void *data = state_data[state];
+
+	state_len[state] = 0;
+	state_data[state] = NULL;
+
+	return data;
+}
+
+
 void* odhcp6c_get_state(enum odhcp6c_state state, size_t *len)
 {
 	*len = state_len[state];
diff --git a/src/odhcp6c.h b/src/odhcp6c.h
index 2e7107c..ac0932f 100644
--- a/src/odhcp6c.h
+++ b/src/odhcp6c.h
@@ -158,6 +158,10 @@ struct dhcpv6_server_cand {
 	int16_t preference;
 	uint8_t duid_len;
 	uint8_t duid[130];
+	void *ia_na;
+	void *ia_pd;
+	size_t ia_na_len;
+	size_t ia_pd_len;
 };
 
 
@@ -236,6 +240,7 @@ void odhcp6c_random(void *buf, size_t len);
 void odhcp6c_clear_state(enum odhcp6c_state state);
 void odhcp6c_add_state(enum odhcp6c_state state, const void *data, size_t len);
 size_t odhcp6c_remove_state(enum odhcp6c_state state, size_t offset, size_t len);
+void* odhcp6c_move_state(enum odhcp6c_state state, size_t *len);
 void* odhcp6c_get_state(enum odhcp6c_state state, size_t *len);
 
 // Entry manipulation
-- 
2.39.2


From 7a0a5a7a6378b958f1dde4841504401d9bc0273c Mon Sep 17 00:00:00 2001
From: Steven Barth <steven@midlink.org>
Date: Thu, 1 Aug 2013 09:28:27 +0200
Subject: [PATCH 08/16] Fix including PD in request

---
 src/dhcpv6.c | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/dhcpv6.c b/src/dhcpv6.c
index 9742c39..3f5bc83 100644
--- a/src/dhcpv6.c
+++ b/src/dhcpv6.c
@@ -567,6 +567,13 @@ static int dhcpv6_handle_advert(enum dhcpv6_msg orig,
 	struct dhcpv6_server_cand cand = {false, false, 0, 0, {0}, NULL, NULL, 0, 0};
 
 	dhcpv6_for_each_option(opt, end, otype, olen, odata) {
+		if (orig == DHCPV6_MSG_SOLICIT &&
+				(otype == DHCPV6_OPT_IA_PD || otype == DHCPV6_OPT_IA_NA) &&
+				olen > sizeof(struct dhcpv6_ia_hdr)) {
+			struct dhcpv6_ia_hdr *ia_hdr = (void*)(&odata[-4]);
+			dhcpv6_parse_ia(&ia_hdr[1], odata + olen);
+		}
+
 		if (otype == DHCPV6_OPT_SERVERID && olen <= 130) {
 			memcpy(cand.duid, odata, olen);
 			cand.duid_len = olen;
@@ -598,13 +605,6 @@ static int dhcpv6_handle_advert(enum dhcpv6_msg orig,
 					cand.preference -= 2000;
 			}
 		}
-
-		if (orig == DHCPV6_MSG_SOLICIT &&
-				(otype == DHCPV6_OPT_IA_PD || otype == DHCPV6_OPT_IA_NA) &&
-				olen > sizeof(struct dhcpv6_ia_hdr)) {
-			struct dhcpv6_ia_hdr *ia_hdr = (void*)(&odata[-4]);
-			dhcpv6_parse_ia(&ia_hdr[1], odata + olen);
-		}
 	}
 
 	if (cand.duid_len > 0) {
-- 
2.39.2


From dfc86766bf0b3d28f55adf5deb340b1d40176808 Mon Sep 17 00:00:00 2001
From: Steven Barth <steven@midlink.org>
Date: Fri, 30 Aug 2013 17:41:55 +0200
Subject: [PATCH 09/16] Remove DAD for now due to kernel issues

---
 src/odhcp6c.c |  3 +--
 src/ra.c      | 71 +--------------------------------------------------
 src/ra.h      |  1 -
 3 files changed, 2 insertions(+), 73 deletions(-)

diff --git a/src/odhcp6c.c b/src/odhcp6c.c
index f732d9e..38b8e82 100644
--- a/src/odhcp6c.c
+++ b/src/odhcp6c.c
@@ -375,10 +375,9 @@ bool odhcp6c_signal_process(void)
 {
 	if (do_signal == SIGIO) {
 		do_signal = 0;
-		bool ra_rtnled = ra_rtnl_process();
 		bool ra_updated = ra_process();
 
-		if (ra_rtnled || (ra_updated && (bound || allow_slaac_only == 0)))
+		if (ra_updated && (bound || allow_slaac_only == 0))
 			script_call("ra-updated"); // Immediate process urgent events
 		else if (ra_updated && !bound && allow_slaac_only > 0)
 			script_delay_call("ra-updated", allow_slaac_only);
diff --git a/src/ra.c b/src/ra.c
index 4690d41..4c1302c 100644
--- a/src/ra.c
+++ b/src/ra.c
@@ -34,7 +34,7 @@
 #include "ra.h"
 
 
-static int sock = -1, rtnl_sock = -1;
+static int sock = -1;
 static unsigned if_index = 0;
 static char if_name[IF_NAMESIZE] = {0};
 static volatile int rs_attempt = 0;
@@ -90,18 +90,6 @@ int ra_init(const char *ifname, const struct in6_addr *ifid)
 		}
 	}
 
-	// Open rtnetlink socket
-	rtnl_sock = socket(AF_NETLINK, SOCK_RAW | SOCK_CLOEXEC, NETLINK_ROUTE);
-	struct sockaddr_nl rtnl_kernel = { .nl_family = AF_NETLINK };
-	if (connect(rtnl_sock, (struct sockaddr*)&rtnl_kernel, sizeof(rtnl_kernel)))
-		return -1;
-	uint32_t group = RTNLGRP_IPV6_IFADDR;
-	setsockopt(rtnl_sock, SOL_NETLINK, NETLINK_ADD_MEMBERSHIP, &group, sizeof(group));
-
-	// Add async-mode
-	fcntl(rtnl_sock, F_SETOWN, ourpid);
-	fcntl(rtnl_sock, F_SETFL, fcntl(rtnl_sock, F_GETFL) | O_ASYNC);
-
 	// Send RS
 	signal(SIGALRM, ra_send_rs);
 	ra_send_rs(SIGALRM);
@@ -140,63 +128,6 @@ 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 *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));
-	} else if (odhcp6c_find_entry(STATE_IA_NA, &entry)) {
-		dhcpv6_request(DHCPV6_MSG_DECLINE);
-		raise(SIGUSR2);
-	}
-
-	return !!x;
-}
-
-
-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);
-			struct in6_addr *addr = NULL;
-			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)) ||
-					(nh->nlmsg_type != RTM_NEWADDR && nh->nlmsg_type != RTM_DELADDR))
-				continue;
-
-			ssize_t alen = NLMSG_PAYLOAD(nh, sizeof(*ifa));
-			for (struct rtattr *rta = (struct rtattr*)&ifa[1]; RTA_OK(rta, alen);
-					rta = RTA_NEXT(rta, alen))
-				if (rta->rta_type == IFA_ADDRESS && RTA_PAYLOAD(rta) >= sizeof(*addr))
-					addr = RTA_DATA(rta);
-
-			if (addr) {
-				char ipbuf[INET6_ADDRSTRLEN];
-				inet_ntop(AF_INET6, addr, ipbuf, sizeof(ipbuf));
-				syslog(LOG_WARNING, "duplicate address detected: %s (code: %u:%x)",
-						ipbuf, (unsigned)nh->nlmsg_type, (unsigned)ifa->ifa_flags);
-				found |= ra_deduplicate(addr, ifa->ifa_prefixlen);
-			}
-		}
-	}
-	return found;
-}
-
-
 bool ra_process(void)
 {
 	bool found = false;
diff --git a/src/ra.h b/src/ra.h
index f66ff26..a31e7f6 100644
--- a/src/ra.h
+++ b/src/ra.h
@@ -36,4 +36,3 @@ struct icmpv6_opt {
 
 int ra_init(const char *ifname, const struct in6_addr *ifid);
 bool ra_process(void);
-bool ra_rtnl_process(void);
-- 
2.39.2


From d19d55cec4083b942a9e13a188659c7097d659d2 Mon Sep 17 00:00:00 2001
From: Steven Barth <steven@midlink.org>
Date: Fri, 30 Aug 2013 16:57:23 +0200
Subject: [PATCH 10/16] Update README

---
 README | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/README b/README
index 16ac904..cccb3ea 100644
--- a/README
+++ b/README
@@ -16,8 +16,7 @@ especially routers. It compiles to only about 30 KB (-Os -s).
 
 2. Handling of non-temporary addresses (IA_NA)
 	a) handling of valid and preferred lifetimes
-	b) duplicate address detection
-	c) automatic fallback to stateless or PD-only mode
+	b) automatic fallback to stateless or PD-only mode
 
 3. Support for DHCPv6 extension
 	a) Reconfigure-Messages
-- 
2.39.2


From 8e50917e51f7f21c53f9021063670065c8fa06d8 Mon Sep 17 00:00:00 2001
From: Steven Barth <steven@midlink.org>
Date: Sat, 31 Aug 2013 10:48:56 +0200
Subject: [PATCH 11/16] Merge preliminary prefix class support

---
 CMakeLists.txt |  4 ++++
 src/dhcpv6.c   | 26 +++++++++++++++-----------
 src/odhcp6c.c  |  2 +-
 src/odhcp6c.h  |  8 +++++---
 src/script.c   |  6 +++---
 5 files changed, 28 insertions(+), 18 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index db7ef65..8112859 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -7,6 +7,10 @@ set(CMAKE_SHARED_LIBRARY_LINK_C_FLAGS "")
 set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -g -std=c99")
 add_definitions(-D_GNU_SOURCE -Wall -Werror -Wextra -pedantic)
 
+if(${EXT_PREFIX_CLASS})
+	add_definitions(-DEXT_PREFIX_CLASS=${EXT_PREFIX_CLASS})
+endif(${EXT_PREFIX_CLASS})
+
 add_executable(odhcp6c src/odhcp6c.c src/dhcpv6.c src/ra.c src/script.c src/md5.c)
 target_link_libraries(odhcp6c resolv)
 
diff --git a/src/dhcpv6.c b/src/dhcpv6.c
index fe4cc0b..785b57b 100644
--- a/src/dhcpv6.c
+++ b/src/dhcpv6.c
@@ -145,7 +145,9 @@ int init_dhcpv6(const char *ifname, int request_pd)
 			htons(DHCPV6_OPT_SIP_SERVER_A),
 			htons(DHCPV6_OPT_AFTR_NAME),
 			htons(DHCPV6_OPT_PD_EXCLUDE),
+#ifdef EXT_PREFIX_CLASS
 			htons(DHCPV6_OPT_PREFIX_CLASS),
+#endif
 	};
 	odhcp6c_add_state(STATE_ORO, oro, sizeof(oro));
 
@@ -831,8 +833,8 @@ static uint32_t dhcpv6_parse_ia(void *opt, void *end)
 
 	// Update address IA
 	dhcpv6_for_each_option(opt, end, otype, olen, odata) {
-          struct odhcp6c_entry entry = {IN6ADDR_ANY_INIT,
-                                        0, 0, IN6ADDR_ANY_INIT, 0, 0, 0};
+		struct odhcp6c_entry entry = {IN6ADDR_ANY_INIT, 0, 0,
+				IN6ADDR_ANY_INIT, 0, 0, 0};
 
 		if (otype == DHCPV6_OPT_IA_PREFIX) {
 			struct dhcpv6_ia_prefix *prefix = (void*)&odata[-4];
@@ -850,11 +852,13 @@ static uint32_t dhcpv6_parse_ia(void *opt, void *end)
 			uint16_t stype, slen;
 			uint8_t *sdata;
 
+#ifdef EXT_PREFIX_CLASS
                         // Find prefix class, if any
 			dhcpv6_for_each_option(&prefix[1], odata + olen,
-                                               stype, slen, sdata)
-                          if (stype == DHCPV6_OPT_PREFIX_CLASS && slen == 2) 
-                            entry.prefix_class = ntohs(*((uint16_t*)sdata));
+					stype, slen, sdata)
+				if (stype == DHCPV6_OPT_PREFIX_CLASS && slen == 2)
+					entry.class = sdata[0] << 8 | sdata[1];
+#endif
 
 			// Parse PD-exclude
 			bool ok = true;
@@ -912,18 +916,18 @@ static uint32_t dhcpv6_parse_ia(void *opt, void *end)
 			entry.length = 128;
 			entry.target = addr->addr;
 
+#ifdef EXT_PREFIX_CLASS
 			uint16_t stype, slen;
 			uint8_t *sdata;
-			
 			// Find prefix class, if any
 			dhcpv6_for_each_option(&addr[1], odata + olen,
-					       stype, slen, sdata)
-			  if (stype == DHCPV6_OPT_PREFIX_CLASS && slen == 2) 
-                            entry.prefix_class = ntohs(*((uint16_t*)sdata));
-			
+					stype, slen, sdata)
+				if (stype == DHCPV6_OPT_PREFIX_CLASS && slen == 2)
+					entry.class = sdata[0] << 8 | sdata[1];
+#endif
+
 			odhcp6c_update_entry(STATE_IA_NA, &entry);
 		}
-
 		if (entry.valid > 0 && timeout > entry.valid)
 			timeout = entry.valid;
 	}
diff --git a/src/odhcp6c.c b/src/odhcp6c.c
index b2c6b98..d35da2e 100644
--- a/src/odhcp6c.c
+++ b/src/odhcp6c.c
@@ -459,7 +459,7 @@ void odhcp6c_update_entry_safe(enum odhcp6c_state state, struct odhcp6c_entry *n
 		if (x) {
 			x->valid = new->valid;
 			x->preferred = new->preferred;
-                        x->prefix_class = new->prefix_class;
+			x->class = new->class;
 		} else {
 			odhcp6c_add_state(state, new, sizeof(*new));
 		}
diff --git a/src/odhcp6c.h b/src/odhcp6c.h
index e0f6f62..eb76b6b 100644
--- a/src/odhcp6c.h
+++ b/src/odhcp6c.h
@@ -53,8 +53,10 @@ enum dhcvp6_opt {
 	DHCPV6_OPT_SIP_SERVER_A = 22,
 	DHCPV6_OPT_AFTR_NAME = 64,
 	DHCPV6_OPT_PD_EXCLUDE = 67,
-        /* draft-bhandari-dhc-class-based-prefix */
-	DHCPV6_OPT_PREFIX_CLASS = 200, /* NOT STANDARDIZED! */
+#ifdef EXT_PREFIX_CLASS
+        /* draft-bhandari-dhc-class-based-prefix, not yet standardized */
+	DHCPV6_OPT_PREFIX_CLASS = EXT_PREFIX_CLASS,
+#endif
 };
 
 enum dhcpv6_opt_npt {
@@ -217,7 +219,7 @@ struct odhcp6c_entry {
 	struct in6_addr target;
 	uint32_t valid;
 	uint32_t preferred;
-        uint32_t prefix_class;
+	uint16_t class;
 };
 
 
diff --git a/src/script.c b/src/script.c
index 74aea64..e5b8341 100644
--- a/src/script.c
+++ b/src/script.c
@@ -187,9 +187,9 @@ static void entry_to_env(const char *name, const void *data, size_t len, enum en
 			} else {
 				buf_len += snprintf(&buf[buf_len], 24, ",%u,%u", e[i].preferred, e[i].valid);
 			}
-			if ((type == ENTRY_PREFIX || type == ENTRY_ADDRESS) && e[i].prefix_class) {
-                          buf_len += snprintf(&buf[buf_len], 12, ",class=%u", e[i].prefix_class);
-                        }
+
+			if ((type == ENTRY_PREFIX || type == ENTRY_ADDRESS) && e[i].class)
+				buf_len += snprintf(&buf[buf_len], 12, ",class=%u", e[i].class);
 
 			if (type == ENTRY_PREFIX && e[i].priority) {
 				// priority and router are abused for prefix exclusion
-- 
2.39.2


From 11ba58c6636f95c5ca35fd2d1ebcbefa696cf8dd Mon Sep 17 00:00:00 2001
From: Steven Barth <steven@midlink.org>
Date: Thu, 12 Sep 2013 14:48:57 +0200
Subject: [PATCH 12/16] Add default T1, T2, T3 for buggy servers

---
 src/dhcpv6.c | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/src/dhcpv6.c b/src/dhcpv6.c
index 785b57b..50bbb02 100644
--- a/src/dhcpv6.c
+++ b/src/dhcpv6.c
@@ -821,6 +821,15 @@ static int dhcpv6_handle_reply(enum dhcpv6_msg orig,
 		}
 	}
 
+	if (t1 == UINT32_MAX)
+		t1 = 300;
+
+	if (t2 == UINT32_MAX)
+		t2 = 600;
+
+	if (t3 == UINT32_MAX)
+		t3 = 3600;
+
 	return true;
 }
 
-- 
2.39.2


From 122c431883b221393d8876bef8a07e87e0e524d1 Mon Sep 17 00:00:00 2001
From: Steven Barth <steven@midlink.org>
Date: Wed, 18 Sep 2013 12:25:20 +0200
Subject: [PATCH 13/16] Restart transaction if server returns IAID error code

---
 src/dhcpv6.c | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/src/dhcpv6.c b/src/dhcpv6.c
index 50bbb02..ee2031d 100644
--- a/src/dhcpv6.c
+++ b/src/dhcpv6.c
@@ -744,18 +744,20 @@ static int dhcpv6_handle_reply(enum dhcpv6_msg orig,
 			if (ia_hdr->iaid != 1 || l_t2 < l_t1)
 				continue;
 
-			bool error = false;
+			int error = 0;
 			uint16_t stype, slen;
 			uint8_t *sdata;
 			// Test status and bail if error
 			dhcpv6_for_each_option(&ia_hdr[1], odata + olen,
 					stype, slen, sdata)
-				if (stype == DHCPV6_OPT_STATUS && slen >= 2 &&
-						(sdata[0] || sdata[1]))
-					error = true;
+				if (stype == DHCPV6_OPT_STATUS && slen >= 2)
+					error = ((int)sdata[0]) << 8 | ((int)sdata[1]);
 
-			if (error)
-				continue;
+			if (error) {
+				syslog(LOG_WARNING, "Server returned IAID status %i!", error);
+				raise(SIGUSR2);
+				break;
+			}
 
 			uint32_t n = dhcpv6_parse_ia(&ia_hdr[1], odata + olen);
 
-- 
2.39.2


From 4323a13ae58f9be363847d58ae25733289d91205 Mon Sep 17 00:00:00 2001
From: Steven Barth <steven@midlink.org>
Date: Sat, 21 Sep 2013 12:49:05 +0200
Subject: [PATCH 14/16] Handle NoAddrsAvail IA-status

---
 src/dhcpv6.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/dhcpv6.c b/src/dhcpv6.c
index ee2031d..f128ed8 100644
--- a/src/dhcpv6.c
+++ b/src/dhcpv6.c
@@ -755,7 +755,8 @@ static int dhcpv6_handle_reply(enum dhcpv6_msg orig,
 
 			if (error) {
 				syslog(LOG_WARNING, "Server returned IAID status %i!", error);
-				raise(SIGUSR2);
+				if (error != 2)
+					raise(SIGUSR2);
 				break;
 			}
 
-- 
2.39.2


From 357ecc1f5163bc7f74c64f4bca387e8d44a2eac5 Mon Sep 17 00:00:00 2001
From: Steven Barth <steven@midlink.org>
Date: Wed, 2 Oct 2013 16:10:43 +0200
Subject: [PATCH 15/16] ra: validate hop-limit

---
 src/ra.c | 23 ++++++++++++++++++++---
 1 file changed, 20 insertions(+), 3 deletions(-)

diff --git a/src/ra.c b/src/ra.c
index 9c1ed74..431bcd1 100644
--- a/src/ra.c
+++ b/src/ra.c
@@ -67,6 +67,10 @@ int ra_init(const char *ifname, const struct in6_addr *ifid)
 	val = 255;
 	setsockopt(sock, IPPROTO_IPV6, IPV6_MULTICAST_HOPS, &val, sizeof(val));
 
+	// Receive multicast hops
+	val = 1;
+	setsockopt(sock, IPPROTO_IPV6, IPV6_RECVHOPLIMIT, &val, sizeof(val));
+
 	// Bind to one device
 	setsockopt(sock, SOL_SOCKET, SO_BINDTODEVICE, ifname, strlen(ifname));
 
@@ -131,20 +135,33 @@ static void update_proc(const char *sect, const char *opt, uint32_t value)
 bool ra_process(void)
 {
 	bool found = false;
-	uint8_t buf[1500];
+	uint8_t buf[1500], cmsg_buf[128];
 	struct nd_router_advert *adv = (struct nd_router_advert*)buf;
 	struct odhcp6c_entry entry = {IN6ADDR_ANY_INIT, 0, 0, IN6ADDR_ANY_INIT, 0, 0, 0};
 	const struct in6_addr any = IN6ADDR_ANY_INIT;
 
 	while (true) {
 		struct sockaddr_in6 from;
-		socklen_t from_len = sizeof(from);
-		ssize_t len = recvfrom(sock, buf, sizeof(buf), MSG_DONTWAIT, &from, &from_len);
+		struct iovec iov = {buf, sizeof(buf)};
+		struct msghdr msg = {&from, sizeof(from), &iov, 1,
+				cmsg_buf, sizeof(cmsg_buf), 0};
+
+		ssize_t len = recvmsg(sock, &msg, MSG_DONTWAIT);
 		if (len < 0)
 			break;
 		else if (len < (ssize_t)sizeof(*adv))
 			continue;
 
+		int hlim = 0;
+		for (struct cmsghdr *ch = CMSG_FIRSTHDR(&msg); ch != NULL;
+				ch = CMSG_NXTHDR(&msg, ch))
+			if (ch->cmsg_level == IPPROTO_IPV6 &&
+					ch->cmsg_type == IPV6_HOPLIMIT)
+				memcpy(&hlim, CMSG_DATA(ch), sizeof(hlim));
+
+		if (hlim != 255)
+			continue;
+
 		// Stop sending solicits
 		if (rs_attempt > 0) {
 			alarm(0);
-- 
2.39.2


From 0a3874a2dc344c7b40592951a726bfdd81283487 Mon Sep 17 00:00:00 2001
From: Steven Barth <steven@midlink.org>
Date: Fri, 4 Oct 2013 08:26:38 +0200
Subject: [PATCH 16/16] Check for local addr more often

---
 src/ra.c | 30 +++++++++++++++---------------
 1 file changed, 15 insertions(+), 15 deletions(-)

diff --git a/src/ra.c b/src/ra.c
index 431bcd1..83f1758 100644
--- a/src/ra.c
+++ b/src/ra.c
@@ -79,21 +79,6 @@ int ra_init(const char *ifname, const struct in6_addr *ifid)
 	fcntl(sock, F_SETOWN, ourpid);
 	fcntl(sock, F_SETFL, fcntl(sock, F_GETFL) | O_ASYNC);
 
-	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);
-		}
-	}
-
 	// Send RS
 	signal(SIGALRM, ra_send_rs);
 	ra_send_rs(SIGALRM);
@@ -140,6 +125,21 @@ bool ra_process(void)
 	struct odhcp6c_entry entry = {IN6ADDR_ANY_INIT, 0, 0, IN6ADDR_ANY_INIT, 0, 0, 0};
 	const struct in6_addr any = IN6ADDR_ANY_INIT;
 
+	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);
+		}
+	}
+
 	while (true) {
 		struct sockaddr_in6 from;
 		struct iovec iov = {buf, sizeof(buf)};
-- 
2.39.2