From 435910b3a6bfcdaecb60ea270beccbf4c69ad012 Mon Sep 17 00:00:00 2001 From: Yu Watanabe Date: Wed, 27 Oct 2021 23:34:40 +0900 Subject: [PATCH 1/2] network: address: use passed Address object if possible Then, we can avoid unnecessary duplication. --- src/network/networkd-address.c | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/src/network/networkd-address.c b/src/network/networkd-address.c index a89bdcac95..5ef38bc476 100644 --- a/src/network/networkd-address.c +++ b/src/network/networkd-address.c @@ -1113,9 +1113,13 @@ int link_request_address( if (address_get(link, address, &existing) < 0) { _cleanup_(address_freep) Address *tmp = NULL; - r = address_dup(address, &tmp); - if (r < 0) - return r; + if (consume_object) + tmp = address; + else { + r = address_dup(address, &tmp); + if (r < 0) + return r; + } /* Consider address tentative until we get the real flags from the kernel */ tmp->flags |= IFA_F_TENTATIVE; @@ -1128,14 +1132,18 @@ int link_request_address( } else { existing->source = address->source; existing->provider = address->provider; + existing->lifetime_valid_usec = address->lifetime_valid_usec; + existing->lifetime_preferred_usec = address->lifetime_preferred_usec; + if (consume_object) + address_free(address); } r = ipv4acd_configure(existing); if (r < 0) return r; - log_address_debug(address, "Requesting", link); - r = link_queue_request(link, REQUEST_TYPE_ADDRESS, address, consume_object, + log_address_debug(existing, "Requesting", link); + r = link_queue_request(link, REQUEST_TYPE_ADDRESS, existing, false, message_counter, netlink_handler, ret); if (r < 0) return log_link_warning_errno(link, r, "Failed to request address: %m"); From c1c655bb60933ce110d1e6b0b9a9e0ffd1a2d035 Mon Sep 17 00:00:00 2001 From: Yu Watanabe Date: Wed, 27 Oct 2021 23:37:26 +0900 Subject: [PATCH 2/2] network: route: update lifetime of existing route Otherwise, the route whose lifetime is managed by the sd-event's timer event source will be removed when the initial lifetime expires. --- src/network/networkd-route.c | 1 + 1 file changed, 1 insertion(+) diff --git a/src/network/networkd-route.c b/src/network/networkd-route.c index e5c95d734e..9ee89a671f 100644 --- a/src/network/networkd-route.c +++ b/src/network/networkd-route.c @@ -1572,6 +1572,7 @@ int link_request_route( } else { existing->source = route->source; existing->provider = route->provider; + existing->lifetime_usec = route->lifetime_usec; if (consume_object) route_free(route); }