static uint8_t reconf_key[16];
-int init_dhcpv6(const char *ifname, int request_pd, int sol_timeout)
+int init_dhcpv6(const char *ifname, int request_pd, bool strict_options, int sol_timeout)
{
request_prefix = request_pd;
dhcpv6_retx[DHCPV6_MSG_SOLICIT].max_timeo = sol_timeout;
}
// Create ORO
- uint16_t oro[] = {
+ if (!strict_options) {
+ 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_SNTP_SERVERS),
htons(DHCPV6_OPT_NTP_SERVER),
htons(DHCPV6_OPT_AFTR_NAME),
htons(DHCPV6_OPT_PD_EXCLUDE),
#ifdef EXT_PREFIX_CLASS
htons(DHCPV6_OPT_PREFIX_CLASS),
#endif
- };
- odhcp6c_add_state(STATE_ORO, oro, sizeof(oro));
+ };
+ odhcp6c_add_state(STATE_ORO, oro, sizeof(oro));
+ }
// Configure IPv6-options
int val = 1;
odhcp6c_clear_state(STATE_DNS);
odhcp6c_clear_state(STATE_SEARCH);
odhcp6c_clear_state(STATE_SNTP_IP);
- odhcp6c_clear_state(STATE_SNTP_FQDN);
+ odhcp6c_clear_state(STATE_NTP_IP);
+ odhcp6c_clear_state(STATE_NTP_FQDN);
odhcp6c_clear_state(STATE_SIP_IP);
odhcp6c_clear_state(STATE_SIP_FQDN);
odhcp6c_clear_state(STATE_AFTR_NAME);
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_SNTP_SERVERS) {
+ if (olen % 16 == 0)
+ odhcp6c_add_state(STATE_SNTP_IP, odata, olen);
} else if (otype == DHCPV6_OPT_NTP_SERVER) {
uint16_t stype, slen;
uint8_t *sdata;
stype, slen, sdata) {
if (slen == 16 && (stype == NTP_MC_ADDR ||
stype == NTP_SRV_ADDR))
- odhcp6c_add_state(STATE_SNTP_IP,
+ odhcp6c_add_state(STATE_NTP_IP,
sdata, slen);
else if (slen > 0 && stype == NTP_SRV_FQDN)
- odhcp6c_add_state(STATE_SNTP_FQDN,
+ odhcp6c_add_state(STATE_NTP_FQDN,
sdata, slen);
}
} else if (otype == DHCPV6_OPT_SIP_SERVER_A) {