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

diff --git a/src/odhcp6c.c b/src/odhcp6c.c
index de452c0..4a9267d 100644
--- a/src/odhcp6c.c
+++ b/src/odhcp6c.c
@@ -14,7 +14,6 @@
 
 #include <time.h>
 #include <errno.h>
-#include <ctype.h>
 #include <fcntl.h>
 #include <stdio.h>
 #include <stdlib.h>
@@ -23,14 +22,12 @@
 #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"
@@ -39,11 +36,6 @@
 #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);
@@ -51,11 +43,14 @@ 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 volatile bool signal_io = false;
+static volatile bool signal_usr1 = false;
+static volatile bool signal_usr2 = false;
+static volatile bool signal_term = false;
+
 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[])
 {
@@ -67,7 +62,8 @@ 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;
+	enum odhcp6c_ia_mode ia_pd_mode = IA_MODE_NONE;
+	int ia_pd_iaid_index = 0;
 	static struct in6_addr ifid = IN6ADDR_ANY_INIT;
 	int sol_timeout = DHCPV6_SOL_MAX_RT;
 
@@ -77,8 +73,10 @@ int main(_unused int argc, char* const argv[])
 
 	bool help = false, daemonize = false;
 	int logopt = LOG_PID;
-	int c, request_pd = 0;
-	while ((c = getopt(argc, argv, "S::N:P:FB:c:i:r:s:kt:hedp:")) != -1) {
+	int c;
+	unsigned int client_options = DHCPV6_CLIENT_FQDN | DHCPV6_ACCEPT_RECONFIGURE;
+
+	while ((c = getopt(argc, argv, "S::N:V:P:FB:c:i:r:Rs:kt:hedp:fa")) != -1) {
 		switch (c) {
 		case 'S':
 			allow_slaac_only = (optarg) ? atoi(optarg) : -1;
@@ -97,13 +95,39 @@ int main(_unused int argc, char* const argv[])
 			}
 			break;
 
+		case 'V':
+			l = script_unhexlify(buf, sizeof(buf), optarg);
+			if (!l)
+				help=true;
+
+			odhcp6c_add_state(STATE_VENDORCLASS, buf, l);
+
+			break;
 		case 'P':
+			if (ia_pd_mode == IA_MODE_NONE)
+				ia_pd_mode = IA_MODE_TRY;
+
 			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;
+			char *iaid_begin;
+			int iaid_len = 0;
+
+			int prefix_length = strtoul(optarg, &iaid_begin, 10);
+
+			if (*iaid_begin != '\0' && *iaid_begin != ',') {
+				syslog(LOG_ERR, "invalid argument: '%s'", optarg);
+				return 1;
+			}
+
+			struct odhcp6c_request_prefix prefix = { 0, prefix_length };
+
+			if (*iaid_begin == ',' && (iaid_len = strlen(iaid_begin)) > 1)
+				memcpy(&prefix.iaid, iaid_begin + 1, iaid_len > 4 ? 4 : iaid_len);
+			else
+				prefix.iaid = ++ia_pd_iaid_index;
+
+			odhcp6c_add_state(STATE_IA_PD_INIT, &prefix, sizeof(prefix));
 
 			break;
 
@@ -148,6 +172,10 @@ int main(_unused int argc, char* const argv[])
 			}
 			break;
 
+		case 'R':
+			client_options |= DHCPV6_STRICT_OPTIONS;
+			break;
+
 		case 's':
 			script = optarg;
 			break;
@@ -172,6 +200,14 @@ int main(_unused int argc, char* const argv[])
 			pidfile = optarg;
 			break;
 
+		case 'f':
+			client_options &= ~DHCPV6_CLIENT_FQDN;
+			break;
+
+		case 'a':
+			client_options &= ~DHCPV6_ACCEPT_RECONFIGURE;
+			break;
+
 		default:
 			help = true;
 			break;
@@ -179,7 +215,7 @@ int main(_unused int argc, char* const argv[])
 	}
 
 	openlog("odhcp6c", logopt, LOG_DAEMON);
-	ifname = argv[optind];
+	const char *ifname = argv[optind];
 
 	if (help || !ifname)
 		return usage();
@@ -193,7 +229,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, sol_timeout) ||
+			init_dhcpv6(ifname, client_options, sol_timeout) ||
 			ra_init(ifname, &ifid) || script_init(script, ifname)) {
 		syslog(LOG_ERR, "failed to initialize: %s", strerror(errno));
 		return 3;
@@ -225,12 +261,13 @@ int main(_unused int argc, char* const argv[])
 
 	script_call("started");
 
-	while (do_signal != SIGTERM) { // Main logic
+	while (!signal_term) { // Main logic
 		odhcp6c_clear_state(STATE_SERVER_ID);
 		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_NTP_IP);
+		odhcp6c_clear_state(STATE_NTP_FQDN);
 		odhcp6c_clear_state(STATE_SIP_IP);
 		odhcp6c_clear_state(STATE_SIP_FQDN);
 		dhcpv6_set_ia_mode(ia_na_mode, ia_pd_mode);
@@ -238,7 +275,7 @@ int main(_unused int argc, char* const argv[])
 
 		syslog(LOG_NOTICE, "(re)starting transaction on %s", ifname);
 
-		do_signal = 0;
+		signal_usr1 = signal_usr2 = false;
 		int mode = dhcpv6_request(DHCPV6_MSG_SOLICIT);
 		odhcp6c_signal_process();
 
@@ -248,11 +285,11 @@ int main(_unused int argc, char* const argv[])
 		do {
 			int res = dhcpv6_request(mode == DHCPV6_STATELESS ?
 					DHCPV6_MSG_INFO_REQ : DHCPV6_MSG_REQUEST);
+			bool signalled = odhcp6c_signal_process();
 
-			odhcp6c_signal_process();
 			if (res > 0)
 				break;
-			else if (do_signal > 0) {
+			else if (signalled) {
 				mode = -1;
 				break;
 			}
@@ -268,9 +305,9 @@ int main(_unused int argc, char* const argv[])
 			bound = true;
 			syslog(LOG_NOTICE, "entering stateless-mode on %s", ifname);
 
-			while (do_signal == 0 || do_signal == SIGUSR1) {
-				do_signal = 0;
-				script_call("informed");					
+			while (!signal_usr2 && !signal_term) {
+				signal_usr1 = false;
+				script_call("informed");
 
 				int res = dhcpv6_poll_reconfigure();
 				odhcp6c_signal_process();
@@ -278,15 +315,16 @@ int main(_unused int argc, char* const argv[])
 				if (res > 0)
 					continue;
 
-				if (do_signal == SIGUSR1) {
-					do_signal = 0; // Acknowledged
+				if (signal_usr1) {
+					signal_usr1 = false; // Acknowledged
 					continue;
-				} else if (do_signal > 0)
+				}
+				if (signal_usr2 || signal_term)
 					break;
 
 				res = dhcpv6_request(DHCPV6_MSG_INFO_REQ);
 				odhcp6c_signal_process();
-				if (do_signal == SIGUSR1)
+				if (signal_usr1)
 					continue;
 				else if (res < 0)
 					break;
@@ -302,7 +340,7 @@ int main(_unused int argc, char* const argv[])
 				bfd_start(ifname, bfd_loss, bfd_interval);
 #endif
 
-			while (do_signal == 0 || do_signal == SIGUSR1) {
+			while (!signal_usr2 && !signal_term) {
 				// Renew Cycle
 				// Wait for T1 to expire or until we get a reconfigure
 				int res = dhcpv6_poll_reconfigure();
@@ -313,20 +351,29 @@ int main(_unused int argc, char* const argv[])
 				}
 
 				// Handle signal, if necessary
-				if (do_signal == SIGUSR1)
-					do_signal = 0; // Acknowledged
-				else if (do_signal > 0)
+				if (signal_usr1)
+					signal_usr1 = false; // Acknowledged
+				if (signal_usr2 || signal_term)
 					break; // Other signal type
 
 				// Send renew as T1 expired
-				res = dhcpv6_request(DHCPV6_MSG_RENEW);
+				size_t ia_pd_len, ia_na_len;
+				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
+				if (ia_pd_len == 0 && ia_na_len == 0)
+					res = dhcpv6_request(DHCPV6_MSG_REQUEST);
+				else
+					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
 
 				// If we have IAs, try rebind otherwise restart
@@ -378,13 +425,17 @@ static int usage(void)
 	"	-N <mode>	Mode for requesting addresses [try|force|none]\n"
 	"	-P <length>	Request IPv6-Prefix (0 = auto)\n"
 	"	-F		Force IPv6-Prefix\n"
+	"	-V <hex-string>	Set vendor-class option. string length must be a multiple of 2\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"
+	"	-R		Do not request any options except those specified with -r\n"
 	"	-s <script>	Status update script (/usr/sbin/odhcp6c-update)\n"
+	"	-a		Don't send Accept Reconfigure option\n"
+	"	-f		Don't send Client FQDN option\n"
 	"	-k		Don't send a RELEASE when stopping\n"
 	"	-t <seconds>	Maximum timeout for DHCPv6-SOLICIT (120)\n"
 	"\nInvocation options:\n"
@@ -426,12 +477,13 @@ static uint8_t* odhcp6c_resize_state(enum odhcp6c_state state, ssize_t len)
 
 bool odhcp6c_signal_process(void)
 {
-	if (do_signal == SIGIO) {
-		do_signal = 0;
+	while (signal_io) {
+		signal_io = false;
+
 		bool ra_updated = ra_process();
 
 		if (ra_link_up())
-			do_signal = SIGUSR2;
+			signal_usr2 = true;
 
 		if (ra_updated && (bound || allow_slaac_only == 0))
 			script_call("ra-updated"); // Immediate process urgent events
@@ -443,7 +495,7 @@ bool odhcp6c_signal_process(void)
 #endif
 	}
 
-	return do_signal != 0;
+	return signal_usr1 || signal_usr2 || signal_term;
 }
 
 
@@ -469,7 +521,7 @@ void odhcp6c_insert_state(enum odhcp6c_state state, size_t offset, const void *d
 	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);
 	}
@@ -541,6 +593,7 @@ bool odhcp6c_update_entry_safe(enum odhcp6c_state state, struct odhcp6c_entry *n
 			x->t1 = new->t1;
 			x->t2 = new->t2;
 			x->class = new->class;
+			x->iaid = new->iaid;
 		} else {
 			odhcp6c_add_state(state, new, sizeof(*new));
 		}
@@ -613,74 +666,21 @@ 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)
 		while (waitpid(-1, NULL, WNOHANG) > 0);
 	else if (signal == SIGUSR1)
-		do_signal = SIGUSR1;
+		signal_usr1 = true;
 	else if (signal == SIGUSR2)
-		do_signal = SIGUSR2;
+		signal_usr2 = true;
 	else if (signal == SIGIO)
-		do_signal = SIGIO;
+		signal_io = true;
 	else
-		do_signal = SIGTERM;
+		signal_term = true;
 }