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

diff --git a/src/odhcp6c.c b/src/odhcp6c.c
index 6ce9adf..d35da2e 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"
@@ -40,8 +41,9 @@ 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,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;
@@ -76,6 +79,9 @@ int main(_unused int argc, char* const argv[])
 			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;
@@ -94,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]) {
@@ -147,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;
@@ -181,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);
@@ -190,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;
@@ -306,10 +326,11 @@ 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"
 	"	-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"
@@ -356,7 +377,7 @@ 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_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);
@@ -392,6 +413,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];
@@ -426,6 +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->class = new->class;
 		} else {
 			odhcp6c_add_state(state, new, sizeof(*new));
 		}
@@ -464,10 +498,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,6 +510,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);