X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=src%2Fnetwork%2Fnetworkd-manager.c;h=ce97ac0778ca7e6a25698bd364ed301dd11ab9e5;hp=fe9008a3dff2dc03fb8488b4067f790dceecf4ee;hb=f806f64c7460632d6b6c27865e1554cb6c934320;hpb=45af44d47da6933b260c734ad9ff721f63f80a4d diff --git a/src/network/networkd-manager.c b/src/network/networkd-manager.c index fe9008a3d..ce97ac077 100644 --- a/src/network/networkd-manager.c +++ b/src/network/networkd-manager.c @@ -31,10 +31,13 @@ #include "libudev-private.h" #include "udev-util.h" #include "rtnl-util.h" +#include "bus-util.h" +#include "def.h" #include "mkdir.h" #include "virt.h" #include "sd-rtnl.h" +#include "sd-daemon.h" /* use 8 MB for receive socket kernel queue. */ #define RCVBUF_SIZE (8*1024*1024) @@ -75,126 +78,121 @@ static int setup_default_address_pool(Manager *m) { return 0; } -int manager_new(Manager **ret) { - _cleanup_manager_free_ Manager *m = NULL; - int r; +static int on_bus_retry(sd_event_source *s, usec_t usec, void *userdata) { + Manager *m = userdata; - m = new0(Manager, 1); - if (!m) - return -ENOMEM; + assert(s); + assert(m); - m->state_file = strdup("/run/systemd/netif/state"); - if (!m->state_file) - return -ENOMEM; + m->bus_retry_event_source = sd_event_source_unref(m->bus_retry_event_source); - r = sd_event_default(&m->event); - if (r < 0) - return r; + manager_connect_bus(m); - sd_event_set_watchdog(m->event, true); + return 0; +} - sd_event_add_signal(m->event, NULL, SIGTERM, NULL, NULL); - sd_event_add_signal(m->event, NULL, SIGINT, NULL, NULL); +static int manager_reset_all(Manager *m) { + Link *link; + Iterator i; + int r; - r = sd_rtnl_open(&m->rtnl, 3, RTNLGRP_LINK, RTNLGRP_IPV4_IFADDR, - RTNLGRP_IPV6_IFADDR); - if (r < 0) - return r; + assert(m); - r = sd_rtnl_inc_rcvbuf(m->rtnl, RCVBUF_SIZE); - if (r < 0) - return r; + HASHMAP_FOREACH(link, m->links, i) { + r = link_carrier_reset(link); + if (r < 0) + log_link_warning_errno(link, r, "could not reset carrier: %m"); + } - r = sd_bus_default_system(&m->bus); - if (r < 0 && r != -ENOENT) /* TODO: drop when we can rely on kdbus */ - return r; + return 0; +} - /* 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 = udev_new(); - if (!m->udev) - return -ENOMEM; - - m->udev_monitor = udev_monitor_new_from_netlink(m->udev, "udev"); - if (!m->udev_monitor) - return -ENOMEM; - } +static int match_prepare_for_sleep(sd_bus *bus, sd_bus_message *message, void *userdata, sd_bus_error *ret_error) { + Manager *m = userdata; + int b, r; - m->netdevs = hashmap_new(&string_hash_ops); - if (!m->netdevs) - return -ENOMEM; + assert(bus); + assert(bus); - LIST_HEAD_INIT(m->networks); + r = sd_bus_message_read(message, "b", &b); + if (r < 0) { + log_debug_errno(r, "Failed to parse PrepareForSleep signal: %m"); + return 0; + } - r = setup_default_address_pool(m); - if (r < 0) - return r; + if (b) + return 0; - *ret = m; - m = NULL; + log_debug("Coming back from suspend, resetting all connections..."); + + manager_reset_all(m); return 0; } -void manager_free(Manager *m) { - Network *network; - NetDev *netdev; - Link *link; - AddressPool *pool; +int manager_connect_bus(Manager *m) { + int r; - if (!m) - return; + assert(m); - free(m->state_file); + r = sd_bus_default_system(&m->bus); + if (r == -ENOENT) { + /* We failed to connect? Yuck, we must be in early + * boot. Let's try in 5s again. As soon as we have + * kdbus we can stop doing this... */ - 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); + log_debug_errno(r, "Failed to connect to bus, trying again in 5s: %m"); - while ((link = hashmap_first(m->links))) - link_unref(link); - hashmap_free(m->links); + r = sd_event_add_time(m->event, &m->bus_retry_event_source, CLOCK_MONOTONIC, now(CLOCK_MONOTONIC) + 5*USEC_PER_SEC, 0, on_bus_retry, m); + if (r < 0) + return log_error_errno(r, "Failed to install bus reconnect time event: %m"); - while ((network = m->networks)) - network_free(network); + return 0; + } if (r < 0) + return r; - while ((netdev = hashmap_first(m->netdevs))) - netdev_unref(netdev); - hashmap_free(m->netdevs); + r = sd_bus_add_match(m->bus, &m->prepare_for_sleep_slot, + "type='signal'," + "sender='org.freedesktop.login1'," + "interface='org.freedesktop.login1.Manager'," + "member='PrepareForSleep'," + "path='/org/freedesktop/login1'", + match_prepare_for_sleep, + m); + if (r < 0) + return log_error_errno(r, "Failed to add match for PrepareForSleep: %m"); - while ((pool = m->address_pools)) - address_pool_free(pool); + r = sd_bus_add_object_vtable(m->bus, NULL, "/org/freedesktop/network1", "org.freedesktop.network1.Manager", manager_vtable, m); + if (r < 0) + return log_error_errno(r, "Failed to add manager object vtable: %m"); - sd_rtnl_unref(m->rtnl); + r = sd_bus_add_fallback_vtable(m->bus, NULL, "/org/freedesktop/network1/link", "org.freedesktop.network1.Link", link_vtable, link_object_find, m); + if (r < 0) + return log_error_errno(r, "Failed to add link object vtable: %m"); - free(m); -} + r = sd_bus_add_node_enumerator(m->bus, NULL, "/org/freedesktop/network1/link", link_node_enumerator, m); + if (r < 0) + return log_error_errno(r, "Failed to add link enumerator: %m"); -int manager_load_config(Manager *m) { - int r; + r = sd_bus_add_fallback_vtable(m->bus, NULL, "/org/freedesktop/network1/network", "org.freedesktop.network1.Network", network_vtable, network_object_find, m); + if (r < 0) + return log_error_errno(r, "Failed to add network object vtable: %m"); - /* update timestamp */ - paths_check_timestamp(network_dirs, &m->network_dirs_ts_usec, true); + r = sd_bus_add_node_enumerator(m->bus, NULL, "/org/freedesktop/network1/network", network_node_enumerator, m); + if (r < 0) + return log_error_errno(r, "Failed to add network enumerator: %m"); - r = netdev_load(m); + r = sd_bus_request_name(m->bus, "org.freedesktop.network1", 0); if (r < 0) - return r; + return log_error_errno(r, "Failed to register name: %m"); - r = network_load(m); + r = sd_bus_attach_event(m->bus, m->event, 0); if (r < 0) - return r; + return log_error_errno(r, "Failed to attach bus to event loop: %m"); return 0; } -bool manager_should_reload(Manager *m) { - return paths_check_timestamp(network_dirs, &m->network_dirs_ts_usec, false); -} - static int manager_udev_process_link(Manager *m, struct udev_device *device) { Link *link = NULL; int r, ifindex; @@ -224,6 +222,61 @@ static int manager_udev_process_link(Manager *m, struct udev_device *device) { return 0; } +static int manager_dispatch_link_udev(sd_event_source *source, int fd, uint32_t revents, void *userdata) { + Manager *m = userdata; + struct udev_monitor *monitor = m->udev_monitor; + _cleanup_udev_device_unref_ struct udev_device *device = NULL; + + device = udev_monitor_receive_device(monitor); + if (!device) + return -ENOMEM; + + manager_udev_process_link(m, device); + return 0; +} + +static int manager_connect_udev(Manager *m) { + int 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) + return 0; + + 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; + + r = udev_monitor_filter_add_match_subsystem_devtype(m->udev_monitor, "net", NULL); + if (r < 0) + return log_error_errno(r, "Could not add udev monitor filter: %m"); + + r = udev_monitor_enable_receiving(m->udev_monitor); + if (r < 0) { + log_error("Could not enable udev monitor"); + return r; + } + + r = sd_event_add_io(m->event, + &m->udev_event_source, + udev_monitor_get_fd(m->udev_monitor), + EPOLLIN, manager_dispatch_link_udev, + m); + if (r < 0) + return r; + + r = sd_event_source_set_description(m->udev_event_source, "networkd-udev"); + 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 = NULL; @@ -273,7 +326,7 @@ static int manager_rtnl_process_link(sd_rtnl *rtnl, sd_rtnl_message *message, vo /* link is new, so add it */ r = link_add(m, message, &link); if (r < 0) { - log_debug_errno(r, "could not add new link: %m"); + log_warning_errno(r, "could not add new link: %m"); return 0; } } @@ -282,7 +335,7 @@ static int manager_rtnl_process_link(sd_rtnl *rtnl, sd_rtnl_message *message, vo /* netdev exists, so make sure the ifindex matches */ r = netdev_set_ifindex(netdev, message); if (r < 0) { - log_debug_errno(r, "could not set ifindex on netdev: %m"); + log_warning_errno(r, "could not set ifindex on netdev: %m"); return 0; } } @@ -306,155 +359,284 @@ static int manager_rtnl_process_link(sd_rtnl *rtnl, sd_rtnl_message *message, vo 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; +static int systemd_netlink_fd(void) { + int n, fd, rtnl_fd = -EINVAL; + + n = sd_listen_fds(true); + if (n <= 0) + return -EINVAL; + + for (fd = SD_LISTEN_FDS_START; fd < SD_LISTEN_FDS_START + n; fd ++) { + if (sd_is_socket(fd, AF_NETLINK, SOCK_RAW, -1) > 0) { + if (rtnl_fd >= 0) + return -EINVAL; + + rtnl_fd = fd; + } + } + + return rtnl_fd; +} + +static int manager_connect_rtnl(Manager *m) { + int fd, r; assert(m); - assert(m->rtnl); - r = sd_rtnl_message_new_link(m->rtnl, &req, RTM_GETLINK, 0); + fd = systemd_netlink_fd(); + if (fd < 0) + r = sd_rtnl_open(&m->rtnl, 3, RTNLGRP_LINK, RTNLGRP_IPV4_IFADDR, RTNLGRP_IPV6_IFADDR); + else + r = sd_rtnl_open_fd(&m->rtnl, fd, 0); if (r < 0) return r; - r = sd_rtnl_message_request_dump(req, true); + r = sd_rtnl_inc_rcvbuf(m->rtnl, RCVBUF_SIZE); if (r < 0) return r; - r = sd_rtnl_call(m->rtnl, req, 0, &reply); + r = sd_rtnl_attach_event(m->rtnl, m->event, 0); if (r < 0) return r; - for (link = reply; link; link = sd_rtnl_message_next(link)) { - int k; + r = sd_rtnl_add_match(m->rtnl, RTM_NEWLINK, &manager_rtnl_process_link, m); + if (r < 0) + return r; - k = manager_rtnl_process_link(m->rtnl, link, m); - if (k < 0) - r = k; - } + r = sd_rtnl_add_match(m->rtnl, RTM_DELLINK, &manager_rtnl_process_link, m); + if (r < 0) + return r; - return r; + r = sd_rtnl_add_match(m->rtnl, RTM_NEWADDR, &link_rtnl_process_address, m); + if (r < 0) + return r; + + r = sd_rtnl_add_match(m->rtnl, RTM_DELADDR, &link_rtnl_process_address, m); + if (r < 0) + return r; + + return 0; } -int manager_rtnl_enumerate_addresses(Manager *m) { - _cleanup_rtnl_message_unref_ sd_rtnl_message *req = NULL, *reply = NULL; - sd_rtnl_message *addr; +int manager_new(Manager **ret) { + _cleanup_manager_free_ Manager *m = NULL; int r; - assert(m); - assert(m->rtnl); + m = new0(Manager, 1); + if (!m) + return -ENOMEM; - r = sd_rtnl_message_new_addr(m->rtnl, &req, RTM_GETADDR, 0, 0); + m->state_file = strdup("/run/systemd/netif/state"); + if (!m->state_file) + return -ENOMEM; + + r = sd_event_default(&m->event); if (r < 0) return r; - r = sd_rtnl_message_request_dump(req, true); + sd_event_set_watchdog(m->event, true); + + sd_event_add_signal(m->event, NULL, SIGTERM, NULL, NULL); + sd_event_add_signal(m->event, NULL, SIGINT, NULL, NULL); + + r = manager_connect_rtnl(m); if (r < 0) return r; - r = sd_rtnl_call(m->rtnl, req, 0, &reply); + r = manager_connect_udev(m); if (r < 0) return r; - for (addr = reply; addr; addr = sd_rtnl_message_next(addr)) { - int k; + m->netdevs = hashmap_new(&string_hash_ops); + if (!m->netdevs) + return -ENOMEM; - k = link_rtnl_process_address(m->rtnl, addr, m); - if (k < 0) - r = k; - } + LIST_HEAD_INIT(m->networks); - return r; + r = setup_default_address_pool(m); + if (r < 0) + return r; + + *ret = m; + m = NULL; + + return 0; } -static int manager_dispatch_link_udev(sd_event_source *source, int fd, uint32_t revents, void *userdata) { - Manager *m = userdata; - struct udev_monitor *monitor = m->udev_monitor; - _cleanup_udev_device_unref_ struct udev_device *device = NULL; +void manager_free(Manager *m) { + Network *network; + NetDev *netdev; + Link *link; + AddressPool *pool; - device = udev_monitor_receive_device(monitor); - if (!device) - return -ENOMEM; + if (!m) + return; - manager_udev_process_link(m, device); - return 0; + free(m->state_file); + + udev_monitor_unref(m->udev_monitor); + udev_unref(m->udev); + sd_bus_unref(m->bus); + sd_bus_slot_unref(m->prepare_for_sleep_slot); + sd_event_source_unref(m->udev_event_source); + sd_event_source_unref(m->bus_retry_event_source); + sd_event_unref(m->event); + + while ((link = hashmap_first(m->links))) + link_unref(link); + hashmap_free(m->links); + + while ((network = m->networks)) + network_free(network); + + hashmap_free(m->networks_by_name); + + while ((netdev = hashmap_first(m->netdevs))) + netdev_unref(netdev); + hashmap_free(m->netdevs); + + while ((pool = m->address_pools)) + address_pool_free(pool); + + sd_rtnl_unref(m->rtnl); + + free(m); } -int manager_udev_listen(Manager *m) { - int r; +static bool manager_check_idle(void *userdata) { + Manager *m = userdata; + Link *link; + Iterator i; - if (detect_container(NULL) > 0) - return 0; + assert(m); - assert(m->udev_monitor); + HASHMAP_FOREACH(link, m->links, i) { + /* we are not woken on udev activity, so let's just wait for the + * pending udev event */ + if (link->state == LINK_STATE_PENDING) + return false; - r = udev_monitor_filter_add_match_subsystem_devtype(m->udev_monitor, "net", NULL); - if (r < 0) - return log_error_errno(r, "Could not add udev monitor filter: %m"); + if (!link->network) + continue; - r = udev_monitor_enable_receiving(m->udev_monitor); - if (r < 0) { - log_error("Could not enable udev monitor"); - return r; + /* we are not woken on netork activity, so let's stay around */ + if (link_lldp_enabled(link) || + link_ipv4ll_enabled(link) || + link_dhcp4_server_enabled(link) || + link_dhcp4_enabled(link) || + link_dhcp6_enabled(link)) + return false; } - r = sd_event_add_io(m->event, - &m->udev_event_source, - udev_monitor_get_fd(m->udev_monitor), - EPOLLIN, manager_dispatch_link_udev, - m); + return true; +} + +int manager_run(Manager *m) { + assert(m); + + if (m->bus) + return bus_event_loop_with_idle( + m->event, + m->bus, + "org.freedesktop.network1", + DEFAULT_EXIT_USEC, + manager_check_idle, + m); + else + /* failed to connect to the bus, so we lose exit-on-idle logic, + this should not happen except if dbus is not around at all */ + return sd_event_loop(m->event); +} + +int manager_load_config(Manager *m) { + int r; + + /* update timestamp */ + paths_check_timestamp(network_dirs, &m->network_dirs_ts_usec, true); + + r = netdev_load(m); if (r < 0) return r; - r = sd_event_source_set_description(m->udev_event_source, "networkd-udev"); + r = network_load(m); if (r < 0) return r; return 0; } -int manager_rtnl_listen(Manager *m) { +bool manager_should_reload(Manager *m) { + return paths_check_timestamp(network_dirs, &m->network_dirs_ts_usec, false); +} + +int manager_rtnl_enumerate_links(Manager *m) { + _cleanup_rtnl_message_unref_ sd_rtnl_message *req = NULL, *reply = NULL; + sd_rtnl_message *link; int r; assert(m); + assert(m->rtnl); - r = sd_rtnl_attach_event(m->rtnl, m->event, 0); + r = sd_rtnl_message_new_link(m->rtnl, &req, RTM_GETLINK, 0); if (r < 0) return r; - r = sd_rtnl_add_match(m->rtnl, RTM_NEWLINK, &manager_rtnl_process_link, m); + r = sd_rtnl_message_request_dump(req, true); if (r < 0) return r; - r = sd_rtnl_add_match(m->rtnl, RTM_DELLINK, &manager_rtnl_process_link, m); + r = sd_rtnl_call(m->rtnl, req, 0, &reply); if (r < 0) return r; - r = sd_rtnl_add_match(m->rtnl, RTM_NEWADDR, &link_rtnl_process_address, m); - if (r < 0) - return r; + for (link = reply; link; link = sd_rtnl_message_next(link)) { + int k; - r = sd_rtnl_add_match(m->rtnl, RTM_DELADDR, &link_rtnl_process_address, m); - if (r < 0) - return r; + m->enumerating = true; - return 0; + k = manager_rtnl_process_link(m->rtnl, link, m); + if (k < 0) + r = k; + + m->enumerating = false; + } + + return r; } -int manager_bus_listen(Manager *m) { +int manager_rtnl_enumerate_addresses(Manager *m) { + _cleanup_rtnl_message_unref_ sd_rtnl_message *req = NULL, *reply = NULL; + sd_rtnl_message *addr; int r; - assert(m->event); + assert(m); + assert(m->rtnl); - if (!m->bus) /* TODO: drop when we can rely on kdbus */ - return 0; + r = sd_rtnl_message_new_addr(m->rtnl, &req, RTM_GETADDR, 0, 0); + if (r < 0) + return r; - r = sd_bus_attach_event(m->bus, m->event, 0); + r = sd_rtnl_message_request_dump(req, true); if (r < 0) return r; - return 0; + r = sd_rtnl_call(m->rtnl, req, 0, &reply); + if (r < 0) + return r; + + 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; } static int set_put_in_addr(Set *s, const struct in_addr *address) { @@ -626,6 +808,13 @@ int manager_save(Manager *m) { goto fail; } + if (m->operational_state != operstate) { + m->operational_state = operstate; + r = manager_send_changed(m, "OperationalState", NULL); + if (r < 0) + log_error_errno(r, "Could not emit changed OperationalState: %m"); + } + return 0; fail: @@ -654,3 +843,37 @@ int manager_address_pool_acquire(Manager *m, int family, unsigned prefixlen, uni return 0; } + +const char *address_family_boolean_to_string(AddressFamilyBoolean b) { + if (b == ADDRESS_FAMILY_YES || + b == ADDRESS_FAMILY_NO) + return yes_no(b == ADDRESS_FAMILY_YES); + + if (b == ADDRESS_FAMILY_IPV4) + return "ipv4"; + if (b == ADDRESS_FAMILY_IPV6) + return "ipv6"; + + return NULL; +} + +AddressFamilyBoolean address_family_boolean_from_string(const char *s) { + int r; + + /* Make this a true superset of a boolean */ + + r = parse_boolean(s); + if (r > 0) + return ADDRESS_FAMILY_YES; + if (r == 0) + return ADDRESS_FAMILY_NO; + + if (streq(s, "ipv4")) + return ADDRESS_FAMILY_IPV4; + if (streq(s, "ipv6")) + return ADDRESS_FAMILY_IPV6; + + return _ADDRESS_FAMILY_BOOLEAN_INVALID; +} + +DEFINE_CONFIG_PARSE_ENUM(config_parse_address_family_boolean, address_family_boolean, AddressFamilyBoolean, "Failed to parse option");