SymbX/systemd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

network: address: fix flags and lifetime in debugging logs

Browse Source 
Prompted by #20891.
This commit is contained in:
Yu Watanabe
2021-10-04 17:59:15 +09:00
parent 936a7cb66a
commit f983155736
1 changed files with 7 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/network/networkd-address.c
+7 -8
View File
@@ -398,7 +398,7 @@ static int address_add(Link *link, Address *address) {
return 0;
}
static int address_update(Address *address, const Address *src) {
static int address_update(Address *address) {
Link *link;
int r;
@@ -406,11 +406,6 @@ static int address_update(Address *address, const Address *src) {
assert(address->link);
link = address->link;
if (src) {
address->flags = src->flags;
address->scope = src->scope;
address->cinfo = src->cinfo;
}
if (address_is_ready(address) &&
address->family == AF_INET6 &&
@@ -1357,8 +1352,12 @@ int manager_rtnl_process_address(sd_netlink *rtnl, sd_netlink_message *message,
switch (type) {
case RTM_NEWADDR:
if (address) {
/* update flags and etc. */
address->flags = tmp->flags;
address->scope = tmp->scope;
address->cinfo = tmp->cinfo;
address_enter_configured(address);
log_address_debug(address, "Remembering updated", link);
log_address_debug(address, "Received updated", link);
} else {
address_enter_configured(tmp);
log_address_debug(tmp, "Received new", link);
@@ -1377,7 +1376,7 @@ int manager_rtnl_process_address(sd_netlink *rtnl, sd_netlink_message *message,
}
/* address_update() logs internally, so we don't need to here. */
r = address_update(address, tmp);
r = address_update(address);
if (r < 0)
link_enter_failed(link);