X-Git-Url: https://git.decadent.org.uk/gitweb/?p=odhcp6c.git;a=blobdiff_plain;f=src%2Fodhcp6c.c;h=de452c04a7fef0de9488aef00fdafcac1119e779;hp=88f2ae5c7228c1b51e5781fdeb075c4ed4dc99a8;hb=8563be22c8d9e3cf38b26d69d52368c68ad3a6dd;hpb=920fda0ef9da478202fc330cc887e1ef3d703925

diff --git a/src/odhcp6c.c b/src/odhcp6c.c
index 88f2ae5..de452c0 100644
--- a/src/odhcp6c.c
+++ b/src/odhcp6c.c
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2012 Steven Barth <steven@midlink.org>
+ * Copyright (C) 2012-2013 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
@@ -14,6 +14,7 @@
 
 #include <time.h>
 #include <errno.h>
+#include <ctype.h>
 #include <fcntl.h>
 #include <stdio.h>
 #include <stdlib.h>
@@ -22,27 +23,39 @@
 #include <syslog.h>
 #include <signal.h>
 #include <string.h>
+#include <strings.h>
 #include <stdbool.h>
 
 #include <net/if.h>
 #include <sys/wait.h>
 #include <sys/syscall.h>
+#include <arpa/inet.h>
+#include <linux/if_addr.h>
 
 #include "odhcp6c.h"
 #include "ra.h"
 
+#ifdef EXT_BFD_PING
+#include "bfd.h"
+#endif
+
+#ifndef IN6_IS_ADDR_UNIQUELOCAL
+#define IN6_IS_ADDR_UNIQUELOCAL(a) \
+	((((__const uint32_t *) (a))[0] & htonl (0xfe000000)) \
+	 == htonl (0xfc000000))
+#endif
 
 static void sighandler(int signal);
 static int usage(void);
 
-
 static uint8_t *state_data[_STATE_MAX] = {NULL};
 static size_t state_len[_STATE_MAX] = {0};
 
 static volatile int do_signal = 0;
-static int urandom_fd = -1;
-static bool bound = false, allow_slaac_only = true, release = true;
-
+static int urandom_fd = -1, allow_slaac_only = 0;
+static bool bound = false, release = true;
+static time_t last_update = 0;
+static char *ifname = NULL;
 
 int main(_unused int argc, char* const argv[])
 {
@@ -54,34 +67,57 @@ int main(_unused int argc, char* const argv[])
 	char *optpos;
 	uint16_t opttype;
 	enum odhcp6c_ia_mode ia_na_mode = IA_MODE_TRY;
+	enum odhcp6c_ia_mode ia_pd_mode = IA_MODE_TRY;
+	static struct in6_addr ifid = IN6ADDR_ANY_INIT;
+	int sol_timeout = DHCPV6_SOL_MAX_RT;
+
+#ifdef EXT_BFD_PING
+	int bfd_interval = 0, bfd_loss = 3;
+#endif
 
 	bool help = false, daemonize = false;
 	int logopt = LOG_PID;
 	int c, request_pd = 0;
-	while ((c = getopt(argc, argv, "SN:P:c:r:s:khedp:")) != -1) {
+	while ((c = getopt(argc, argv, "S::N:P:FB:c:i:r:s:kt:hedp:")) != -1) {
 		switch (c) {
 		case 'S':
-			allow_slaac_only = false;
+			allow_slaac_only = (optarg) ? atoi(optarg) : -1;
 			break;
 
 		case 'N':
-			if (!strcmp(optarg, "force"))
+			if (!strcmp(optarg, "force")) {
 				ia_na_mode = IA_MODE_FORCE;
-			else if (!strcmp(optarg, "none"))
+				allow_slaac_only = -1;
+			} else if (!strcmp(optarg, "none")) {
 				ia_na_mode = IA_MODE_NONE;
-			else if (!strcmp(optarg, "try"))
+			} else if (!strcmp(optarg, "try")) {
 				ia_na_mode = IA_MODE_TRY;
-			else
+			} else{
 				help = true;
+			}
 			break;
 
 		case 'P':
-			allow_slaac_only = false;
+			if (allow_slaac_only >= 0 && allow_slaac_only < 10)
+				allow_slaac_only = 10;
+
 			request_pd = strtoul(optarg, NULL, 10);
 			if (request_pd == 0)
 				request_pd = -1;
+
 			break;
 
+		case 'F':
+			allow_slaac_only = -1;
+			ia_pd_mode = IA_MODE_FORCE;
+			break;
+
+#ifdef EXT_BFD_PING
+		case 'B':
+			bfd_interval = atoi(optarg);
+			break;
+#endif
+
 		case 'c':
 			l = script_unhexlify(&buf[4], sizeof(buf) - 4, optarg);
 			if (l > 0) {
@@ -95,6 +131,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]) {
@@ -115,6 +156,10 @@ int main(_unused int argc, char* const argv[])
 			release = false;
 			break;
 
+		case 't':
+			sol_timeout = atoi(optarg);
+			break;
+
 		case 'e':
 			logopt |= LOG_PERROR;
 			break;
@@ -134,7 +179,7 @@ int main(_unused int argc, char* const argv[])
 	}
 
 	openlog("odhcp6c", logopt, LOG_DAEMON);
-	const char *ifname = argv[optind];
+	ifname = argv[optind];
 
 	if (help || !ifname)
 		return usage();
@@ -148,8 +193,8 @@ 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) ||
-			script_init(script, ifname)) {
+			init_dhcpv6(ifname, request_pd, sol_timeout) ||
+			ra_init(ifname, &ifid) || script_init(script, ifname)) {
 		syslog(LOG_ERR, "failed to initialize: %s", strerror(errno));
 		return 3;
 	}
@@ -182,26 +227,62 @@ 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);
 		odhcp6c_clear_state(STATE_SIP_IP);
 		odhcp6c_clear_state(STATE_SIP_FQDN);
-		dhcpv6_set_ia_na_mode(ia_na_mode);
+		dhcpv6_set_ia_mode(ia_na_mode, ia_pd_mode);
 		bound = false;
 
 		syslog(LOG_NOTICE, "(re)starting transaction on %s", ifname);
 
 		do_signal = 0;
-		int res = dhcpv6_request(DHCPV6_MSG_SOLICIT);
+		int mode = dhcpv6_request(DHCPV6_MSG_SOLICIT);
 		odhcp6c_signal_process();
 
-		if (res < 0) {
-			continue; // Might happen if we got a signal
-		} else if (res == DHCPV6_STATELESS) { // Stateless mode
+		if (mode < 0)
+			continue;
+
+		do {
+			int res = dhcpv6_request(mode == DHCPV6_STATELESS ?
+					DHCPV6_MSG_INFO_REQ : DHCPV6_MSG_REQUEST);
+
+			odhcp6c_signal_process();
+			if (res > 0)
+				break;
+			else if (do_signal > 0) {
+				mode = -1;
+				break;
+			}
+
+			mode = dhcpv6_promote_server_cand();
+		} while (mode > DHCPV6_UNKNOWN);
+
+		if (mode < 0)
+			continue;
+
+		switch (mode) {
+		case DHCPV6_STATELESS:
+			bound = true;
+			syslog(LOG_NOTICE, "entering stateless-mode on %s", ifname);
+
 			while (do_signal == 0 || do_signal == SIGUSR1) {
 				do_signal = 0;
+				script_call("informed");					
+
+				int res = dhcpv6_poll_reconfigure();
+				odhcp6c_signal_process();
+
+				if (res > 0)
+					continue;
+
+				if (do_signal == SIGUSR1) {
+					do_signal = 0; // Acknowledged
+					continue;
+				} else if (do_signal > 0)
+					break;
 
 				res = dhcpv6_request(DHCPV6_MSG_INFO_REQ);
 				odhcp6c_signal_process();
@@ -209,78 +290,64 @@ int main(_unused int argc, char* const argv[])
 					continue;
 				else if (res < 0)
 					break;
-				else if (res > 0)
-					script_call("informed");
-
-				bound = true;
-				syslog(LOG_NOTICE, "entering stateless-mode on %s", ifname);
-
-				if (dhcpv6_poll_reconfigure() > 0)
-					script_call("informed");
 			}
+			break;
 
-			continue;
-		}
+		case DHCPV6_STATEFUL:
+			script_call("bound");
+			bound = true;
+			syslog(LOG_NOTICE, "entering stateful-mode on %s", ifname);
+#ifdef EXT_BFD_PING
+			if (bfd_interval > 0)
+				bfd_start(ifname, bfd_loss, bfd_interval);
+#endif
 
-		// Stateful mode
-		if (dhcpv6_request(DHCPV6_MSG_REQUEST) < 0)
-			continue;
-
-		odhcp6c_signal_process();
-		script_call("bound");
-		bound = true;
-		syslog(LOG_NOTICE, "entering stateful-mode on %s", ifname);
-
-		while (do_signal == 0 || do_signal == SIGUSR1) {
-			// Renew Cycle
-			// Wait for T1 to expire or until we get a reconfigure
-			int res = dhcpv6_poll_reconfigure();
-			odhcp6c_signal_process();
-			if (res >= 0) {
-				if (res > 0)
+			while (do_signal == 0 || do_signal == SIGUSR1) {
+				// Renew Cycle
+				// Wait for T1 to expire or until we get a reconfigure
+				int res = dhcpv6_poll_reconfigure();
+				odhcp6c_signal_process();
+				if (res > 0) {
 					script_call("updated");
+					continue;
+				}
 
-				continue;
-			}
+				// Handle signal, if necessary
+				if (do_signal == SIGUSR1)
+					do_signal = 0; // Acknowledged
+				else if (do_signal > 0)
+					break; // Other signal type
 
-			// Handle signal, if necessary
-			if (do_signal == SIGUSR1)
-				do_signal = 0; // Acknowledged
-			else if (do_signal > 0)
-				break; // Other signal type
-
-			size_t ia_pd_len, ia_na_len, ia_pd_new, ia_na_new;
-			odhcp6c_get_state(STATE_IA_PD, &ia_pd_len);
-			odhcp6c_get_state(STATE_IA_NA, &ia_na_len);
-
-			// If we have any IAs, send renew, otherwise request
-			int r;
-			if (ia_pd_len == 0 && ia_na_len == 0)
-				r = dhcpv6_request(DHCPV6_MSG_REQUEST);
-			else
-				r = dhcpv6_request(DHCPV6_MSG_RENEW);
-			odhcp6c_signal_process();
-			if (r > 0) // Publish updates
-				script_call("updated");
-			if (r >= 0)
-				continue; // Renew was successful
+				// Send renew as T1 expired
+				res = dhcpv6_request(DHCPV6_MSG_RENEW);
+				odhcp6c_signal_process();
+				if (res > 0) { // Renew was succesfull
+					// Publish updates
+					script_call("updated");
+					continue; // Renew was successful
+				}
+				
+				odhcp6c_clear_state(STATE_SERVER_ID); // Remove binding
 
-			odhcp6c_clear_state(STATE_SERVER_ID); // Remove binding
+				// If we have IAs, try rebind otherwise restart
+				res = dhcpv6_request(DHCPV6_MSG_REBIND);
+				odhcp6c_signal_process();
 
-			// If we have IAs, try rebind otherwise restart
-			res = dhcpv6_request(DHCPV6_MSG_REBIND);
-			odhcp6c_signal_process();
+				if (res > 0)
+					script_call("rebound");
+				else {
+#ifdef EXT_BFD_PING
+					bfd_stop();
+#endif
+					break;
+				}
+			}
+			break;
 
-			odhcp6c_get_state(STATE_IA_PD, &ia_pd_new);
-			odhcp6c_get_state(STATE_IA_NA, &ia_na_new);
-			if (res < 0 || (ia_pd_new == 0 && ia_pd_len) ||
-					(ia_na_new == 0 && ia_na_len))
-				break; // We lost all our IAs, restart
-			else if (res > 0)
-				script_call("rebound");
+		default:
+			break;
 		}
 
-
 		size_t ia_pd_len, ia_na_len, server_id_len;
 		odhcp6c_get_state(STATE_IA_PD, &ia_pd_len);
 		odhcp6c_get_state(STATE_IA_NA, &ia_na_len);
@@ -307,13 +374,19 @@ static int usage(void)
 	const char buf[] =
 	"Usage: odhcp6c [options] <interface>\n"
 	"\nFeature options:\n"
-	"	-S		Don't allow SLAAC-only (implied by -P)\n"
+	"	-S <time>	Wait at least <time> sec for a DHCP-server (0)\n"
 	"	-N <mode>	Mode for requesting addresses [try|force|none]\n"
 	"	-P <length>	Request IPv6-Prefix (0 = auto)\n"
+	"	-F		Force IPv6-Prefix\n"
+#ifdef EXT_BFD_PING
+	"	-B <interval>	Enable BFD ping check\n"
+#endif
 	"	-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"
+	"	-t <seconds>	Maximum timeout for DHCPv6-SOLICIT (120)\n"
 	"\nInvocation options:\n"
 	"	-p <pidfile>	Set pidfile (/var/run/6relayd.pid)\n"
 	"	-d		Daemonize\n"
@@ -355,12 +428,19 @@ bool odhcp6c_signal_process(void)
 {
 	if (do_signal == SIGIO) {
 		do_signal = 0;
-		bool updated = ra_process();
-		updated |= ra_rtnl_process();
-		if (updated && (bound || allow_slaac_only)) {
-			odhcp6c_expire();
-			script_call("ra-updated");
-		}
+		bool ra_updated = ra_process();
+
+		if (ra_link_up())
+			do_signal = SIGUSR2;
+
+		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);
+
+#ifdef EXT_BFD_PING
+		bfd_receive();
+#endif
 	}
 
 	return do_signal != 0;
@@ -380,6 +460,20 @@ void odhcp6c_add_state(enum odhcp6c_state state, const void *data, size_t len)
 		memcpy(n, data, len);
 }
 
+void odhcp6c_insert_state(enum odhcp6c_state state, size_t offset, const void *data, size_t len)
+{
+	ssize_t len_after = state_len[state] - offset;
+	if (len_after < 0)
+		return;
+
+	uint8_t *n = odhcp6c_resize_state(state, len);
+	if (n) {
+		uint8_t *sdata = state_data[state];
+		
+		memmove(sdata + offset + len, sdata + offset, len_after);
+		memcpy(sdata + offset, data, len);
+	}
+}
 
 size_t odhcp6c_remove_state(enum odhcp6c_state state, size_t offset, size_t len)
 {
@@ -393,6 +487,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];
@@ -414,7 +520,7 @@ struct odhcp6c_entry* odhcp6c_find_entry(enum odhcp6c_state state, const struct
 }
 
 
-void odhcp6c_update_entry_safe(enum odhcp6c_state state, struct odhcp6c_entry *new, uint32_t safe)
+bool odhcp6c_update_entry_safe(enum odhcp6c_state state, struct odhcp6c_entry *new, uint32_t safe)
 {
 	size_t len;
 	struct odhcp6c_entry *x = odhcp6c_find_entry(state, new);
@@ -425,20 +531,29 @@ void odhcp6c_update_entry_safe(enum odhcp6c_state state, struct odhcp6c_entry *n
 
 	if (new->valid > 0) {
 		if (x) {
+			if (new->valid >= x->valid && new->valid - x->valid < 60 &&
+					new->preferred >= x->preferred &&
+					new->preferred - x->preferred < 60 &&
+					x->class == new->class)
+				return false;
 			x->valid = new->valid;
 			x->preferred = new->preferred;
+			x->t1 = new->t1;
+			x->t2 = new->t2;
+			x->class = new->class;
 		} else {
 			odhcp6c_add_state(state, new, sizeof(*new));
 		}
 	} else if (x) {
 		odhcp6c_remove_state(state, (x - start) * sizeof(*x), sizeof(*x));
 	}
+	return true;
 }
 
 
-void odhcp6c_update_entry(enum odhcp6c_state state, struct odhcp6c_entry *new)
+bool odhcp6c_update_entry(enum odhcp6c_state state, struct odhcp6c_entry *new)
 {
-	odhcp6c_update_entry_safe(state, new, 0);
+	return odhcp6c_update_entry_safe(state, new, 0);
 }
 
 
@@ -447,6 +562,16 @@ static void odhcp6c_expire_list(enum odhcp6c_state state, uint32_t elapsed)
 	size_t len;
 	struct odhcp6c_entry *start = odhcp6c_get_state(state, &len);
 	for (struct odhcp6c_entry *c = start; c < &start[len / sizeof(*c)]; ++c) {
+		if (c->t1 < elapsed)
+			c->t1 = 0;
+		else if (c->t1 != UINT32_MAX)
+			c->t1 -= elapsed;
+
+		if (c->t2 < elapsed)
+			c->t2 = 0;
+		else if (c->t2 != UINT32_MAX)
+			c->t2 -= elapsed;
+
 		if (c->preferred < elapsed)
 			c->preferred = 0;
 		else if (c->preferred != UINT32_MAX)
@@ -465,10 +590,8 @@ 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 = now - last_update;
+	uint32_t elapsed = (last_update > 0) ? now - last_update : 0;
 	last_update = now;
 
 	odhcp6c_expire_list(STATE_RA_PREFIX, elapsed);
@@ -479,12 +602,75 @@ 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);
 }
 
 
+bool odhcp6c_is_bound(void)
+{
+	return bound;
+}
+
+
+bool odhcp6c_addr_in_scope(const struct in6_addr *addr)
+{
+	FILE *fd = fopen("/proc/net/if_inet6", "r");
+	int len;
+	char buf[256];
+
+	if (fd == NULL)
+		return false;
+
+	while (fgets(buf, sizeof(buf), fd)) {
+		struct in6_addr inet6_addr;
+		uint32_t flags, dummy;
+		unsigned int i;
+		char name[8], addr_buf[32];
+
+		len = strlen(buf);
+
+		if ((len <= 0) || buf[len - 1] != '\n')
+			return false;
+
+		buf[--len] = '\0';
+
+		if (sscanf(buf, "%s %x %x %x %x %s",
+				addr_buf, &dummy, &dummy, &dummy, &flags, name) != 6)
+			return false;
+
+		if (strcmp(name, ifname) ||
+			(flags & (IFA_F_DADFAILED | IFA_F_TENTATIVE | IFA_F_DEPRECATED)))
+			continue;
+
+		for (i = 0; i < sizeof(addr_buf); i++) {
+			if (!isxdigit(addr_buf[i]) || isupper(addr_buf[i]))
+				return false;
+		}
+
+		memset(&inet6_addr, 0, sizeof(inet6_addr));
+		for (i = 0; i < (sizeof(addr_buf) / 2); i++) {
+			unsigned char byte;
+			static const char hex[] = "0123456789abcdef";
+			byte = ((index(hex, addr_buf[i * 2]) - hex) << 4) |
+				(index(hex, addr_buf[i * 2 + 1]) - hex);
+			inet6_addr.s6_addr[i] = byte;
+		}
+
+		if ((IN6_IS_ADDR_LINKLOCAL(&inet6_addr) == IN6_IS_ADDR_LINKLOCAL(addr)) &&
+			(IN6_IS_ADDR_UNIQUELOCAL(&inet6_addr) == IN6_IS_ADDR_UNIQUELOCAL(addr)))
+			return true;
+	}
+	return false;
+}
+
 static void sighandler(int signal)
 {
 	if (signal == SIGCHLD)