X-Git-Url: https://git.decadent.org.uk/gitweb/?p=odhcp6c.git;a=blobdiff_plain;f=src%2Fodhcp6c.c;h=de03b814f95efa86bde343374a14b6769e04cd02;hp=6ce9adf33ce344548b72ed700d40f9c3934066b0;hb=be05c0ded0257cbb82857f6d01226ef6de28befe;hpb=d09e94fff82440cedf04f2e0cfe1ede8a0ab0600

diff --git a/src/odhcp6c.c b/src/odhcp6c.c
index 6ce9adf..de03b81 100644
--- a/src/odhcp6c.c
+++ b/src/odhcp6c.c
@@ -27,21 +27,26 @@
 #include <net/if.h>
 #include <sys/wait.h>
 #include <sys/syscall.h>
+#include <arpa/inet.h>
 
 #include "odhcp6c.h"
 #include "ra.h"
 
+#ifdef EXT_BFD_PING
+#include "bfd.h"
+#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, allow_slaac_only = 15;
+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[])
@@ -54,32 +59,56 @@ 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 = 120;
+
+#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, "S::N: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 = (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':
+			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);
@@ -94,6 +123,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]) {
@@ -114,6 +148,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;
@@ -147,8 +185,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;
 	}
@@ -181,22 +219,31 @@ 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;
 
+		// 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;
 		int res = dhcpv6_request(DHCPV6_MSG_SOLICIT);
 		odhcp6c_signal_process();
 
-		if (res < 0) {
+		if (res <= 0) {
 			continue; // Might happen if we got a signal
 		} else if (res == DHCPV6_STATELESS) { // Stateless mode
 			while (do_signal == 0 || do_signal == SIGUSR1) {
@@ -222,23 +269,25 @@ int main(_unused int argc, char* const argv[])
 		}
 
 		// Stateful mode
-		if (dhcpv6_request(DHCPV6_MSG_REQUEST) < 0)
+		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);
+#ifdef EXT_BFD_PING
+		if (bfd_interval > 0)
+			bfd_start(ifname, bfd_loss, bfd_interval);
+#endif
 
 		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)
-					script_call("updated");
-
+			if (res > 0) {
+				script_call("updated");
 				continue;
 			}
 
@@ -259,10 +308,11 @@ int main(_unused int argc, char* const argv[])
 			else
 				r = dhcpv6_request(DHCPV6_MSG_RENEW);
 			odhcp6c_signal_process();
-			if (r > 0) // Publish updates
+			if (r > 0) { // Renew was succesfull
+				// Publish updates
 				script_call("updated");
-			if (r >= 0)
 				continue; // Renew was successful
+			}
 
 			odhcp6c_clear_state(STATE_SERVER_ID); // Remove binding
 
@@ -272,13 +322,17 @@ int main(_unused int argc, char* const argv[])
 
 			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) ||
+			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");
 		}
 
+#ifdef EXT_BFD_PING
+		bfd_stop();
+#endif
+
 
 		size_t ia_pd_len, ia_na_len, server_id_len;
 		odhcp6c_get_state(STATE_IA_PD, &ia_pd_len);
@@ -306,13 +360,19 @@ static int usage(void)
 	const char buf[] =
 	"Usage: odhcp6c [options] <interface>\n"
 	"\nFeature options:\n"
-	"	-S <time>	Wait at least <time> sec for a DHCP-server (15)\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"
@@ -356,10 +416,17 @@ bool odhcp6c_signal_process(void)
 		do_signal = 0;
 		bool ra_updated = ra_process();
 
-		if (ra_rtnl_process() || (ra_updated && (bound || allow_slaac_only == 0)))
+		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;
@@ -392,6 +459,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];
@@ -413,7 +492,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);
@@ -424,20 +503,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);
 }
 
 
@@ -446,6 +534,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)
@@ -464,10 +562,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);
@@ -478,11 +574,21 @@ 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;
+}
 
 static void sighandler(int signal)
 {