From 20b962d3e494513ab28854936cc8bbc32891686b Mon Sep 17 00:00:00 2001 From: Dave Barach Date: Fri, 8 Nov 2019 20:20:17 -0500 Subject: dhcp: fix dhcpv6 client and dhcpv6 prefix delegation Keep trying even if the interface in question is not "admin-up, link-up." In real life, it's normal for link autonegotiation to take a good fraction of a second. The driver layer takes care of packets sent to an interface which can't transmit at the moment. Renew address leases at the preferred renewal time, not at the expiration time. Type: fix Signed-off-by: Dave Barach Change-Id: I68ec1c52cc1f4a8aa256185820748b845e92f7c1 --- src/plugins/dhcp/dhcp6_ia_na_client_cp.c | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) (limited to 'src/plugins/dhcp/dhcp6_ia_na_client_cp.c') diff --git a/src/plugins/dhcp/dhcp6_ia_na_client_cp.c b/src/plugins/dhcp/dhcp6_ia_na_client_cp.c index 2d4135d7ebd..b87ad2139ed 100644 --- a/src/plugins/dhcp/dhcp6_ia_na_client_cp.c +++ b/src/plugins/dhcp/dhcp6_ia_na_client_cp.c @@ -302,7 +302,11 @@ dhcp6_reply_event_handler (vl_api_dhcp6_reply_event_t * mp) { address_info->preferred_lt = preferred_time; address_info->valid_lt = valid_time; - address_info->due_time = current_time + valid_time; + address_info->due_time = current_time; + /* Renew the lease at the preferred time, if non-zero */ + address_info->due_time += (preferred_time > 0) ? + preferred_time : valid_time; + if (address_info->due_time > rm->max_valid_due_time) rm->max_valid_due_time = address_info->due_time; continue; @@ -316,7 +320,11 @@ dhcp6_reply_event_handler (vl_api_dhcp6_reply_event_t * mp) address_info->address = *address; address_info->preferred_lt = preferred_time; address_info->valid_lt = valid_time; - address_info->due_time = current_time + valid_time; + address_info->due_time = current_time; + /* Renew the lease at the preferred time, if non-zero */ + address_info->due_time += (preferred_time > 0) ? + preferred_time : valid_time; + if (address_info->due_time > rm->max_valid_due_time) rm->max_valid_due_time = address_info->due_time; rm->client_state_by_sw_if_index[sw_if_index].address_count++; -- cgit 1.2.3-korg