X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=src%2Fdhcpv6.c;h=64c0cb44e90107b184590d6d265e03286c09c8c6;hb=007ae1a6ae8092878adccde1f610ea9dd86e5aad;hp=df73c86b8b0dd6bfa405681d01993f8735dd86b0;hpb=abb78cacca0a98e956aebbf76f5ba9120251a7c4;p=odhcp6c.git

diff --git a/src/dhcpv6.c b/src/dhcpv6.c
index df73c86..64c0cb4 100644
--- a/src/dhcpv6.c
+++ b/src/dhcpv6.c
@@ -136,12 +136,15 @@ int init_dhcpv6(const char *ifname, int request_pd)
 	}
 
 	// Create ORO
-	uint16_t oro[] = {htons(DHCPV6_OPT_DNS_SERVERS),
+	uint16_t oro[] = {
+			htons(DHCPV6_OPT_SIP_SERVER_D),
+			htons(DHCPV6_OPT_SIP_SERVER_A),
+			htons(DHCPV6_OPT_DNS_SERVERS),
 			htons(DHCPV6_OPT_DNS_DOMAIN),
 			htons(DHCPV6_OPT_NTP_SERVER),
-			htons(DHCPV6_OPT_SIP_SERVER_A),
-			htons(DHCPV6_OPT_SIP_SERVER_D),
-			htons(DHCPV6_OPT_PD_EXCLUDE)};
+			htons(DHCPV6_OPT_AFTR_NAME),
+			htons(DHCPV6_OPT_PD_EXCLUDE),
+	};
 	odhcp6c_add_state(STATE_ORO, oro, sizeof(oro));
 
 
@@ -306,7 +309,7 @@ static void dhcpv6_send(enum dhcpv6_msg type, uint8_t trid[3], uint32_t ecs)
 		{&oro_refresh, 0},
 		{cl_id, cl_id_len},
 		{srv_id, srv_id_len},
-		{&reconf_accept, 0},
+		{&reconf_accept, sizeof(reconf_accept)},
 		{&fqdn, fqdn_len},
 		{&hdr_ia_na, sizeof(hdr_ia_na)},
 		{ia_na, ia_na_len},
@@ -324,9 +327,8 @@ static void dhcpv6_send(enum dhcpv6_msg type, uint8_t trid[3], uint32_t ecs)
 	}
 
 	// Disable IAs if not used
-	if (type == DHCPV6_MSG_SOLICIT) {
-		iov[5].iov_len = sizeof(reconf_accept);
-	} else if (type != DHCPV6_MSG_REQUEST) {
+	if (type != DHCPV6_MSG_REQUEST && type != DHCPV6_MSG_SOLICIT) {
+		iov[5].iov_len = 0;
 		if (ia_na_len == 0)
 			iov[7].iov_len = 0;
 		if (ia_pd_len == 0)
@@ -348,14 +350,14 @@ static int64_t dhcpv6_rand_delay(int64_t time)
 {
 	int random;
 	odhcp6c_random(&random, sizeof(random));
-	return (time * (random % 1000)) / 10000;
+	return (time * ((int64_t)random % 1000LL)) / 10000LL;
 }
 
 
 int dhcpv6_request(enum dhcpv6_msg type)
 {
 	uint8_t buf[1536];
-	uint32_t timeout = UINT32_MAX;
+	uint64_t timeout = UINT32_MAX;
 	struct dhcpv6_retx *retx = &dhcpv6_retx[type];
 
 	if (retx->delay) {
@@ -369,14 +371,14 @@ int dhcpv6_request(enum dhcpv6_msg type)
 	else if (type == DHCPV6_MSG_UNKNOWN)
 		timeout = t1;
 	else if (type == DHCPV6_MSG_RENEW)
-		timeout = t2 - t1;
+		timeout = (t2 > t1) ? t2 - t1 : 0;
 	else if (type == DHCPV6_MSG_REBIND)
-		timeout = t3 - t2;
+		timeout = (t3 > t2) ? t3 - t2 : 0;
 
 	if (timeout == 0)
 		return -1;
 
-	syslog(LOG_NOTICE, "Sending %s (timeout %us)", retx->name, timeout);
+	syslog(LOG_NOTICE, "Sending %s (timeout %us)", retx->name, (unsigned)timeout);
 
 	uint64_t start = odhcp6c_get_milli_time(), round_start = start, elapsed;
 
@@ -664,13 +666,15 @@ static int dhcpv6_handle_reply(enum dhcpv6_msg orig,
 	uint8_t *odata;
 	uint16_t otype, olen;
 
-	static time_t last_update = 0;
-	time_t now = odhcp6c_get_milli_time() / 1000;
-
-	uint32_t elapsed = now - last_update;
 	odhcp6c_expire();
 
 	if (orig == DHCPV6_MSG_UNKNOWN) {
+		static time_t last_update = 0;
+		time_t now = odhcp6c_get_milli_time() / 1000;
+
+		uint32_t elapsed = (last_update > 0) ? now - last_update : 0;
+		last_update = now;
+
 		t1 -= elapsed;
 		t2 -= elapsed;
 		t3 -= elapsed;
@@ -694,6 +698,7 @@ static int dhcpv6_handle_reply(enum dhcpv6_msg orig,
 		odhcp6c_clear_state(STATE_SNTP_FQDN);
 		odhcp6c_clear_state(STATE_SIP_IP);
 		odhcp6c_clear_state(STATE_SIP_FQDN);
+		odhcp6c_clear_state(STATE_AFTR_NAME);
 	}
 
 	// Parse and find all matching IAs
@@ -721,29 +726,23 @@ static int dhcpv6_handle_reply(enum dhcpv6_msg orig,
 			if (error)
 				continue;
 
-			// Update times
-			if (l_t1 > 0 && t1 > l_t1)
-				t1 = l_t1;
-
-			if (l_t2 > 0 && t2 > l_t2)
-				t2 = l_t2;
-
 			uint32_t n = dhcpv6_parse_ia(&ia_hdr[1], odata + olen);
 
-			if (n < t1)
-				t1 = n;
+			if (!l_t1)
+				l_t1 = 300;
 
-			if (n < t2)
-				t2 = n;
+			if (!l_t2)
+				l_t2 = 600;
 
 			if (n < t3)
 				t3 = n;
 
-			if (t2 >= t3)
-				t2 = 8 * t3 / 10;
+			// Update times
+			if (l_t1 > 0 && t1 > l_t1)
+				t1 = l_t1;
 
-			if (t1 >= t2)
-				t1 = 5 * t2 / 8;
+			if (l_t2 > 0 && t2 > l_t2)
+				t2 = l_t2;
 
 		} else if (otype == DHCPV6_OPT_DNS_SERVERS) {
 			if (olen % 16 == 0)
@@ -779,6 +778,11 @@ static int dhcpv6_handle_reply(enum dhcpv6_msg orig,
 			if (r->protocol == 3 && r->algorithm == 1 &&
 					r->reconf_type == 1)
 				memcpy(reconf_key, r->key, sizeof(r->key));
+		} else if (otype == DHCPV6_OPT_AFTR_NAME && olen > 3) {
+			size_t cur_len;
+			odhcp6c_get_state(STATE_AFTR_NAME, &cur_len);
+			if (cur_len == 0)
+				odhcp6c_add_state(STATE_AFTR_NAME, odata, olen);
 		} else if (otype != DHCPV6_OPT_CLIENTID &&
 				otype != DHCPV6_OPT_SERVERID) {
 			odhcp6c_add_state(STATE_CUSTOM_OPTS,