X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;ds=sidebyside;f=src%2Fnetwork%2Fnetworkd-manager.c;h=c630ed7ed91aa6bae261a7ae5f3694a01aa5b4b6;hb=bcbca8291fe3beaed36dd672d8b544840cfc49de;hp=c9ce1d6a138ecb999e6369923bc0c136ca6e30de;hpb=2ad8416dd057e7e3185169609ca3006e7649f576;p=elogind.git
diff --git a/src/network/networkd-manager.c b/src/network/networkd-manager.c
index c9ce1d6a1..c630ed7ed 100644
--- a/src/network/networkd-manager.c
+++ b/src/network/networkd-manager.c
@@ -19,10 +19,13 @@
along with systemd; If not, see .
***/
+#include
+
#include "path-util.h"
#include "networkd.h"
#include "libudev-private.h"
#include "udev-util.h"
+#include "mkdir.h"
const char* const network_dirs[] = {
"/etc/systemd/network",
@@ -51,6 +54,10 @@ int manager_new(Manager **ret) {
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;
+
m->udev = udev_new();
if (!m->udev)
return -ENOMEM;
@@ -82,6 +89,7 @@ void manager_free(Manager *m) {
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);
@@ -276,3 +284,95 @@ int manager_rtnl_listen(Manager *m) {
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;
+ int r;
+
+ assert(m);
+
+ r = mkdir_safe_label("/run/systemd/network", 0755, 0, 0);
+ if (r < 0)
+ return r;
+
+ 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) {
+ struct in_addr *nameservers;
+ size_t nameservers_size;
+
+ r = sd_dhcp_client_get_dns(link->dhcp, &nameservers, &nameservers_size);
+ if (r >= 0) {
+ unsigned j;
+
+ for (j = 0; j < nameservers_size; j++)
+ append_dns(f, &nameservers[j], AF_INET, &count);
+ }
+ }
+ }
+
+ HASHMAP_FOREACH(link, m->links, i)
+ if (link->network && link->network->dns)
+ append_dns(f, &link->network->dns->in_addr.in,
+ link->network->dns->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;
+}