X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=src%2Fdhcpv6.c;h=9cb55adc28b935de24d254e8014481558c6ba183;hb=d30e43bca363c003dfa41c963ab2e36d67365cc1;hp=3132e6c6d7839bfa45151fdd15af57a9567e7477;hpb=53e6041e90e9d69576240ff5e403f8fa35cc6a93;p=odhcp6c.git

diff --git a/src/dhcpv6.c b/src/dhcpv6.c
index 3132e6c..9cb55ad 100644
--- a/src/dhcpv6.c
+++ b/src/dhcpv6.c
@@ -115,7 +115,10 @@ int init_dhcpv6(const char *ifname, int request_pd)
 
 	// Create ORO
 	uint16_t oro[] = {htons(DHCPV6_OPT_DNS_SERVERS),
-			htons(DHCPV6_OPT_DNS_DOMAIN)};
+			htons(DHCPV6_OPT_DNS_DOMAIN),
+			htons(DHCPV6_OPT_NTP_SERVER),
+			htons(DHCPV6_OPT_SIP_SERVER_A),
+			htons(DHCPV6_OPT_SIP_SERVER_D)};
 	odhcp6c_add_state(STATE_ORO, oro, sizeof(oro));
 
 
@@ -313,7 +316,7 @@ int dhcpv6_request(enum dhcpv6_msg type)
 
 	syslog(LOG_NOTICE, "Sending %s (timeout %us)", retx->name, timeout);
 
-	uint64_t start = adhc6c_get_milli_time(), round_start = start, elapsed;
+	uint64_t start = odhcp6c_get_milli_time(), round_start = start, elapsed;
 
 	// Generate transaction ID
 	uint8_t trid[3];
@@ -344,7 +347,7 @@ int dhcpv6_request(enum dhcpv6_msg type)
 
 		// Receive rounds
 		for (; len < 0 && round_start < round_end;
-				round_start = adhc6c_get_milli_time()) {
+				round_start = odhcp6c_get_milli_time()) {
 			// Check for pending signal
 			if (odhcp6c_signal_is_pending())
 				return -1;
@@ -365,7 +368,7 @@ int dhcpv6_request(enum dhcpv6_msg type)
 				uint8_t *opt = &buf[4];
 				uint8_t *opt_end = opt + len - 4;
 
-				round_start = adhc6c_get_milli_time();
+				round_start = odhcp6c_get_milli_time();
 				elapsed = round_start - start;
 				syslog(LOG_NOTICE, "Got a valid reply after "
 						"%ums", (unsigned)elapsed);
@@ -573,11 +576,16 @@ static int dhcpv6_handle_reply(_unused enum dhcpv6_msg orig,
 
 	t1 = t2 = t3 = 86400;
 
-	size_t ia_na_len, dns_len, search_len;
+	size_t ia_na_len, dns_len, search_len, sntp_ip_len, sntp_dns_len;
+	size_t sip_ip_len, sip_fqdn_len;
 	uint8_t *ia_na = odhcp6c_get_state(STATE_IA_NA, &ia_na_len);
 	uint8_t *ia_end;
 	odhcp6c_get_state(STATE_DNS, &dns_len);
 	odhcp6c_get_state(STATE_SEARCH, &search_len);
+	odhcp6c_get_state(STATE_SNTP_IP, &sntp_ip_len);
+	odhcp6c_get_state(STATE_SNTP_FQDN, &sntp_dns_len);
+	odhcp6c_get_state(STATE_SIP_IP, &sip_ip_len);
+	odhcp6c_get_state(STATE_SIP_FQDN, &sip_fqdn_len);
 
 	// Decrease valid and preferred lifetime of prefixes
 	size_t ia_pd_len;
@@ -646,9 +654,29 @@ static int dhcpv6_handle_reply(_unused enum dhcpv6_msg orig,
 				t3 = n;
 
 		} else if (otype == DHCPV6_OPT_DNS_SERVERS) {
-			odhcp6c_add_state(STATE_DNS, odata, olen);
+			if (olen == 16)
+				odhcp6c_add_state(STATE_DNS, odata, olen);
 		} else if (otype == DHCPV6_OPT_DNS_DOMAIN) {
 			odhcp6c_add_state(STATE_SEARCH, odata, olen);
+		} else if (otype == DHCPV6_OPT_NTP_SERVER) {
+			uint16_t stype, slen;
+			uint8_t *sdata;
+			// Test status and bail if error
+			dhcpv6_for_each_option(odata, odata + olen,
+					stype, slen, sdata) {
+				if (slen == 16 && (stype == NTP_MC_ADDR ||
+						stype == NTP_SRV_ADDR))
+					odhcp6c_add_state(STATE_SNTP_IP,
+							sdata, slen);
+				else if (slen > 0 && stype == NTP_SRV_FQDN)
+					odhcp6c_add_state(STATE_SNTP_FQDN,
+							sdata, slen);
+			}
+		} else if (otype == DHCPV6_OPT_SIP_SERVER_A) {
+			if (olen == 16)
+				odhcp6c_add_state(STATE_SIP_IP, odata, olen);
+		} else if (otype == DHCPV6_OPT_SIP_SERVER_D) {
+			odhcp6c_add_state(STATE_SIP_FQDN, odata, olen);
 		} else if (otype == DHCPV6_OPT_INFO_REFRESH && olen >= 4) {
 			uint32_t refresh = ntohl(*((uint32_t*)odata));
 			if (refresh < (uint32_t)t1)
@@ -663,6 +691,12 @@ static int dhcpv6_handle_reply(_unused enum dhcpv6_msg orig,
 	if (opt) {
 		have_update |= odhcp6c_commit_state(STATE_DNS, dns_len);
 		have_update |= odhcp6c_commit_state(STATE_SEARCH, search_len);
+		have_update |= odhcp6c_commit_state(STATE_SNTP_IP,
+				sntp_ip_len);
+		have_update |= odhcp6c_commit_state(STATE_SNTP_FQDN,
+				sntp_dns_len);
+		have_update |= odhcp6c_commit_state(STATE_SIP_IP, sip_ip_len);
+		have_update |= odhcp6c_commit_state(STATE_SIP_FQDN, sip_fqdn_len);
 		size_t new_ia_pd_len, new_ia_na_len;
 		odhcp6c_get_state(STATE_IA_PD, &new_ia_pd_len);
 		odhcp6c_get_state(STATE_IA_NA, &new_ia_na_len);
@@ -738,10 +772,6 @@ static time_t dhcpv6_parse_ia(void *opt, void *end)
 
 			if (timeout > valid)
 				timeout = valid;
-
-			if (prefix->valid == 0) // We probably lost that prefix
-				odhcp6c_add_state(STATE_IA_PD_LOST,
-						prefix, olen);
 		} else if (otype == DHCPV6_OPT_IA_ADDR) {
 			struct dhcpv6_ia_addr *addr = (void*)&odata[-4];
 			if (olen + 4U < sizeof(*addr))