X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Fnetwork%2Fnetworkd-manager.c;h=c1ad69bf514295614654760642242c609ede98fc;hb=ee3a6a51e5b098aa0c9641ed71d275c459ad2f5a;hp=f02eed1a59231ed7736c7caeaef444c6fe721da0;hpb=3bef724f7e7f7eaca69881548b06e221b77d7031;p=elogind.git diff --git a/src/network/networkd-manager.c b/src/network/networkd-manager.c index f02eed1a5..c1ad69bf5 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", @@ -54,20 +56,33 @@ int manager_new(Manager **ret) { if (r < 0) return r; + r = sd_bus_default_system(&m->bus); + if (r < 0 && r != -ENOENT) /* TODO: drop when we can rely on kdbus */ + return r; + m->udev = udev_new(); 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); @@ -80,11 +95,15 @@ 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); sd_event_source_unref(m->udev_event_source); sd_event_unref(m->event); @@ -95,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); @@ -110,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; @@ -173,9 +192,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) @@ -239,15 +263,31 @@ 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; + const char *name; uint64_t ifindex_64; int r, ifindex; 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; } + 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)); + } + } + ifindex_64 = ifindex; link = hashmap_get(m->links, &ifindex_64); if (!link) { @@ -280,6 +320,21 @@ int manager_rtnl_listen(Manager *m) { return 0; } +int manager_bus_listen(Manager *m) { + int r; + + assert(m->event); + + if (!m->bus) /* TODO: drop when we can rely on kdbus */ + return 0; + + r = sd_bus_attach_event(m->bus, m->event, 0); + if (r < 0) + return r; + + return 0; +} + static void append_dns(FILE *f, struct in_addr *dns, unsigned char family, unsigned *count) { char buf[INET6_ADDRSTRLEN]; const char *address; @@ -291,8 +346,8 @@ static void append_dns(FILE *f, struct in_addr *dns, unsigned char family, unsig } if (*count == MAXNS) - fputs("# Too many dynamic name servers configured, the " - "following entries will be ignored\n", f); + fputs("# Too many DNS servers configured, the following entries " + "will be ignored\n", f); fprintf(f, "nameserver %s\n", address); @@ -305,6 +360,7 @@ int manager_update_resolv_conf(Manager *m) { Link *link; Iterator i; unsigned count = 0; + const char *domainname = NULL; int r; assert(m); @@ -319,18 +375,31 @@ int manager_update_resolv_conf(Manager *m) { fchmod(fileno(f), 0644); - fputs("# This file is managed by systemd-networkd(8). Do not edit.\n", f); + fputs("# This file is managed by systemd-networkd(8). Do not edit.\n#\n" + "# Third party programs must not access this file directly, but\n" + "# only through the symlink at /etc/resolv.conf. To manage\n" + "# resolv.conf(5) in a different way, replace the symlink by a\n" + "# static file or a different symlink.\n\n", f); HASHMAP_FOREACH(link, m->links, i) { - if (link->dhcp) { - struct in_addr **nameservers; - - r = sd_dhcp_client_get_dns(link->dhcp, &nameservers); - if (r >= 0) { - unsigned j; + if (link->dhcp_lease) { + struct in_addr *nameservers; + size_t nameservers_size; + + if (link->network->dhcp_dns) { + r = sd_dhcp_lease_get_dns(link->dhcp_lease, &nameservers, &nameservers_size); + if (r >= 0) { + unsigned j; + + for (j = 0; j < nameservers_size; j++) + append_dns(f, &nameservers[j], AF_INET, &count); + } + } - for (j = 0; nameservers[j]; j++) - append_dns(f, nameservers[j], AF_INET, &count); + if (link->network->dhcp_domainname && !domainname) { + r = sd_dhcp_lease_get_domainname(link->dhcp_lease, &domainname); + if (r >= 0) + fprintf(f, "domain %s\n", domainname); } } }