From 6677edeab2d7472b97a34461872c2c8985d6a57c Mon Sep 17 00:00:00 2001 From: Steven Barth Date: Tue, 21 May 2013 12:10:37 +0200 Subject: [PATCH] Honor T1 and T2 from server better --- src/dhcpv6.c | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/dhcpv6.c b/src/dhcpv6.c index cfa5a40..ed6b8f8 100644 --- a/src/dhcpv6.c +++ b/src/dhcpv6.c @@ -371,9 +371,9 @@ int dhcpv6_request(enum dhcpv6_msg type) else if (type == DHCPV6_MSG_UNKNOWN) timeout = t1; else if (type == DHCPV6_MSG_RENEW) - timeout = t2 - t1; + timeout = (t2 > t1) ? t2 - t1 : 0; else if (type == DHCPV6_MSG_REBIND) - timeout = t3 - t2; + timeout = (t3 > t2) ? t3 - t2 : 0; if (timeout == 0) return -1; @@ -726,29 +726,23 @@ static int dhcpv6_handle_reply(enum dhcpv6_msg orig, if (error) continue; - // Update times - if (l_t1 > 0 && t1 > l_t1) - t1 = l_t1; - - if (l_t2 > 0 && t2 > l_t2) - t2 = l_t2; - uint32_t n = dhcpv6_parse_ia(&ia_hdr[1], odata + olen); - if (n < t1) - t1 = n; + if (!l_t1) + l_t1 = 300; - if (n < t2) - t2 = n; + if (!l_t2) + l_t2 = 600; if (n < t3) t3 = n; - if (t2 >= t3) - t2 = 8 * t3 / 10; + // Update times + if (l_t1 > 0 && t1 > l_t1) + t1 = l_t1; - if (t1 >= t2) - t1 = 5 * t2 / 8; + if (l_t2 > 0 && t2 > l_t2) + t2 = l_t2; } else if (otype == DHCPV6_OPT_DNS_SERVERS) { if (olen % 16 == 0) -- 2.25.1