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=f2fe5d5443a28eecd87ccf80c686aa7c315e2523;hp=c1d50128a5d978cb13dd269d6251ee331730215b;hb=af4ec4309e8f82aad87a8d574785c12f8763d5f8;hpb=1a941ac4b690cb3f4333e35f4a5036fe6fd50ff9 diff --git a/src/network/networkd-manager.c b/src/network/networkd-manager.c index c1d50128a..f2fe5d544 100644 --- a/src/network/networkd-manager.c +++ b/src/network/networkd-manager.c @@ -25,6 +25,8 @@ #include "conf-parser.h" #include "path-util.h" #include "networkd.h" +#include "networkd-netdev.h" +#include "networkd-link.h" #include "network-internal.h" #include "libudev-private.h" #include "udev-util.h" @@ -43,38 +45,6 @@ const char* const network_dirs[] = { #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; -} - static int setup_default_address_pool(Manager *m) { AddressPool *p; int r; @@ -120,6 +90,9 @@ int manager_new(Manager **ret) { 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 = sd_rtnl_open(&m->rtnl, 3, RTNLGRP_LINK, RTNLGRP_IPV4_IFADDR, RTNLGRP_IPV6_IFADDR); if (r < 0) @@ -129,10 +102,6 @@ int manager_new(Manager **ret) { if (r < 0 && r != -ENOENT) /* TODO: drop when we can rely on kdbus */ return r; - 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 */ @@ -146,10 +115,6 @@ int manager_new(Manager **ret) { return -ENOMEM; } - m->links = hashmap_new(uint64_hash_func, uint64_compare_func); - if (!m->links) - return -ENOMEM; - m->netdevs = hashmap_new(string_hash_func, string_compare_func); if (!m->netdevs) return -ENOMEM; @@ -259,7 +224,7 @@ static int manager_rtnl_process_link(sd_rtnl *rtnl, sd_rtnl_message *message, vo Link *link = NULL; NetDev *netdev = NULL; uint16_t type; - char *name; + const char *name; int r, ifindex; assert(rtnl); @@ -451,24 +416,147 @@ int manager_bus_listen(Manager *m) { return 0; } +static int set_put_in_addr(Set *s, const struct in_addr *address) { + char *p; + int r; + + assert(s); + + r = in_addr_to_string(AF_INET, (const union in_addr_union*) address, &p); + if (r < 0) + return r; + + r = set_consume(s, p); + if (r == -EEXIST) + return 0; + + return r; +} + +static int set_put_in_addrv(Set *s, const struct in_addr *addresses, int n) { + int r, i, c = 0; + + assert(s); + assert(n <= 0 || addresses); + + for (i = 0; i < n; i++) { + r = set_put_in_addr(s, addresses+i); + if (r < 0) + return r; + + c += r; + } + + 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, *domains = NULL; Link *link; Iterator i; _cleanup_free_ char *temp_path = NULL; _cleanup_fclose_ FILE *f = NULL; - LinkOperationalState operstate = LINK_OPERSTATE_UNKNOWN; + LinkOperationalState operstate = LINK_OPERSTATE_OFF; const char *operstate_str; int r; assert(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); + if (!dns) + return -ENOMEM; + + ntp = set_new(string_hash_func, string_compare_func); + if (!ntp) + return -ENOMEM; + + domains = set_new(string_hash_func, string_compare_func); + if (!domains) + return -ENOMEM; + HASHMAP_FOREACH(link, m->links, i) { if (link->flags & IFF_LOOPBACK) continue; if (link->operstate > operstate) operstate = link->operstate; + + if (!link->network) + continue; + + /* First add the static configured entries */ + r = set_put_strdupv(dns, link->network->dns); + if (r < 0) + return r; + + r = set_put_strdupv(ntp, link->network->ntp); + if (r < 0) + return r; + + r = set_put_strdupv(domains, link->network->domains); + if (r < 0) + return r; + + if (!link->dhcp_lease) + continue; + + /* Secondly, add the entries acquired via DHCP */ + if (link->network->dhcp_dns) { + const struct in_addr *addresses; + + r = sd_dhcp_lease_get_dns(link->dhcp_lease, &addresses); + if (r > 0) { + r = set_put_in_addrv(dns, addresses, r); + if (r < 0) + return r; + } else if (r < 0 && r != -ENOENT) + return r; + } + + if (link->network->dhcp_ntp) { + const struct in_addr *addresses; + + r = sd_dhcp_lease_get_ntp(link->dhcp_lease, &addresses); + if (r > 0) { + 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; + } } operstate_str = link_operstate_to_string(operstate); @@ -476,7 +564,7 @@ int manager_save(Manager *m) { r = fopen_temporary(m->state_file, &f, &temp_path); if (r < 0) - goto finish; + return r; fchmod(fileno(f), 0644); @@ -484,22 +572,29 @@ int manager_save(Manager *m) { "# This is private data. Do not parse.\n" "OPER_STATE=%s\n", operstate_str); - fflush(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) + goto fail; - if (ferror(f) || rename(temp_path, m->state_file) < 0) { + if (rename(temp_path, m->state_file) < 0) { r = -errno; - unlink(m->state_file); - unlink(temp_path); + goto fail; } -finish: - if (r < 0) - log_error("Failed to save network state to %s: %s", m->state_file, strerror(-r)); + return 0; +fail: + log_error("Failed to save network state to %s: %s", m->state_file, strerror(-r)); + unlink(m->state_file); + unlink(temp_path); return r; } -int manager_address_pool_acquire(Manager *m, unsigned family, unsigned prefixlen, union in_addr_union *found) { +int manager_address_pool_acquire(Manager *m, int family, unsigned prefixlen, union in_addr_union *found) { AddressPool *p; int r;