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=ddbdabbff903ece3bbecde8fb76b87dbc09c243c;hp=8378e92a81e150ade9fc530ef876adff1bdd946d;hb=2292547af9638e2b3f7e0e96a56dd6c909e516dc;hpb=afc6adb5ec7e73bc13156c43f52fb015cd80cc68
diff --git a/src/network/networkd-manager.c b/src/network/networkd-manager.c
index 8378e92a8..ddbdabbff 100644
--- a/src/network/networkd-manager.c
+++ b/src/network/networkd-manager.c
@@ -19,9 +19,56 @@
along with systemd; If not, see .
***/
+#include
+
#include "path-util.h"
#include "networkd.h"
#include "libudev-private.h"
+#include "udev-util.h"
+#include "rtnl-util.h"
+#include "mkdir.h"
+#include "virt.h"
+
+const char* const network_dirs[] = {
+ "/etc/systemd/network",
+ "/run/systemd/network",
+ "/usr/lib/systemd/network",
+#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;
@@ -35,7 +82,17 @@ int manager_new(Manager **ret) {
if (r < 0)
return r;
- r = sd_rtnl_open(0, &m->rtnl);
+ sd_event_set_watchdog(m->event, true);
+
+ r = sd_rtnl_open(&m->rtnl, RTMGRP_LINK | RTMGRP_IPV4_IFADDR);
+ 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;
+
+ r = setup_signals(m);
if (r < 0)
return r;
@@ -43,28 +100,28 @@ int manager_new(Manager **ret) {
if (!m->udev)
return -ENOMEM;
- m->udev_monitor = udev_monitor_new_from_netlink(m->udev, "udev");
- if (!m->udev_monitor)
- return -ENOMEM;
+ /* 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)
+ return -ENOMEM;
+ } else {
+ m->udev_monitor = udev_monitor_new_from_netlink(m->udev, "udev");
+ if (!m->udev_monitor)
+ return -ENOMEM;
+ }
m->links = hashmap_new(uint64_hash_func, uint64_compare_func);
if (!m->links)
return -ENOMEM;
- LIST_HEAD_INIT(m->networks);
-
- m->network_dirs = strv_new("/etc/systemd/network/",
- "/run/systemd/network/",
- "/usr/lib/systemd/network",
-#ifdef HAVE_SPLIT_USER
- "/lib/systemd/network",
-#endif
- NULL);
- if (!m->network_dirs)
+ m->netdevs = hashmap_new(string_hash_func, string_compare_func);
+ if (!m->netdevs)
return -ENOMEM;
- if (!path_strv_canonicalize_uniq(m->network_dirs))
- return -ENOMEM;
+ LIST_HEAD_INIT(m->networks);
*ret = m;
m = NULL;
@@ -73,108 +130,147 @@ int manager_new(Manager **ret) {
}
void manager_free(Manager *m) {
+ Network *network;
+ NetDev *netdev;
+ Link *link;
+
+ if (!m)
+ return;
+
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_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)))
+ link_free(link);
hashmap_free(m->links);
- strv_free(m->network_dirs);
+
+ while ((network = m->networks))
+ network_free(network);
+
+ while ((netdev = hashmap_first(m->netdevs)))
+ netdev_free(netdev);
+ hashmap_free(m->netdevs);
+
sd_rtnl_unref(m->rtnl);
free(m);
}
+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 = network_load(m);
+ if (r < 0)
+ return r;
+
+ return 0;
+}
+
+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;
+ Link *link = NULL;
int r;
+ assert(m);
+ assert(device);
+
+ link_get(m, udev_device_get_ifindex(device), &link);
+
if (streq_ptr(udev_device_get_action(device), "remove")) {
- uint64_t ifindex;
+ 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);
+ r = link_add(m, device, &link);
if (r < 0) {
- log_error("Could not handle link %s: %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);
}
return 0;
}
int manager_udev_enumerate_links(Manager *m) {
+ _cleanup_udev_enumerate_unref_ struct udev_enumerate *e = NULL;
struct udev_list_entry *item = NULL, *first = NULL;
- struct udev_enumerate *e;
int r;
assert(m);
e = udev_enumerate_new(m->udev);
- if (!e) {
- r = -ENOMEM;
- goto finish;
- }
+ if (!e)
+ return -ENOMEM;
r = udev_enumerate_add_match_subsystem(e, "net");
if (r < 0)
- goto finish;
+ return r;
- r = udev_enumerate_add_match_tag(e, "systemd-networkd");
- if (r < 0)
- goto finish;
+ /* 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 = udev_enumerate_scan_devices(e);
if (r < 0)
- goto finish;
+ return r;
first = udev_enumerate_get_list_entry(e);
udev_list_entry_foreach(item, first) {
- struct udev_device *d;
+ _cleanup_udev_device_unref_ struct udev_device *d = NULL;
int k;
d = udev_device_new_from_syspath(m->udev, udev_list_entry_get_name(item));
- if (!d) {
- r = -ENOMEM;
- goto finish;
- }
+ if (!d)
+ return -ENOMEM;
k = manager_process_link(m, d);
- udev_device_unref(d);
-
if (k < 0)
r = k;
}
-finish:
- if (e)
- udev_enumerate_unref(e);
-
return r;
}
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;
- struct udev_device *device;
- int r;
+ _cleanup_udev_device_unref_ struct udev_device *device = NULL;
device = udev_monitor_receive_device(monitor);
if (!device)
return -ENOMEM;
- r = manager_process_link(m, device);
- if (r < 0)
- return r;
-
- udev_device_unref(device);
-
+ manager_process_link(m, device);
return 0;
}
@@ -187,12 +283,6 @@ int manager_udev_listen(Manager *m) {
return r;
}
- r = udev_monitor_filter_add_match_tag(m->udev_monitor, "systemd-networkd");
- if (r < 0) {
- log_error("Could not add udev monitor filter: %s", strerror(-r));
- return r;
- }
-
r = udev_monitor_enable_receiving(m->udev_monitor);
if (r < 0) {
log_error("Could not enable udev monitor");
@@ -200,11 +290,174 @@ 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;
+ char *name;
+ int r, ifindex;
+
+ assert(rtnl);
+ assert(message);
+ assert(m);
+
+ r = sd_rtnl_message_link_get_ifindex(message, &ifindex);
+ if (r < 0 || ifindex <= 0) {
+ log_warning("received RTM_NEWLINK message without valid ifindex");
+ return 0;
+ }
+
+ r = sd_rtnl_message_read_string(message, IFLA_IFNAME, &name);
+ if (r < 0)
+ log_warning("received RTM_NEWLINK message without valid ifname");
+ else {
+ NetDev *netdev;
+
+ r = netdev_get(m, name, &netdev);
+ if (r >= 0)
+ netdev_set_ifindex(netdev, message);
+ }
+
+ r = link_get(m, ifindex, &link);
+ if (r < 0) {
+ 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;
+
+ r = sd_rtnl_attach_event(m->rtnl, m->event, 0);
+ if (r < 0)
+ return r;
+
+ r = sd_rtnl_add_match(m->rtnl, RTM_NEWLINK, &manager_rtnl_process_link, m);
if (r < 0)
return r;
return 0;
}
+
+int manager_bus_listen(Manager *m) {
+ int r;
+
+ assert(m->event);
+
+ if (!m->bus) /* TODO: drop when we can rely on kdbus */
+ return 0;
+
+ r = sd_bus_attach_event(m->bus, m->event, 0);
+ if (r < 0)
+ return r;
+
+ return 0;
+}
+
+static void append_dns(FILE *f, struct in_addr *dns, unsigned char family, unsigned *count) {
+ char buf[INET6_ADDRSTRLEN];
+ const char *address;
+
+ address = inet_ntop(family, dns, buf, INET6_ADDRSTRLEN);
+ if (!address) {
+ log_warning("Invalid DNS address. Ignoring.");
+ return;
+ }
+
+ if (*count == MAXNS)
+ fputs("# Too many DNS servers configured, the following entries "
+ "will be ignored\n", f);
+
+ fprintf(f, "nameserver %s\n", address);
+
+ (*count) ++;
+}
+
+int manager_update_resolv_conf(Manager *m) {
+ _cleanup_free_ char *temp_path = NULL;
+ _cleanup_fclose_ FILE *f = NULL;
+ Link *link;
+ Iterator i;
+ unsigned count = 0;
+ const char *domainname = NULL;
+ int r;
+
+ assert(m);
+
+ r = fopen_temporary("/run/systemd/network/resolv.conf", &f, &temp_path);
+ if (r < 0)
+ return r;
+
+ fchmod(fileno(f), 0644);
+
+ fputs("# This file is managed by systemd-networkd(8). Do not edit.\n#\n"
+ "# Third party programs must not access this file directly, but\n"
+ "# only through the symlink at /etc/resolv.conf. To manage\n"
+ "# resolv.conf(5) in a different way, replace the symlink by a\n"
+ "# static file or a different symlink.\n\n", f);
+
+ HASHMAP_FOREACH(link, m->links, i) {
+ if (link->dhcp_lease) {
+ struct in_addr *nameservers;
+ size_t nameservers_size;
+
+ if (link->network->dhcp_dns) {
+ r = sd_dhcp_lease_get_dns(link->dhcp_lease, &nameservers, &nameservers_size);
+ if (r >= 0) {
+ unsigned j;
+
+ for (j = 0; j < nameservers_size; j++)
+ append_dns(f, &nameservers[j], AF_INET, &count);
+ }
+ }
+
+ if (link->network->dhcp_domainname && !domainname) {
+ r = sd_dhcp_lease_get_domainname(link->dhcp_lease, &domainname);
+ if (r >= 0)
+ fprintf(f, "domain %s\n", domainname);
+ }
+ }
+ }
+
+ 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);
+
+ if (ferror(f) || rename(temp_path, "/run/systemd/network/resolv.conf") < 0) {
+ r = -errno;
+ unlink("/run/systemd/network/resolv.conf");
+ unlink(temp_path);
+ return r;
+ }
+
+ return 0;
+}