X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Fnetwork%2Fnetworkd-manager.c;h=55e5cafd00bcd6a248c2e583903d4cf958706f89;hb=12e0f830f592ec4c6bb49ac7ae1e0e84f74105e3;hp=5ab9ba0bafd09d240e104e44970383f382808bbf;hpb=039ebe6aebaebcaa18375b33caf1db5fe2551621;p=elogind.git diff --git a/src/network/networkd-manager.c b/src/network/networkd-manager.c index 5ab9ba0ba..55e5cafd0 100644 --- a/src/network/networkd-manager.c +++ b/src/network/networkd-manager.c @@ -25,7 +25,9 @@ #include "networkd.h" #include "libudev-private.h" #include "udev-util.h" +#include "rtnl-util.h" #include "mkdir.h" +#include "virt.h" const char* const network_dirs[] = { "/etc/systemd/network", @@ -50,7 +52,7 @@ int manager_new(Manager **ret) { sd_event_set_watchdog(m->event, true); - r = sd_rtnl_open(RTMGRP_LINK | RTMGRP_IPV4_IFADDR, &m->rtnl); + r = sd_rtnl_open(&m->rtnl, RTMGRP_LINK | RTMGRP_IPV4_IFADDR); if (r < 0) return r; @@ -62,16 +64,25 @@ int manager_new(Manager **ret) { if (!m->udev) return -ENOMEM; - m->udev_monitor = udev_monitor_new_from_netlink(m->udev, "udev"); - if (!m->udev_monitor) - return -ENOMEM; + /* udev does not initialize devices inside containers, + * so we rely on them being already initialized before + * entering the container */ + if (detect_container(NULL) > 0) { + m->udev_monitor = udev_monitor_new_from_netlink(m->udev, "kernel"); + if (!m->udev_monitor) + return -ENOMEM; + } else { + m->udev_monitor = udev_monitor_new_from_netlink(m->udev, "udev"); + if (!m->udev_monitor) + return -ENOMEM; + } m->links = hashmap_new(uint64_hash_func, uint64_compare_func); if (!m->links) return -ENOMEM; - m->bridges = hashmap_new(string_hash_func, string_compare_func); - if (!m->bridges) + m->netdevs = hashmap_new(string_hash_func, string_compare_func); + if (!m->netdevs) return -ENOMEM; LIST_HEAD_INIT(m->networks); @@ -84,9 +95,12 @@ int manager_new(Manager **ret) { void manager_free(Manager *m) { Network *network; - Bridge *bridge; + NetDev *netdev; Link *link; + if (!m) + return; + udev_monitor_unref(m->udev_monitor); udev_unref(m->udev); sd_bus_unref(m->bus); @@ -100,9 +114,9 @@ void manager_free(Manager *m) { link_free(link); hashmap_free(m->links); - while ((bridge = hashmap_first(m->bridges))) - bridge_free(bridge); - hashmap_free(m->bridges); + while ((netdev = hashmap_first(m->netdevs))) + netdev_free(netdev); + hashmap_free(m->netdevs); sd_rtnl_unref(m->rtnl); @@ -115,7 +129,7 @@ int manager_load_config(Manager *m) { /* update timestamp */ paths_check_timestamp(network_dirs, &m->network_dirs_ts_usec, true); - r = bridge_load(m); + r = netdev_load(m); if (r < 0) return r; @@ -131,30 +145,31 @@ bool manager_should_reload(Manager *m) { } static int manager_process_link(Manager *m, struct udev_device *device) { - Link *link; + Link *link = NULL; int r; - if (streq_ptr(udev_device_get_action(device), "remove")) { - uint64_t ifindex; + assert(m); + assert(device); + + link_get(m, udev_device_get_ifindex(device), &link); + if (streq_ptr(udev_device_get_action(device), "remove")) { log_debug("%s: link removed", udev_device_get_sysname(device)); - ifindex = udev_device_get_ifindex(device); - link = hashmap_get(m->links, &ifindex); - if (!link) + if (link) + link_free(link); + } else { + if (link) { + log_debug("%s: link already exists, ignoring", + link->ifname); return 0; + } - link_free(link); - } else { r = link_add(m, device, &link); if (r < 0) { - 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)); + 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); @@ -178,9 +193,14 @@ int manager_udev_enumerate_links(Manager *m) { if (r < 0) return r; - r = udev_enumerate_add_match_is_initialized(e); - if (r < 0) - return r; + /* udev does not initialize devices inside containers, + * so we rely on them being already initialized before + * entering the container */ + if (detect_container(NULL) <= 0) { + r = udev_enumerate_add_match_is_initialized(e); + if (r < 0) + return r; + } r = udev_enumerate_scan_devices(e); if (r < 0) @@ -232,9 +252,10 @@ int manager_udev_listen(Manager *m) { } r = sd_event_add_io(m->event, + &m->udev_event_source, udev_monitor_get_fd(m->udev_monitor), EPOLLIN, manager_dispatch_link_udev, - m, &m->udev_event_source); + m); if (r < 0) return r; @@ -244,18 +265,36 @@ int manager_udev_listen(Manager *m) { static int manager_rtnl_process_link(sd_rtnl *rtnl, sd_rtnl_message *message, void *userdata) { Manager *m = userdata; Link *link; - uint64_t ifindex_64; + const char *name; int r, ifindex; + assert(rtnl); + assert(message); + assert(m); + r = sd_rtnl_message_link_get_ifindex(message, &ifindex); - if (r < 0) { + if (r < 0 || ifindex <= 0) { log_debug("received RTM_NEWLINK message without valid ifindex"); return 0; } - ifindex_64 = ifindex; - link = hashmap_get(m->links, &ifindex_64); - if (!link) { + r = rtnl_message_link_get_ifname(message, &name); + if (r < 0) + log_debug("received RTM_NEWLINK message without valid IFLA_IFNAME"); + else { + NetDev *netdev; + + r = netdev_get(m, name, &netdev); + if (r >= 0) { + r = netdev_set_ifindex(netdev, ifindex); + if (r < 0) + log_debug("could not set ifindex of netdev '%s' to %d: %s", + name, ifindex, strerror(-r)); + } + } + + r = link_get(m, ifindex, &link); + if (r < 0) { log_debug("received RTM_NEWLINK message for untracked ifindex %d", ifindex); return 0; } @@ -347,12 +386,12 @@ int manager_update_resolv_conf(Manager *m) { "# static file or a different symlink.\n\n", f); HASHMAP_FOREACH(link, m->links, i) { - if (link->dhcp) { + if (link->dhcp_lease) { struct in_addr *nameservers; size_t nameservers_size; if (link->network->dhcp_dns) { - r = sd_dhcp_client_get_dns(link->dhcp, &nameservers, &nameservers_size); + r = sd_dhcp_lease_get_dns(link->dhcp_lease, &nameservers, &nameservers_size); if (r >= 0) { unsigned j; @@ -362,7 +401,7 @@ int manager_update_resolv_conf(Manager *m) { } if (link->network->dhcp_domainname && !domainname) { - r = sd_dhcp_client_get_domainname(link->dhcp, &domainname); + r = sd_dhcp_lease_get_domainname(link->dhcp_lease, &domainname); if (r >= 0) fprintf(f, "domain %s\n", domainname); }