morgan/systemd
1
0
Fork 0
mirror of https://github.com/morgan9e/systemd synced 2026-04-15 00:47:10 +09:00
Code Issues Packages Projects Releases Wiki Activity

network: address: use passed Address object if possible

Browse Source 
Then, we can avoid unnecessary duplication.
This commit is contained in:
Yu Watanabe
2021-10-27 23:34:40 +09:00
parent eef5ebec97
commit 435910b3a6
1 changed files with 13 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/network/networkd-address.c
View File

@@ -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");