static struct dhcpv6_retx dhcpv6_retx[_DHCPV6_MSG_MAX] = {
[DHCPV6_MSG_UNKNOWN] = {false, 1, 120, "<POLL>",
dhcpv6_handle_reconfigure, NULL},
- [DHCPV6_MSG_SOLICIT] = {true, 1, 3600, "SOLICIT",
+ [DHCPV6_MSG_SOLICIT] = {true, 1, 120, "SOLICIT",
dhcpv6_handle_advert, dhcpv6_commit_advert},
- [DHCPV6_MSG_REQUEST] = {true, 30, 10, "REQUEST",
+ [DHCPV6_MSG_REQUEST] = {true, 1, 30, "REQUEST",
dhcpv6_handle_reply, NULL},
[DHCPV6_MSG_RENEW] = {false, 10, 600, "RENEW",
dhcpv6_handle_reply, NULL},
-int init_dhcpv6(const char *ifname, int request_pd)
+int init_dhcpv6(const char *ifname, int request_pd, int sol_timeout)
{
request_prefix = request_pd;
+ dhcpv6_retx[DHCPV6_MSG_SOLICIT].max_timeo = sol_timeout;
sock = socket(AF_INET6, SOCK_DGRAM | SOCK_CLOEXEC, IPPROTO_UDP);
nanosleep(&ts, NULL);
}
- if (type == DHCPV6_MSG_RELEASE || type == DHCPV6_MSG_DECLINE)
+ if (type == DHCPV6_MSG_REQUEST)
+ timeout = 60;
+ else if (type == DHCPV6_MSG_RELEASE || type == DHCPV6_MSG_DECLINE)
timeout = 3;
else if (type == DHCPV6_MSG_UNKNOWN)
timeout = t1;
uint16_t olen, otype;
uint8_t *odata;
struct dhcpv6_server_cand cand = {false, false, 0, 0, {0}, NULL, NULL, 0, 0};
- bool have_na = false, have_pd = false;
+ bool have_na = false;
+ int have_pd = 0;
dhcpv6_for_each_option(opt, end, otype, olen, odata) {
if (orig == DHCPV6_MSG_SOLICIT &&
} else if (otype == DHCPV6_OPT_IA_PD && request_prefix) {
struct dhcpv6_ia_hdr *h = (struct dhcpv6_ia_hdr*)&odata[-4];
uint8_t *oend = odata + olen, *d;
- dhcpv6_for_each_option(&h[1], oend, otype, olen, d)
- if (otype == DHCPV6_OPT_IA_PREFIX)
- have_pd = true;
+ dhcpv6_for_each_option(&h[1], oend, otype, olen, d) {
+ if (otype == DHCPV6_OPT_IA_PREFIX && (olen + 4) >=
+ (uint16_t)sizeof(struct dhcpv6_ia_prefix)) {
+ struct dhcpv6_ia_prefix *p = (struct dhcpv6_ia_prefix*)&d[-4];
+ have_pd = p->prefix;
+ }
+ }
} else if (otype == DHCPV6_OPT_IA_NA) {
struct dhcpv6_ia_hdr *h = (struct dhcpv6_ia_hdr*)&odata[-4];
uint8_t *oend = odata + olen, *d;
if (pd_mode != IA_MODE_NONE) {
if (have_pd)
- cand.preference += 2000;
+ cand.preference += 2000 + (128 - have_pd);
else
cand.preference -= 2000;
}