From 88d9ab643e6d69972c918fad44cc7f33783d92d9 Mon Sep 17 00:00:00 2001 From: Tian Hao Date: Fri, 30 Aug 2019 01:08:17 +0800 Subject: [PATCH] dhcpv6: retry failed PD assignments on addrlist change Currently only assignments with prefixes larger than the largest available one will be re-assigned on addrlist change events. Previously failed PD assignments are not taken into account, and these assignments will never have a chance to recover even if the address just added to the interface could satisfy them. Failed PD assignments could be very common when upstream prefix is obtained from a PPPoE WAN, as ISPs tend to terminate the PPPoE session after a fixed time period. Addresses on LAN could disappear and re-appear during WAN redial, and all existing PD assignments to clients in LAN will become failed when the addresses disappear. These assignments will not be recovered after WAN has been brought back up, and clients in LAN could no longer receive any PD prefix. This commit fixes the issue by including failed PD assignments in the re-assign list on addrlist change event, so that newly added prefixes can be put into use right after they are added to the interface. Signed-off-by: Tian Hao (cherry picked from commit fd93e36727bc605f6f860759d7710a43bee5215d) --- src/dhcpv6-ia.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/dhcpv6-ia.c b/src/dhcpv6-ia.c index 0846836..c8e616f 100644 --- a/src/dhcpv6-ia.c +++ b/src/dhcpv6-ia.c @@ -700,7 +700,7 @@ static void handle_addrlist_change(struct netevent_handler_info *info) c->managed_size) continue; - if (c->length < 128 && c->assigned >= border->assigned && c != border) + if (c->length < 128 && (c->assigned == 0 || c->assigned >= border->assigned) && c != border) list_move(&c->head, &reassign); else if (c != border && (c->flags & OAF_BOUND)) apply_lease(iface, c, true); -- 2.30.2