shaba/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2024-12-25 01:34:28 +03:00
Code

networkd: don't warn about missing links unnecessarily

Browse Source 
If we get a NEWLINK + NEWADDR between enumerating the links and enumerating the addresses, we
would get a warning that the link corresponding to the address does not exist. This is a false
warning as both the NEWLINK and NEWADDR would be processed after enumerating completed, so drop
it.
This commit is contained in:
Tom Gundersen 2015-02-04 10:08:12 +01:00
parent 73432d67b5
commit 6a24f1484f
3 changed files with 14 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/network/networkd-link.c
View File

@ -1492,7 +1492,10 @@ int link_rtnl_process_address(sd_rtnl *rtnl, sd_rtnl_message *message, void *use
} else {
r = link_get(m, ifindex, &link);
if (r < 0 || !link) {
log_warning("rtnl: received address for nonexistent link (%d), ignoring", ifindex);
/* when enumerating we might be out of sync, but we will
* get the address again, so just ignore it */
if (!m->enumerating)
log_warning("rtnl: received address for nonexistent link (%d), ignoring", ifindex);
return 0;
}
}

8
src/network/networkd-manager.c
View File

@ -525,9 +525,13 @@ int manager_rtnl_enumerate_links(Manager *m) {
for (link = reply; link; link = sd_rtnl_message_next(link)) {
int k;
m->enumerating = true;
k = manager_rtnl_process_link(m->rtnl, link, m);
if (k < 0)
r = k;
m->enumerating = false;
}
return r;
@ -556,9 +560,13 @@ int manager_rtnl_enumerate_addresses(Manager *m) {
for (addr = reply; addr; addr = sd_rtnl_message_next(addr)) {
int k;
m->enumerating = true;
k = link_rtnl_process_address(m->rtnl, addr, m);
if (k < 0)
r = k;
m->enumerating = false;
}
return r;

2
src/network/networkd.h
View File

@ -206,6 +206,8 @@ struct Manager {
struct udev_monitor *udev_monitor;
sd_event_source *udev_event_source;
bool enumerating;
char *state_file;
Hashmap *links;