X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=src%2Fdhcpv6.c;h=a3d4223404688dc9234be1753b7e3ccc2f4b9919;hb=43a052c9a684c1475aca444722fbefd127325aa7;hp=e93d894935122af9cfbbfc3661eed2bff581015c;hpb=73796053a15bb017cdcfae6db6c27c1b4eb12a22;p=odhcp6c.git

diff --git a/src/dhcpv6.c b/src/dhcpv6.c
index e93d894..a3d4223 100644
--- a/src/dhcpv6.c
+++ b/src/dhcpv6.c
@@ -110,12 +110,36 @@ int init_dhcpv6(const char *ifname, int request_pd)
 		uint8_t duid[14] = {0, DHCPV6_OPT_CLIENTID, 0, 10, 0,
 				DHCPV6_DUID_LLADDR, 0, 1};
 		memcpy(&duid[8], ifr.ifr_hwaddr.sa_data, ETHER_ADDR_LEN);
+
+		uint8_t zero[ETHER_ADDR_LEN] = {0, 0, 0, 0, 0, 0};
+		struct ifreq ifs[100], *ifp, *ifend;
+		struct ifconf ifc;
+		ifc.ifc_req = ifs;
+		ifc.ifc_len = sizeof(ifs);
+
+		if (!memcmp(&duid[8], zero, ETHER_ADDR_LEN) &&
+				ioctl(sock, SIOCGIFCONF, &ifc) >= 0) {
+			// If our interface doesn't have an address...
+			ifend = ifs + (ifc.ifc_len / sizeof(struct ifreq));
+			for (ifp = ifc.ifc_req; ifp < ifend &&
+					!memcmp(&duid[8], zero, 6); ifp++) {
+				memcpy(ifr.ifr_name, ifp->ifr_name,
+						sizeof(ifr.ifr_name));
+				ioctl(sock, SIOCGIFHWADDR, &ifr);
+				memcpy(&duid[8], ifr.ifr_hwaddr.sa_data,
+						ETHER_ADDR_LEN);
+			}
+		}
+
 		odhcp6c_add_state(STATE_CLIENT_ID, duid, sizeof(duid));
 	}
 
 	// 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));
 
 
@@ -574,12 +598,15 @@ static int dhcpv6_handle_reply(_unused enum dhcpv6_msg orig,
 	t1 = t2 = t3 = 86400;
 
 	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;
@@ -648,7 +675,8 @@ 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) {
@@ -665,6 +693,11 @@ static int dhcpv6_handle_reply(_unused enum dhcpv6_msg orig,
 					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)
@@ -683,6 +716,8 @@ static int dhcpv6_handle_reply(_unused enum dhcpv6_msg orig,
 				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);
@@ -758,10 +793,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))