X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=src%2Fodhcp6c.c;h=7e0710b7e1a10a5d59bb72bd13b48cdebcd8a01b;hb=60d340d5bb7e7d94d2d28897dd6dd824f831c445;hp=6da604728c4f330d446e10c5c0e941c6ce529d65;hpb=eb0b01e94374774609c31ab4508d8cfca8a400e1;p=odhcp6c.git

diff --git a/src/odhcp6c.c b/src/odhcp6c.c
index 6da6047..7e0710b 100644
--- a/src/odhcp6c.c
+++ b/src/odhcp6c.c
@@ -56,26 +56,29 @@ 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;
 
 	bool help = false, daemonize = false;
 	int logopt = LOG_PID;
 	int c, request_pd = 0;
-	while ((c = getopt(argc, argv, "S::N:P:c:i:r:s:khedp:")) != -1) {
+	while ((c = getopt(argc, argv, "S::N:P:Fc:i:r:s:khedp:")) != -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':
@@ -85,6 +88,13 @@ int main(_unused int argc, char* const argv[])
 			request_pd = strtoul(optarg, NULL, 10);
 			if (request_pd == 0)
 				request_pd = -1;
+
+			ia_pd_mode = IA_MODE_TRY;
+			break;
+
+		case 'F':
+			allow_slaac_only = -1;
+			ia_pd_mode = IA_MODE_FORCE;
 			break;
 
 		case 'c':
@@ -192,15 +202,24 @@ 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;
@@ -320,6 +339,7 @@ static int usage(void)
 	"	-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"
 	"	-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"
@@ -366,10 +386,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);
@@ -405,6 +424,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];
@@ -439,7 +470,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));
 		}