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=ad36553f2b48e8979cce2d5c67cd46950a1281d2;hp=40a088b73f082bde9bee1a5fa2dbb6ef504a568f;hb=2dcf7ec6ec0c28297311108acba119cd6e055e64;hpb=f22364691bafc834a41cbe106f73f3da1a78d57f diff --git a/src/network/networkd-manager.c b/src/network/networkd-manager.c index 40a088b73..ad36553f2 100644 --- a/src/network/networkd-manager.c +++ b/src/network/networkd-manager.c @@ -21,9 +21,12 @@ #include #include +#include +#include "conf-parser.h" #include "path-util.h" #include "networkd.h" +#include "network-internal.h" #include "libudev-private.h" #include "udev-util.h" #include "rtnl-util.h" @@ -73,6 +76,95 @@ static int setup_signals(Manager *m) { return 0; } +static int set_fallback_dns(Manager *m, const char *string) { + char *word, *state; + size_t length; + int r; + + assert(m); + assert(string); + + FOREACH_WORD_QUOTED(word, length, string, state) { + _cleanup_address_free_ Address *address = NULL; + Address *tail; + _cleanup_free_ char *addrstr = NULL; + + r = address_new_dynamic(&address); + if (r < 0) + return r; + + addrstr = strndup(word, length); + if (!addrstr) + return -ENOMEM; + + r = net_parse_inaddr(addrstr, &address->family, &address->in_addr); + if (r < 0) { + log_debug("Ignoring invalid DNS address '%s'", addrstr); + continue; + } + + LIST_FIND_TAIL(addresses, m->fallback_dns, tail); + LIST_INSERT_AFTER(addresses, m->fallback_dns, tail, address); + address = NULL; + } + + return 0; +} + +int config_parse_dnsv( + const char *unit, + const char *filename, + unsigned line, + const char *section, + unsigned section_line, + const char *lvalue, + int ltype, + const char *rvalue, + void *data, + void *userdata) { + + Manager *m = userdata; + Address *address; + + assert(filename); + assert(lvalue); + assert(rvalue); + assert(m); + + while ((address = m->fallback_dns)) { + LIST_REMOVE(addresses, m->fallback_dns, address); + address_free(address); + } + + set_fallback_dns(m, rvalue); + + return 0; +} + +static int manager_parse_config_file(Manager *m) { + static const char fn[] = "/etc/systemd/networkd.conf"; + _cleanup_fclose_ FILE *f = NULL; + int r; + + assert(m); + + f = fopen(fn, "re"); + if (!f) { + if (errno == ENOENT) + return 0; + + log_warning("Failed to open configuration file %s: %m", fn); + return -errno; + } + + r = config_parse(NULL, fn, f, "Network\0", config_item_perf_lookup, + (void*) networkd_gperf_lookup, false, false, m); + if (r < 0) + log_warning("Failed to parse configuration file: %s", strerror(-r)); + + return r; +} + int manager_new(Manager **ret) { _cleanup_manager_free_ Manager *m = NULL; int r; @@ -85,13 +177,22 @@ int manager_new(Manager **ret) { if (!m->state_file) return -ENOMEM; + r = set_fallback_dns(m, DNS_SERVERS); + if (r < 0) + return r; + + r = manager_parse_config_file(m); + if (r < 0) + return r; + r = sd_event_default(&m->event); if (r < 0) return r; sd_event_set_watchdog(m->event, true); - r = sd_rtnl_open(&m->rtnl, RTMGRP_LINK | RTMGRP_IPV4_IFADDR); + r = sd_rtnl_open(&m->rtnl, 3, RTNLGRP_LINK, RTNLGRP_IPV4_IFADDR, + RTNLGRP_IPV6_IFADDR); if (r < 0) return r; @@ -116,6 +217,10 @@ int manager_new(Manager **ret) { return -ENOMEM; } + m->kmod_ctx = kmod_new(NULL, NULL); + if (!m->kmod_ctx) + return -ENOMEM; + m->links = hashmap_new(uint64_hash_func, uint64_compare_func); if (!m->links) return -ENOMEM; @@ -136,12 +241,14 @@ void manager_free(Manager *m) { Network *network; NetDev *netdev; Link *link; + Address *address; if (!m) return; free(m->state_file); + kmod_unref(m->kmod_ctx); udev_monitor_unref(m->udev_monitor); udev_unref(m->udev); sd_bus_unref(m->bus); @@ -150,6 +257,11 @@ void manager_free(Manager *m) { sd_event_source_unref(m->sigint_event_source); sd_event_unref(m->event); + while ((address = m->fallback_dns)) { + LIST_REMOVE(addresses, m->fallback_dns, address); + address_free(address); + } + while ((link = hashmap_first(m->links))) link_unref(link); hashmap_free(m->links); @@ -219,6 +331,7 @@ static int manager_udev_process_link(Manager *m, struct udev_device *device) { static int manager_rtnl_process_link(sd_rtnl *rtnl, sd_rtnl_message *message, void *userdata) { Manager *m = userdata; Link *link = NULL; + NetDev *netdev = NULL; uint16_t type; char *name; int r, ifindex; @@ -237,42 +350,50 @@ static int manager_rtnl_process_link(sd_rtnl *rtnl, sd_rtnl_message *message, vo if (r < 0 || ifindex <= 0) { log_warning("rtnl: received link message without valid ifindex"); return 0; - } - - link_get(m, ifindex, &link); - if (type == RTM_DELLINK) - link_drop(link); - else 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; - } - } + } else + link_get(m, ifindex, &link); r = sd_rtnl_message_read_string(message, IFLA_IFNAME, &name); - if (r < 0) + if (r < 0 || !name) { log_warning("rtnl: received link message without valid ifname"); - else { - NetDev *netdev = NULL; - + return 0; + } else netdev_get(m, name, &netdev); - if (type == RTM_DELLINK) - netdev_drop(netdev); - else if (netdev) { + + switch (type) { + case RTM_NEWLINK: + 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; + } + } + + if (netdev) { + /* 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"); return 0; } } - } - if (type == RTM_NEWLINK) { r = link_update(link, message); if (r < 0) return 0; + + break; + + case RTM_DELLINK: + link_drop(link); + netdev_drop(netdev); + + break; + + default: + assert_not_reached("Received invalid RTNL message type."); } return 1; @@ -375,6 +496,14 @@ int manager_rtnl_listen(Manager *m) { if (r < 0) 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; } @@ -461,15 +590,22 @@ int manager_update_resolv_conf(Manager *m) { HASHMAP_FOREACH(link, m->links, i) { if (link->network && link->network->dns) { Address *address; - Iterator j; - SET_FOREACH(address, link->network->dns, j) { + LIST_FOREACH(addresses, address, link->network->dns) { append_dns(f, &address->in_addr.in, address->family, &count); } } } + if (!count) { + Address *address; + + LIST_FOREACH(addresses, address, m->fallback_dns) + append_dns(f, &address->in_addr.in, + address->family, &count); + } + fflush(f); if (ferror(f) || rename(temp_path, "/run/systemd/network/resolv.conf") < 0) { @@ -488,7 +624,7 @@ int manager_save(Manager *m) { _cleanup_free_ char *temp_path = NULL; _cleanup_fclose_ FILE *f = NULL; const char *oper_state = "unknown"; - bool dormant, carrier; + bool dormant = false, carrier = false; int r; assert(m);