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=42b51137ef0c2872b1941a8b2033f91579ac6e6d;hp=e3d72edeceac2c4c9723c52002f102d96284fb19;hb=cb9fc36a1211967e8c58b0502a26c42552ac8060;hpb=d3df0e3982777fd5de8cffaa585eba0af3773c08 diff --git a/src/network/networkd-manager.c b/src/network/networkd-manager.c index e3d72edec..42b51137e 100644 --- a/src/network/networkd-manager.c +++ b/src/network/networkd-manager.c @@ -36,6 +36,9 @@ #include "sd-rtnl.h" +/* use 8 MB for receive socket kernel queue. */ +#define RCVBUF_SIZE (8*1024*1024) + const char* const network_dirs[] = { "/etc/systemd/network", "/run/systemd/network", @@ -98,6 +101,10 @@ int manager_new(Manager **ret) { if (r < 0) return r; + r = sd_rtnl_inc_rcvbuf(m->rtnl, RCVBUF_SIZE); + 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; @@ -115,7 +122,7 @@ int manager_new(Manager **ret) { return -ENOMEM; } - m->netdevs = hashmap_new(string_hash_func, string_compare_func); + m->netdevs = hashmap_new(&string_hash_ops); if (!m->netdevs) return -ENOMEM; @@ -146,8 +153,6 @@ 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 ((link = hashmap_first(m->links))) @@ -231,22 +236,33 @@ static int manager_rtnl_process_link(sd_rtnl *rtnl, sd_rtnl_message *message, vo assert(message); assert(m); + if (sd_rtnl_message_is_error(message)) { + r = sd_rtnl_message_get_errno(message); + if (r < 0) + log_warning_errno(r, "rtnl: could not receive link: %m"); + + return 0; + } + r = sd_rtnl_message_get_type(message, &type); if (r < 0) { - log_warning("rtnl: could not get message type"); + log_warning_errno(r, "rtnl: could not get message type: %m"); return 0; } r = sd_rtnl_message_link_get_ifindex(message, &ifindex); - if (r < 0 || ifindex <= 0) { - log_warning("rtnl: received link message without valid ifindex"); + if (r < 0) { + log_warning_errno(r, "rtnl: could not get ifindex: %m"); + return 0; + } else if (ifindex <= 0) { + log_warning("rtnl: received link message with invalid ifindex: %d", ifindex); return 0; } else link_get(m, ifindex, &link); r = sd_rtnl_message_read_string(message, IFLA_IFNAME, &name); - if (r < 0 || !name) { - log_warning("rtnl: received link message without valid ifname"); + if (r < 0) { + log_warning_errno(r, "rtnl: received link message without ifname: %m"); return 0; } else netdev_get(m, name, &netdev); @@ -257,8 +273,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("could not add new link: %s", - strerror(-r)); + log_warning_errno(r, "could not add new link: %m"); return 0; } } @@ -267,7 +282,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("could not set ifindex on netdev"); + log_warning_errno(r, "could not set ifindex on netdev: %m"); return 0; } } @@ -294,7 +309,7 @@ static int manager_rtnl_process_link(sd_rtnl *rtnl, sd_rtnl_message *message, vo 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; + int r; assert(m); assert(m->rtnl); @@ -312,16 +327,40 @@ int manager_rtnl_enumerate_links(Manager *m) { return r; for (link = reply; link; link = sd_rtnl_message_next(link)) { - uint16_t type; + int k; - k = sd_rtnl_message_get_type(link, &type); + k = manager_rtnl_process_link(m->rtnl, link, m); if (k < 0) - return k; + r = k; + } - if (type != RTM_NEWLINK) - continue; + return r; +} - k = manager_rtnl_process_link(m->rtnl, link, 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); + assert(m->rtnl); + + r = sd_rtnl_message_new_addr(m->rtnl, &req, RTM_GETADDR, 0, 0); + if (r < 0) + return r; + + r = sd_rtnl_message_request_dump(req, true); + if (r < 0) + return r; + + 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; + + k = link_rtnl_process_address(m->rtnl, addr, m); if (k < 0) r = k; } @@ -351,10 +390,8 @@ int manager_udev_listen(Manager *m) { 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)); - return r; - } + 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) { @@ -370,6 +407,10 @@ int manager_udev_listen(Manager *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; } @@ -450,8 +491,27 @@ static int set_put_in_addrv(Set *s, const struct in_addr *addresses, int n) { return c; } +static void print_string_set(FILE *f, const char *field, Set *s) { + bool space = false; + Iterator i; + char *p; + + if (set_isempty(s)) + return; + + fputs(field, f); + + SET_FOREACH(p, s, i) { + if (space) + fputc(' ', f); + fputs(p, f); + space = true; + } + fputc('\n', f); +} + int manager_save(Manager *m) { - _cleanup_set_free_free_ Set *dns = NULL, *ntp = NULL; + _cleanup_set_free_free_ Set *dns = NULL, *ntp = NULL, *domains = NULL; Link *link; Iterator i; _cleanup_free_ char *temp_path = NULL; @@ -464,14 +524,18 @@ int manager_save(Manager *m) { assert(m->state_file); /* We add all NTP and DNS server to a set, to filter out duplicates */ - dns = set_new(string_hash_func, string_compare_func); + dns = set_new(&string_hash_ops); if (!dns) return -ENOMEM; - ntp = set_new(string_hash_func, string_compare_func); + ntp = set_new(&string_hash_ops); if (!ntp) return -ENOMEM; + domains = set_new(&string_hash_ops); + if (!domains) + return -ENOMEM; + HASHMAP_FOREACH(link, m->links, i) { if (link->flags & IFF_LOOPBACK) continue; @@ -491,6 +555,10 @@ int manager_save(Manager *m) { if (r < 0) return r; + r = set_put_strdupv(domains, link->network->domains); + if (r < 0) + return r; + if (!link->dhcp_lease) continue; @@ -503,7 +571,7 @@ int manager_save(Manager *m) { r = set_put_in_addrv(dns, addresses, r); if (r < 0) return r; - } else if (r != -ENOENT) + } else if (r < 0 && r != -ENOENT) return r; } @@ -515,6 +583,18 @@ int manager_save(Manager *m) { r = set_put_in_addrv(ntp, addresses, r); if (r < 0) return r; + } else if (r < 0 && r != -ENOENT) + return r; + } + + if (link->network->dhcp_domains) { + const char *domainname; + + r = sd_dhcp_lease_get_domainname(link->dhcp_lease, &domainname); + if (r >= 0) { + r = set_put_strdup(domains, domainname); + if (r < 0) + return r; } else if (r != -ENOENT) return r; } @@ -533,33 +613,9 @@ int manager_save(Manager *m) { "# This is private data. Do not parse.\n" "OPER_STATE=%s\n", operstate_str); - if (!set_isempty(dns)) { - bool space = false; - char *p; - - fputs("DNS=", f); - SET_FOREACH(p, dns, i) { - if (space) - fputc(' ', f); - fputs(p, f); - space = true; - } - fputc('\n', f); - } - - if (!set_isempty(ntp)) { - bool space = false; - char *p; - - fputs("NTP=", f); - SET_FOREACH(p, ntp, i) { - if (space) - fputc(' ', f); - fputs(p, f); - space = true; - } - fputc('\n', f); - } + print_string_set(f, "DNS=", dns); + print_string_set(f, "NTP=", ntp); + print_string_set(f, "DOMAINS=", domains); r = fflush_and_check(f); if (r < 0) @@ -573,7 +629,7 @@ int manager_save(Manager *m) { return 0; fail: - log_error("Failed to save network state to %s: %s", m->state_file, strerror(-r)); + log_error_errno(r, "Failed to save network state to %s: %m", m->state_file); unlink(m->state_file); unlink(temp_path); return r; @@ -598,3 +654,35 @@ 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; +}