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

networkd: improve link state change logging

Browse Source
This commit is contained in:
Tom Gundersen
2014-01-03 16:20:10 +01:00
parent d0d311d62f
commit efbc88b8ed
1 changed files with 30 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/network/networkd-link.c
+30 -19
View File
@@ -450,33 +450,44 @@ static int link_update_flags(Link *link, unsigned flags) {
if (link->state == LINK_STATE_FAILED)
return 0;
if (link->flags & IFF_UP && !(flags & IFF_UP))
log_info("%s: interface is down", link->ifname);
else if (!(link->flags & IFF_UP) && flags & IFF_UP)
log_info("%s: interface is up", link->ifname);
if (link->flags == flags) {
log_debug("%s: link status unchanged: %#x", link->ifname, flags);
return 0;
}
if (link->flags & IFF_LOWER_UP && !(flags & IFF_LOWER_UP)) {
log_info("%s: disconnected", link->ifname);
if ((link->flags & IFF_UP) != (flags & IFF_UP)) {
if (flags & IFF_UP)
log_info("%s: power on", link->ifname);
else
log_info("%s: power off", link->ifname);
}
if (link->network->dhcp) {
r = sd_dhcp_client_stop(link->dhcp);
if (r < 0) {
link_enter_failed(link);
return r;
if ((link->flags & IFF_LOWER_UP) != (flags & IFF_LOWER_UP)) {
if (flags & IFF_LOWER_UP) {
log_info("%s: carrier on", link->ifname);
if (link->network->dhcp) {
r = link_acquire_conf(link);
if (r < 0) {
link_enter_failed(link);
return r;
}
}
}
} else if (!(link->flags & IFF_LOWER_UP) && flags & IFF_LOWER_UP) {
log_info("%s: connected", link->ifname);
} else {
log_info("%s: carrier off", link->ifname);
if (link->network->dhcp) {
r = link_acquire_conf(link);
if (r < 0) {
link_enter_failed(link);
return r;
if (link->network->dhcp) {
r = sd_dhcp_client_stop(link->dhcp);
if (r < 0) {
link_enter_failed(link);
return r;
}
}
}
}
log_debug("%s: link status updated: %#x -> %#x", link->ifname, link->flags, flags);
link->flags = flags;
return 0;