#include "libudev-private.h"
#include "udev-util.h"
+const char* const network_dirs[] = {
+ "/etc/systemd/network",
+ "/run/systemd/network",
+ "/usr/lib/systemd/network",
+#ifdef HAVE_SPLIT_USER
+ "/lib/systemd/network",
+#endif
+ NULL};
+
int manager_new(Manager **ret) {
_cleanup_manager_free_ Manager *m = NULL;
int r;
LIST_HEAD_INIT(m->networks);
- m->network_dirs = strv_new("/etc/systemd/network/",
- "/run/systemd/network/",
- "/usr/lib/systemd/network",
-#ifdef HAVE_SPLIT_USER
- "/lib/systemd/network",
-#endif
- NULL);
- if (!m->network_dirs)
- return -ENOMEM;
-
- if (!path_strv_canonicalize_uniq(m->network_dirs))
- return -ENOMEM;
-
*ret = m;
m = NULL;
bridge_free(bridge);
hashmap_free(m->bridges);
- strv_free(m->network_dirs);
sd_rtnl_unref(m->rtnl);
free(m);
int r;
/* update timestamp */
- paths_check_timestamp(m->network_dirs, &m->network_dirs_ts_usec, true);
+ paths_check_timestamp(network_dirs, &m->network_dirs_ts_usec, true);
r = bridge_load(m);
if (r < 0)
}
bool manager_should_reload(Manager *m) {
- return paths_check_timestamp(m->network_dirs, &m->network_dirs_ts_usec, false);
+ return paths_check_timestamp(network_dirs, &m->network_dirs_ts_usec, false);
}
static int manager_process_link(Manager *m, struct udev_device *device) {
link_free(link);
} else {
- log_debug("%s: link added", udev_device_get_sysname(device));
-
- r = link_add(m, device);
+ r = link_add(m, device, &link);
if (r < 0) {
- log_error("Could not handle link %s: %s",
- udev_device_get_sysname(device),
- strerror(-r));
- }
+ if (r == -EEXIST)
+ log_debug("%s: link already exists, ignoring",
+ link->ifname);
+ else
+ log_error("%s: could not handle link: %s",
+ udev_device_get_sysname(device),
+ strerror(-r));
+ } else
+ log_debug("%s: link (with ifindex %" PRIu64") added",
+ link->ifname, link->ifindex);
}
return 0;
static int manager_rtnl_process_link(sd_rtnl *rtnl, sd_rtnl_message *message, void *userdata) {
Manager *m = userdata;
Link *link;
+ uint64_t ifindex_64;
int r, ifindex;
r = sd_rtnl_message_link_get_ifindex(message, &ifindex);
return 0;
}
- link = hashmap_get(m->links, &ifindex);
+ ifindex_64 = ifindex;
+ link = hashmap_get(m->links, &ifindex_64);
if (!link) {
- log_debug("received RTM_NEWLINK message for ifindex we are not tracking (%d)", ifindex);
+ log_debug("received RTM_NEWLINK message for untracked ifindex %d", ifindex);
return 0;
}
if (r < 0)
return 0;
} else
- log_debug("received RTM_NEWLINK message for link we are not managing (%d)", ifindex);
+ log_debug("%s: received RTM_NEWLINK message for unmanaged link", link->ifname);
return 1;
}