#ifdef EXT_CER_ID
htons(DHCPV6_OPT_CER_ID),
#endif
-#ifdef EXT_S46
htons(DHCPV6_OPT_S46_CONT_MAPE),
htons(DHCPV6_OPT_S46_CONT_MAPT),
htons(DHCPV6_OPT_S46_CONT_LW),
-#endif
};
odhcp6c_add_state(STATE_ORO, oro, sizeof(oro));
}
struct dhcpv6_ia_hdr hdr_ia_na = {
htons(DHCPV6_OPT_IA_NA),
htons(sizeof(hdr_ia_na) - 4),
- 1, 0, 0
+ htonl(1), 0, 0
};
struct dhcpv6_ia_addr pa[ia_na_entries];
round_start = odhcp6c_get_milli_time()) {
uint8_t buf[1536], cmsg_buf[CMSG_SPACE(sizeof(struct in6_pktinfo))];
struct iovec iov = {buf, sizeof(buf)};
- struct msghdr msg = {NULL, 0, &iov, 1,
+ struct sockaddr_in6 addr;
+ struct msghdr msg = {&addr, sizeof(addr), &iov, 1,
cmsg_buf, sizeof(cmsg_buf), 0};
struct in6_pktinfo *pktinfo = NULL;
+
// Check for pending signal
if (odhcp6c_signal_process())
return -1;
"%llums", (unsigned long long)elapsed);
if (retx->handler_reply)
- len = retx->handler_reply(type, rc, opt, opt_end);
+ len = retx->handler_reply(type, rc, opt, opt_end, &addr);
if (len > 0 && round_end - round_start > 1000)
round_end = 1000 + round_start;
static int dhcpv6_handle_reconfigure(_unused enum dhcpv6_msg orig, const int rc,
- const void *opt, const void *end)
+ const void *opt, const void *end, _unused const struct sockaddr_in6 *from)
{
uint16_t otype, olen;
uint8_t *odata, msg = DHCPV6_MSG_RENEW;
odata[0] == DHCPV6_MSG_INFO_REQ))
msg = odata[0];
- dhcpv6_handle_reply(DHCPV6_MSG_UNKNOWN, rc, NULL, NULL);
+ dhcpv6_handle_reply(DHCPV6_MSG_UNKNOWN, rc, NULL, NULL, NULL);
return msg;
}
// Collect all advertised servers
static int dhcpv6_handle_advert(enum dhcpv6_msg orig, const int rc,
- const void *opt, const void *end)
+ const void *opt, const void *end, _unused const struct sockaddr_in6 *from)
{
uint16_t olen, otype;
uint8_t *odata, pref = 0;
static int dhcpv6_handle_rebind_reply(enum dhcpv6_msg orig, const int rc,
- const void *opt, const void *end)
+ const void *opt, const void *end, const struct sockaddr_in6 *from)
{
- dhcpv6_handle_advert(orig, rc, opt, end);
+ dhcpv6_handle_advert(orig, rc, opt, end, from);
if (dhcpv6_commit_advert() < 0)
return -1;
- return dhcpv6_handle_reply(orig, rc, opt, end);
+ return dhcpv6_handle_reply(orig, rc, opt, end, from);
}
static int dhcpv6_handle_reply(enum dhcpv6_msg orig, _unused const int rc,
- const void *opt, const void *end)
+ const void *opt, const void *end, const struct sockaddr_in6 *from)
{
uint8_t *odata;
uint16_t otype, olen;
struct dhcpv6_ia_hdr *ia_hdr = (void*)(&odata[-4]);
// Test ID
- if (ia_hdr->iaid != 1 && otype == DHCPV6_OPT_IA_NA)
+ if (ia_hdr->iaid != htonl(1) && otype == DHCPV6_OPT_IA_NA)
continue;
uint16_t code = DHCPV6_Success;
odhcp6c_add_state(STATE_CER, &cer_id->addr, sizeof(any));
passthru = false;
#endif
-#ifdef EXT_S46
} 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_LW) {
odhcp6c_add_state(STATE_S46_LW, odata, olen);
passthru = false;
-#endif
} 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 {
default :
break;
}
+
+ if (orig == DHCPV6_MSG_REBIND || orig == DHCPV6_MSG_REQUEST) {
+ odhcp6c_clear_state(STATE_SERVER_ADDR);
+ odhcp6c_add_state(STATE_SERVER_ADDR, &from->sin6_addr, 16);
+ }
}
}
else if (ret > 0) {