X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=src%2Fnetwork%2Fnetworkd-manager.c;h=4c1987daa8214fc6030185cb98732e2253caa4c9;hp=c1ad69bf514295614654760642242c609ede98fc;hb=505f8da7325591defe5f751f328bd26915267602;hpb=624b5a636f2e0003a67025274d7afe9ebc55423b diff --git a/src/network/networkd-manager.c b/src/network/networkd-manager.c index c1ad69bf5..4c1987daa 100644 --- a/src/network/networkd-manager.c +++ b/src/network/networkd-manager.c @@ -29,15 +29,49 @@ #include "mkdir.h" #include "virt.h" +#include "sd-rtnl.h" + const char* const network_dirs[] = { "/etc/systemd/network", "/run/systemd/network", "/usr/lib/systemd/network", -#ifdef HAVE_SPLIT_USER +#ifdef HAVE_SPLIT_USR "/lib/systemd/network", #endif NULL}; +static int dispatch_sigterm(sd_event_source *es, const struct signalfd_siginfo *si, void *userdata) { + Manager *m = userdata; + + assert(m); + + log_received_signal(LOG_INFO, si); + + sd_event_exit(m->event, 0); + return 0; +} + +static int setup_signals(Manager *m) { + sigset_t mask; + int r; + + assert(m); + + assert_se(sigemptyset(&mask) == 0); + sigset_add_many(&mask, SIGINT, SIGTERM, -1); + assert_se(sigprocmask(SIG_SETMASK, &mask, NULL) == 0); + + r = sd_event_add_signal(m->event, &m->sigterm_event_source, SIGTERM, dispatch_sigterm, m); + if (r < 0) + return r; + + r = sd_event_add_signal(m->event, &m->sigint_event_source, SIGINT, dispatch_sigterm, m); + if (r < 0) + return r; + + return 0; +} + int manager_new(Manager **ret) { _cleanup_manager_free_ Manager *m = NULL; int r; @@ -52,7 +86,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; @@ -60,18 +94,18 @@ int manager_new(Manager **ret) { if (r < 0 && r != -ENOENT) /* TODO: drop when we can rely on kdbus */ return r; - m->udev = udev_new(); - if (!m->udev) - return -ENOMEM; + r = setup_signals(m); + 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) { - m->udev_monitor = udev_monitor_new_from_netlink(m->udev, "kernel"); - if (!m->udev_monitor) + if (detect_container(NULL) <= 0) { + m->udev = udev_new(); + if (!m->udev) return -ENOMEM; - } else { + m->udev_monitor = udev_monitor_new_from_netlink(m->udev, "udev"); if (!m->udev_monitor) return -ENOMEM; @@ -105,15 +139,17 @@ void manager_free(Manager *m) { udev_unref(m->udev); sd_bus_unref(m->bus); sd_event_source_unref(m->udev_event_source); + sd_event_source_unref(m->sigterm_event_source); + sd_event_source_unref(m->sigint_event_source); sd_event_unref(m->event); - while ((network = m->networks)) - network_free(network); - while ((link = hashmap_first(m->links))) link_free(link); hashmap_free(m->links); + while ((network = m->networks)) + network_free(network); + while ((netdev = hashmap_first(m->netdevs))) netdev_free(netdev); hashmap_free(m->netdevs); @@ -144,31 +180,47 @@ bool manager_should_reload(Manager *m) { return paths_check_timestamp(network_dirs, &m->network_dirs_ts_usec, false); } -static int manager_process_link(Manager *m, struct udev_device *device) { - Link *link; +static int manager_udev_process_link(Manager *m, struct udev_device *device) { + Link *link = NULL; int r; - if (streq_ptr(udev_device_get_action(device), "remove")) { - uint64_t ifindex; + assert(m); + assert(device); + + if (!streq_ptr(udev_device_get_action(device), "add")) + return 0; + + r = link_get(m, udev_device_get_ifindex(device), &link); + if (r < 0) + return r; + if (!link) + return 0; + + r = link_initialized(link, device); + if (r < 0) + return r; + + return 0; +} +/* + 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); @@ -176,45 +228,87 @@ static int manager_process_link(Manager *m, struct udev_device *device) { return 0; } +*/ +static int manager_rtnl_process_link(sd_rtnl *rtnl, sd_rtnl_message *message, void *userdata) { + Manager *m = userdata; + Link *link = NULL; + char *name; + int r, ifindex; -int manager_udev_enumerate_links(Manager *m) { - _cleanup_udev_enumerate_unref_ struct udev_enumerate *e = NULL; - struct udev_list_entry *item = NULL, *first = NULL; - int r; - + assert(rtnl); + assert(message); assert(m); - e = udev_enumerate_new(m->udev); - if (!e) - return -ENOMEM; + r = sd_rtnl_message_link_get_ifindex(message, &ifindex); + if (r < 0 || ifindex <= 0) { + log_warning("rtnl: received link message without valid ifindex"); + return 0; + } + + link_get(m, ifindex, &link); + if (!link) { + /* link is new, so add it */ + r = link_add(m, message, &link); + if (r < 0) { + log_debug("could not add new link"); + return 0; + } + } - r = udev_enumerate_add_match_subsystem(e, "net"); + r = sd_rtnl_message_read_string(message, IFLA_IFNAME, &name); if (r < 0) - return r; + log_warning("rtnl: received link message without valid ifname"); + else { + NetDev *netdev; - /* 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 = netdev_get(m, name, &netdev); + if (r >= 0) { + r = netdev_set_ifindex(netdev, message); + if (r < 0) { + log_debug("could not set ifindex on netdev"); + return 0; + } + } } - r = udev_enumerate_scan_devices(e); + r = link_update(link, message); + if (r < 0) + return 0; + + return 1; +} + +int manager_rtnl_enumerate_links(Manager *m) { + _cleanup_rtnl_message_unref_ sd_rtnl_message *req = NULL, *reply = NULL; + sd_rtnl_message *link; + int r, k; + + assert(m); + assert(m->rtnl); + + r = sd_rtnl_message_new_link(m->rtnl, &req, RTM_GETLINK, 0); if (r < 0) return r; - first = udev_enumerate_get_list_entry(e); - udev_list_entry_foreach(item, first) { - _cleanup_udev_device_unref_ struct udev_device *d = NULL; - int k; + r = sd_rtnl_message_request_dump(req, true); + if (r < 0) + return r; - d = udev_device_new_from_syspath(m->udev, udev_list_entry_get_name(item)); - if (!d) - return -ENOMEM; + r = sd_rtnl_call(m->rtnl, req, 0, &reply); + if (r < 0) + return r; - k = manager_process_link(m, d); + for (link = reply; link; link = sd_rtnl_message_next(link)) { + uint16_t type; + + k = sd_rtnl_message_get_type(link, &type); + if (k < 0) + return k; + + if (type != RTM_NEWLINK) + continue; + + k = manager_rtnl_process_link(m->rtnl, link, m); if (k < 0) r = k; } @@ -231,13 +325,18 @@ static int manager_dispatch_link_udev(sd_event_source *source, int fd, uint32_t if (!device) return -ENOMEM; - manager_process_link(m, device); + manager_udev_process_link(m, device); return 0; } int manager_udev_listen(Manager *m) { int r; + if (detect_container(NULL) > 0) + return 0; + + assert(m->udev_monitor); + r = udev_monitor_filter_add_match_subsystem_devtype(m->udev_monitor, "net", NULL); if (r < 0) { log_error("Could not add udev monitor filter: %s", strerror(-r)); @@ -251,61 +350,16 @@ 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; return 0; } -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 || 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) { - log_debug("received RTM_NEWLINK message for untracked ifindex %d", ifindex); - return 0; - } - - /* only track the status of links we want to manage */ - if (link->network) { - r = link_update(link, message); - if (r < 0) - return 0; - } else - log_debug("%s: received RTM_NEWLINK message for unmanaged link", link->ifname); - - return 1; -} - int manager_rtnl_listen(Manager *m) { int r; @@ -365,10 +419,6 @@ int manager_update_resolv_conf(Manager *m) { assert(m); - r = mkdir_safe_label("/run/systemd/network", 0755, 0, 0); - if (r < 0) - return r; - r = fopen_temporary("/run/systemd/network/resolv.conf", &f, &temp_path); if (r < 0) return r; @@ -404,10 +454,17 @@ int manager_update_resolv_conf(Manager *m) { } } - HASHMAP_FOREACH(link, m->links, i) - if (link->network && link->network->dns) - append_dns(f, &link->network->dns->in_addr.in, - link->network->dns->family, &count); + HASHMAP_FOREACH(link, m->links, i) { + if (link->network && link->network->dns) { + Address *address; + Iterator j; + + SET_FOREACH(address, link->network->dns, j) { + append_dns(f, &address->in_addr.in, + address->family, &count); + } + } + } fflush(f);