diff options
| author | Yu Watanabe <watanabe.yu+github@gmail.com> | 2021-10-27 23:34:40 +0900 |
|---|---|---|
| committer | Yu Watanabe <watanabe.yu+github@gmail.com> | 2021-10-27 23:34:47 +0900 |
| commit | 435910b3a6bfcdaecb60ea270beccbf4c69ad012 (patch) | |
| tree | e73b9d744ee5a1583309a7dff454777c899bdc31 | |
| parent | eef5ebec9775d15b07f5660b501cb8fc7f3446c8 (diff) | |
| download | systemd-435910b3a6bfcdaecb60ea270beccbf4c69ad012.tar.gz | |
network: address: use passed Address object if possible
Then, we can avoid unnecessary duplication.
| -rw-r--r-- | src/network/networkd-address.c | 18 |
1 files 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"); |