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));
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
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);
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))