X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=src%2Fodhcp6c.c;h=f4f83f1efb846cbb2250c0827763b144d5ad365a;hb=2cc9d0fa03c68cea04111c05b139e5eaaa999fca;hp=9f7019da5a1ceb935f16a0476baa3ae635dbc224;hpb=7b3e29a4ff20f1b1e91fa65b5a0631462dbee06d;p=odhcp6c.git

diff --git a/src/odhcp6c.c b/src/odhcp6c.c
index 9f7019d..f4f83f1 100644
--- a/src/odhcp6c.c
+++ b/src/odhcp6c.c
@@ -41,7 +41,7 @@ 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 = false;
+static bool bound = false, allow_slaac_only = true, release = true;
 
 
 int main(_unused int argc, char* const argv[])
@@ -59,10 +59,10 @@ int main(_unused int argc, char* const argv[])
 
 	bool help = false, daemonize = false;
 	int c, request_pd = 0;
-	while ((c = getopt(argc, argv, "SN:P:c:r:s:hdp:")) != -1) {
+	while ((c = getopt(argc, argv, "SN:P:c:r:s:khdp:")) != -1) {
 		switch (c) {
 		case 'S':
-			allow_slaac_only = true;
+			allow_slaac_only = false;
 			break;
 
 		case 'N':
@@ -77,6 +77,7 @@ int main(_unused int argc, char* const argv[])
 			break;
 
 		case 'P':
+			allow_slaac_only = false;
 			request_pd = strtoul(optarg, NULL, 10);
 			if (request_pd == 0)
 				request_pd = -1;
@@ -88,7 +89,7 @@ int main(_unused int argc, char* const argv[])
 				buf[0] = 0;
 				buf[1] = DHCPV6_OPT_CLIENTID;
 				buf[2] = 0;
-				buf[4] = l;
+				buf[3] = l;
 				odhcp6c_add_state(STATE_CLIENT_ID, buf, l + 4);
 			} else {
 				help = true;
@@ -111,6 +112,10 @@ int main(_unused int argc, char* const argv[])
 			script = optarg;
 			break;
 
+		case 'k':
+			release = false;
+			break;
+
 		case 'd':
 			daemonize = true;
 			break;
@@ -182,6 +187,8 @@ int main(_unused int argc, char* const argv[])
 		dhcpv6_set_ia_na_mode(ia_na_mode);
 		bound = false;
 
+		syslog(LOG_NOTICE, "(re)starting transaction on %s", ifname);
+
 		do_signal = 0;
 		int res = dhcpv6_request(DHCPV6_MSG_SOLICIT);
 		odhcp6c_signal_process();
@@ -202,6 +209,7 @@ int main(_unused int argc, char* const argv[])
 					script_call("informed");
 
 				bound = true;
+				syslog(LOG_NOTICE, "entering stateless-mode on %s", ifname);
 
 				if (dhcpv6_poll_reconfigure() > 0)
 					script_call("informed");
@@ -217,6 +225,7 @@ int main(_unused int argc, char* const argv[])
 		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
@@ -277,7 +286,7 @@ int main(_unused int argc, char* const argv[])
 		bound = false;
 		script_call("unbound");
 
-		if (server_id_len > 0 && (ia_pd_len > 0 || ia_na_len > 0))
+		if (server_id_len > 0 && (ia_pd_len > 0 || ia_na_len > 0) && release)
 			dhcpv6_request(DHCPV6_MSG_RELEASE);
 
 		odhcp6c_clear_state(STATE_IA_NA);
@@ -294,12 +303,13 @@ static int usage(void)
 	const char buf[] =
 	"Usage: odhcp6c [options] <interface>\n"
 	"\nFeature options:\n"
-	"	-S		Allow SLAAC-only assignment\n"
+	"	-S		Don't allow SLAAC-only (implied by -P)\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"
 	"	-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"
 	"\nInvocation options:\n"
 	"	-p <pidfile>	Set pidfile (/var/run/6relayd.pid)\n"
 	"	-d		Daemonize\n"