- passthru = false;
- } else if (otype == DHCPV6_OPT_AFTR_NAME && olen > 3) {
- size_t cur_len;
- odhcp6c_get_state(STATE_AFTR_NAME, &cur_len);
- if (cur_len == 0)
- odhcp6c_add_state(STATE_AFTR_NAME, odata, olen);
- passthru = false;
- } else if (otype == DHCPV6_OPT_SOL_MAX_RT && olen == 4) {
- uint32_t sol_max_rt = ntohl(*((uint32_t *)odata));
- if (sol_max_rt >= DHCPV6_SOL_MAX_RT_MIN &&
- sol_max_rt <= DHCPV6_SOL_MAX_RT_MAX)
- dhcpv6_retx[DHCPV6_MSG_SOLICIT].max_timeo = sol_max_rt;
- passthru = false;
- } else if (otype == DHCPV6_OPT_INF_MAX_RT && olen == 4) {
- uint32_t inf_max_rt = ntohl(*((uint32_t *)odata));
- if (inf_max_rt >= DHCPV6_INF_MAX_RT_MIN &&
- inf_max_rt <= DHCPV6_INF_MAX_RT_MAX)
- dhcpv6_retx[DHCPV6_MSG_INFO_REQ].max_timeo = inf_max_rt;
- passthru = false;
-#ifdef EXT_CER_ID
- } else if (otype == DHCPV6_OPT_CER_ID && olen == -4 +
- sizeof(struct dhcpv6_cer_id)) {
- struct dhcpv6_cer_id *cer_id = (void*)&odata[-4];
- struct in6_addr any = IN6ADDR_ANY_INIT;
- if (memcmp(&cer_id->addr, &any, sizeof(any)))
- odhcp6c_add_state(STATE_CER, &cer_id->addr, sizeof(any));
- passthru = false;
-#endif
- } else if (otype == DHCPV6_OPT_S46_CONT_MAPT) {
- odhcp6c_add_state(STATE_S46_MAPT, odata, olen);
- passthru = false;
- } else if (otype == DHCPV6_OPT_S46_CONT_MAPE) {
- size_t mape_len;
- odhcp6c_get_state(STATE_S46_MAPE, &mape_len);
- if (mape_len == 0)
- odhcp6c_add_state(STATE_S46_MAPE, odata, olen);
- passthru = false;
- } else if (otype == DHCPV6_OPT_S46_CONT_LW) {
- odhcp6c_add_state(STATE_S46_LW, odata, olen);
- passthru = false;
- } else if (otype == DHCPV6_OPT_CLIENTID ||
- otype == DHCPV6_OPT_SERVERID ||
- otype == DHCPV6_OPT_IA_TA ||
- otype == DHCPV6_OPT_PREF ||
- otype == DHCPV6_OPT_UNICAST ||
- otype == DHCPV6_OPT_FQDN ||
- otype == DHCPV6_OPT_RECONF_ACCEPT) {
- passthru = false;
- } else {
- odhcp6c_add_state(STATE_CUSTOM_OPTS, &odata[-4], olen + 4);
+ else if (otype == DHCPV6_OPT_STATUS && olen >= 2) {
+ uint8_t *mdata = (olen > 2) ? &odata[2] : NULL;
+ uint16_t mlen = (olen > 2) ? olen - 2 : 0;
+ uint16_t code = ((int)odata[0]) << 8 | ((int)odata[1]);
+
+ dhcpv6_handle_status_code(orig, code, mdata, mlen, &ret);
+ } else if (otype == DHCPV6_OPT_DNS_SERVERS) {
+ 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);
+ 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;
+ // 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_NTP_IP,
+ sdata, slen);
+ else if (slen > 0 && stype == NTP_SRV_FQDN)
+ odhcp6c_add_state(STATE_NTP_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) {
+ refresh = ntohl_unaligned(odata);
+ } else if (otype == DHCPV6_OPT_AUTH) {
+ if (olen == -4 + sizeof(struct dhcpv6_auth_reconfigure)) {
+ struct dhcpv6_auth_reconfigure *r = (void*)&odata[-4];
+ if (r->protocol == 3 && r->algorithm == 1 &&
+ r->reconf_type == 1)
+ memcpy(reconf_key, r->key, sizeof(r->key));
+ }
+ } else if (otype == DHCPV6_OPT_AFTR_NAME && olen > 3) {
+ size_t cur_len;
+ odhcp6c_get_state(STATE_AFTR_NAME, &cur_len);
+ if (cur_len == 0)
+ odhcp6c_add_state(STATE_AFTR_NAME, odata, olen);
+ } else if (otype == DHCPV6_OPT_SOL_MAX_RT && olen == 4) {
+ uint32_t sol_max_rt = ntohl_unaligned(odata);
+ if (sol_max_rt >= DHCPV6_SOL_MAX_RT_MIN &&
+ sol_max_rt <= DHCPV6_SOL_MAX_RT_MAX)
+ dhcpv6_retx[DHCPV6_MSG_SOLICIT].max_timeo = sol_max_rt;
+ } else if (otype == DHCPV6_OPT_INF_MAX_RT && olen == 4) {
+ uint32_t inf_max_rt = ntohl_unaligned(odata);
+ if (inf_max_rt >= DHCPV6_INF_MAX_RT_MIN &&
+ inf_max_rt <= DHCPV6_INF_MAX_RT_MAX)
+ dhcpv6_retx[DHCPV6_MSG_INFO_REQ].max_timeo = inf_max_rt;
+ #ifdef EXT_CER_ID
+ } else if (otype == DHCPV6_OPT_CER_ID && olen == -4 +
+ sizeof(struct dhcpv6_cer_id)) {
+ struct dhcpv6_cer_id *cer_id = (void*)&odata[-4];
+ struct in6_addr any = IN6ADDR_ANY_INIT;
+ if (memcmp(&cer_id->addr, &any, sizeof(any)))
+ odhcp6c_add_state(STATE_CER, &cer_id->addr, sizeof(any));
+ #endif
+ } else if (otype == DHCPV6_OPT_S46_CONT_MAPT) {
+ odhcp6c_add_state(STATE_S46_MAPT, odata, olen);
+ } else if (otype == DHCPV6_OPT_S46_CONT_MAPE) {
+ size_t mape_len;
+ odhcp6c_get_state(STATE_S46_MAPE, &mape_len);
+ if (mape_len == 0)
+ odhcp6c_add_state(STATE_S46_MAPE, odata, olen);
+ } else if (otype == DHCPV6_OPT_S46_CONT_LW) {
+ odhcp6c_add_state(STATE_S46_LW, odata, olen);
+ } else
+ odhcp6c_add_state(STATE_CUSTOM_OPTS, &odata[-4], olen + 4);
+
+ if (!dopt || !(dopt->flags & OPT_NO_PASSTHRU))
+ odhcp6c_add_state(STATE_PASSTHRU, &odata[-4], olen + 4);