X-Git-Url: https://git.decadent.org.uk/gitweb/?p=odhcp6c.git;a=blobdiff_plain;f=src%2Fodhcp6c.c;h=0a46947f4a5e2adc689b9dfd4ebc8ad412d18369;hp=3eb37a7b41b3cd2807dc07ad0538a8f45ccf8df3;hb=6c8109e0c77d5a54950ba607d1ec1f83d5efb5b7;hpb=c291def1cadf58c0aa10c18a53c2fc4d2dee1ad6

diff --git a/src/odhcp6c.c b/src/odhcp6c.c
index 3eb37a7..0a46947 100644
--- a/src/odhcp6c.c
+++ b/src/odhcp6c.c
@@ -52,6 +52,8 @@ static int urandom_fd = -1, allow_slaac_only = 0;
 static bool bound = false, release = true;
 static time_t last_update = 0;
 
+static unsigned int min_update_interval = DEFAULT_MIN_UPDATE_INTERVAL;
+
 int main(_unused int argc, char* const argv[])
 {
 	// Allocate ressources
@@ -77,7 +79,7 @@ int main(_unused int argc, char* const argv[])
 	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:Ru:s:kt:hedp:fa")) != -1) {
+	while ((c = getopt(argc, argv, "S::N:V:P:FB:c:i:r:Ru:s:kt:m:hedp:fa")) != -1) {
 		switch (c) {
 		case 'S':
 			allow_slaac_only = (optarg) ? atoi(optarg) : -1;
@@ -197,6 +199,10 @@ int main(_unused int argc, char* const argv[])
 			sol_timeout = atoi(optarg);
 			break;
 
+		case 'm':
+			min_update_interval = atoi(optarg);
+			break;
+
 		case 'e':
 			logopt |= LOG_PERROR;
 			break;
@@ -259,7 +265,7 @@ int main(_unused int argc, char* const argv[])
 			pidfile = pidbuf;
 		}
 
-		int fd = open(pidfile, O_WRONLY | O_CREAT);
+		int fd = open(pidfile, O_WRONLY | O_CREAT, 0644);
 		if (fd >= 0) {
 			char buf[8];
 			int len = snprintf(buf, sizeof(buf), "%i\n", getpid());
@@ -385,6 +391,12 @@ int main(_unused int argc, char* const argv[])
 
 				odhcp6c_clear_state(STATE_SERVER_ID); // Remove binding
 
+				odhcp6c_get_state(STATE_IA_PD, &ia_pd_len);
+				odhcp6c_get_state(STATE_IA_NA, &ia_na_len);
+
+				if (ia_pd_len == 0 && ia_na_len == 0)
+					break;
+
 				// If we have IAs, try rebind otherwise restart
 				res = dhcpv6_request(DHCPV6_MSG_REBIND);
 				odhcp6c_signal_process();
@@ -434,7 +446,7 @@ 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"
+	"	-V <class>	Set vendor-class option (base-16 encoded)\n"
 #ifdef EXT_BFD_PING
 	"	-B <interval>	Enable BFD ping check\n"
 #endif
@@ -446,7 +458,8 @@ static int usage(void)
 	"	-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"
+	"	-t <seconds>	Maximum timeout for DHCPv6-SOLICIT (3600)\n"
+	"	-m <seconds>	Minimum time between accepting updates (30)\n"
 	"\nInvocation options:\n"
 	"	-p <pidfile>	Set pidfile (/var/run/odhcp6c.pid)\n"
 	"	-d		Daemonize\n"
@@ -463,7 +476,7 @@ uint64_t odhcp6c_get_milli_time(void)
 {
 	struct timespec t = {0, 0};
 	syscall(SYS_clock_gettime, CLOCK_MONOTONIC, &t);
-	return t.tv_sec * 1000 + t.tv_nsec / 1000000;
+	return ((uint64_t)t.tv_sec) * 1000 + ((uint64_t)t.tv_nsec) / 1000000;
 }
 
 
@@ -593,10 +606,10 @@ bool 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 != UINT32_MAX &&
-					new->valid - x->valid < 60 &&
+					new->valid - x->valid < min_update_interval &&
 					new->preferred >= x->preferred &&
 					new->preferred != UINT32_MAX &&
-					new->preferred - x->preferred < 60 &&
+					new->preferred - x->preferred < min_update_interval &&
 					x->class == new->class)
 				return false;
 			x->valid = new->valid;