sd-dhcp-client/networkd: add transient hostname support

[elogind.git] / src / network / networkd-manager.c

diff --git a/src/network/networkd-manager.c b/src/network/networkd-manager.c
index 7b0c5d76537b527f76af726c255850dd46ba6ed7..ca781e2bb477839095d9fd9bcc6f5d85e4587de9 100644 (file)
--- a/src/network/networkd-manager.c
+++ b/src/network/networkd-manager.c
@@ -19,10 +19,22 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
  ***/
 
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
  ***/
 

+#include <resolv.h>
+

 #include "path-util.h"
 #include "networkd.h"
 #include "libudev-private.h"
 #include "udev-util.h"
 #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",
+        "/run/systemd/network",
+        "/usr/lib/systemd/network",
+#ifdef HAVE_SPLIT_USER
+        "/lib/systemd/network",
+#endif
+        NULL};

 
 int manager_new(Manager **ret) {
         _cleanup_manager_free_ Manager *m = NULL;
 
 int manager_new(Manager **ret) {
         _cleanup_manager_free_ Manager *m = NULL;


@@ -42,6 +54,10 @@ int manager_new(Manager **ret) {
         if (r < 0)
                 return r;
 
         if (r < 0)
                 return r;
 

+        r = sd_bus_default_system(&m->bus);
+        if (r < 0)
+                return r;
+

         m->udev = udev_new();
         if (!m->udev)
                 return -ENOMEM;
         m->udev = udev_new();
         if (!m->udev)
                 return -ENOMEM;


@@ -60,19 +76,6 @@ int manager_new(Manager **ret) {
 
         LIST_HEAD_INIT(m->networks);
 
 
         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)
-                return -ENOMEM;
-
-        if (!path_strv_canonicalize_uniq(m->network_dirs))
-                return -ENOMEM;
-

         *ret = m;
         m = NULL;
 
         *ret = m;
         m = NULL;
 


@@ -86,6 +89,7 @@ void manager_free(Manager *m) {
 
         udev_monitor_unref(m->udev_monitor);
         udev_unref(m->udev);
 
         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);
 
         sd_event_source_unref(m->udev_event_source);
         sd_event_unref(m->event);
 


@@ -100,7 +104,6 @@ void manager_free(Manager *m) {
                 bridge_free(bridge);
         hashmap_free(m->bridges);
 
                 bridge_free(bridge);
         hashmap_free(m->bridges);
 

-        strv_free(m->network_dirs);

         sd_rtnl_unref(m->rtnl);
 
         free(m);
         sd_rtnl_unref(m->rtnl);
 
         free(m);


@@ -110,7 +113,7 @@ int manager_load_config(Manager *m) {
         int r;
 
         /* update timestamp */
         int r;
 
         /* update timestamp */

-        paths_check_timestamp(m->network_dirs, &m->network_dirs_ts_usec, true);
+        paths_check_timestamp(network_dirs, &m->network_dirs_ts_usec, true);

 
         r = bridge_load(m);
         if (r < 0)
 
         r = bridge_load(m);
         if (r < 0)


@@ -124,7 +127,7 @@ int manager_load_config(Manager *m) {
 }
 
 bool manager_should_reload(Manager *m) {
 }
 
 bool manager_should_reload(Manager *m) {

-        return paths_check_timestamp(m->network_dirs, &m->network_dirs_ts_usec, false);
+        return paths_check_timestamp(network_dirs, &m->network_dirs_ts_usec, false);

 }
 
 static int manager_process_link(Manager *m, struct udev_device *device) {
 }
 
 static int manager_process_link(Manager *m, struct udev_device *device) {


@@ -241,6 +244,7 @@ int manager_udev_listen(Manager *m) {
 static int manager_rtnl_process_link(sd_rtnl *rtnl, sd_rtnl_message *message, void *userdata) {
         Manager *m = userdata;
         Link *link;
 static int manager_rtnl_process_link(sd_rtnl *rtnl, sd_rtnl_message *message, void *userdata) {
         Manager *m = userdata;
         Link *link;

+        uint64_t ifindex_64;

         int r, ifindex;
 
         r = sd_rtnl_message_link_get_ifindex(message, &ifindex);
         int r, ifindex;
 
         r = sd_rtnl_message_link_get_ifindex(message, &ifindex);


@@ -249,9 +253,10 @@ static int manager_rtnl_process_link(sd_rtnl *rtnl, sd_rtnl_message *message, vo
                 return 0;
         }
 
                 return 0;
         }
 

-        link = hashmap_get(m->links, &ifindex);
+        ifindex_64 = ifindex;
+        link = hashmap_get(m->links, &ifindex_64);

         if (!link) {
         if (!link) {

-                log_debug("received RTM_NEWLINK message for ifindex we are not tracking (%d)", ifindex);
+                log_debug("received RTM_NEWLINK message for untracked ifindex %d", ifindex);

                 return 0;
         }
 
                 return 0;
         }
 


@@ -261,7 +266,7 @@ static int manager_rtnl_process_link(sd_rtnl *rtnl, sd_rtnl_message *message, vo
                 if (r < 0)
                         return 0;
         } else
                 if (r < 0)
                         return 0;
         } else

-                log_debug("received RTM_NEWLINK message for link we are not managing (%d)", ifindex);
+                log_debug("%s: received RTM_NEWLINK message for unmanaged link", link->ifname);

 
         return 1;
 }
 
         return 1;
 }


@@ -279,3 +284,85 @@ int manager_rtnl_listen(Manager *m) {
 
         return 0;
 }
 
         return 0;
 }

+
+int manager_bus_listen(Manager *m) {
+        int r;
+
+        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", f);
+
+        HASHMAP_FOREACH(link, m->links, i) {
+                if (link->dhcp) {
+                        struct in_addr **nameservers;
+
+                        r = sd_dhcp_client_get_dns(link->dhcp, &nameservers);
+                        if (r >= 0) {
+                                unsigned j;
+
+                                for (j = 0; nameservers[j]; 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;
+}