X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=src%2Fdhcpv6.c;h=28fad507b4a4fa39e541c01f1e6091bed255f491;hb=770741e98f2569ec0b00251ba9bf17a92e89221e;hp=9a451d0568232896c084ed33d3138f46a35f5e59;hpb=4a58bef7322b830b2e87be39c611a1bf4845ef49;p=odhcp6c.git

diff --git a/src/dhcpv6.c b/src/dhcpv6.c
index 9a451d0..28fad50 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));
 
 
@@ -590,20 +614,24 @@ static int dhcpv6_handle_reply(_unused enum dhcpv6_msg orig,
 	dhcpv6_for_each_option(ia_pd, ia_pd + ia_pd_len, otype, olen, odata) {
 		struct dhcpv6_ia_prefix *p = (void*)&odata[-4];
 		uint32_t valid = ntohl(p->valid);
-		p->valid = (valid < elapsed) ? 0 : htonl(valid - elapsed);
+		if (valid != UINT32_MAX)
+			p->valid = (valid < elapsed) ? 0 : htonl(valid - elapsed);
 
 		uint32_t pref = ntohl(p->preferred);
-		p->preferred = (pref < elapsed) ? 0 : htonl(pref - elapsed);
+		if (pref != UINT32_MAX)
+			p->preferred = (pref < elapsed) ? 0 : htonl(pref - elapsed);
 	}
 
 	// Decrease valid and preferred lifetime of addresses
 	dhcpv6_for_each_option(ia_na, ia_na + ia_na_len, otype, olen, odata) {
 		struct dhcpv6_ia_addr *p = (void*)&odata[-4];
 		uint32_t valid = ntohl(p->valid);
-		p->valid = (valid < elapsed) ? 0 : htonl(valid - elapsed);
+		if (valid != UINT32_MAX)
+			p->valid = (valid < elapsed) ? 0 : htonl(valid - elapsed);
 
 		uint32_t pref = ntohl(p->preferred);
-		p->preferred = (pref < elapsed) ? 0 : htonl(pref - elapsed);
+		if (pref != UINT32_MAX)
+			p->preferred = (pref < elapsed) ? 0 : htonl(pref - elapsed);
 	}
 
 	// Parse and find all matching IAs
@@ -651,7 +679,7 @@ static int dhcpv6_handle_reply(_unused enum dhcpv6_msg orig,
 				t3 = n;
 
 		} else if (otype == DHCPV6_OPT_DNS_SERVERS) {
-			if (olen == 16)
+			if (olen % 16 == 0)
 				odhcp6c_add_state(STATE_DNS, odata, olen);
 		} else if (otype == DHCPV6_OPT_DNS_DOMAIN) {
 			odhcp6c_add_state(STATE_SEARCH, odata, olen);
@@ -769,10 +797,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))