X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=src%2Fnetwork%2Fsd-network.c;h=91d6275056bf3eff87c8abd0124ccb4fac0f0cae;hp=c86781220957347fa4b0440737a4cd8fcbf0d02c;hb=653912918f594ebbca46806b302ef6b477402575;hpb=deb2e5230b4dcbc0e2e02cc47a0b2d0d7179a044

diff --git a/src/network/sd-network.c b/src/network/sd-network.c
index c86781220..91d627505 100644
--- a/src/network/sd-network.c
+++ b/src/network/sd-network.c
@@ -32,19 +32,20 @@
 #include "strv.h"
 #include "fileio.h"
 #include "sd-network.h"
+#include "network-internal.h"
 #include "dhcp-lease-internal.h"
 
-static int link_get_flags(unsigned index, unsigned *flags) {
+_public_ int sd_network_get_link_state(int ifindex, char **state) {
         _cleanup_free_ char *s = NULL, *p = NULL;
         int r;
 
-        assert(index);
-        assert(flags);
+        assert_return(ifindex > 0, -EINVAL);
+        assert_return(state, -EINVAL);
 
-        if (asprintf(&p, "/run/systemd/network/links/%u", index) < 0)
+        if (asprintf(&p, "/run/systemd/netif/links/%d", ifindex) < 0)
                 return -ENOMEM;
 
-        r = parse_env_file(p, NEWLINE, "FLAGS", &s, NULL);
+        r = parse_env_file(p, NEWLINE, "ADMIN_STATE", &s, NULL);
         if (r == -ENOENT)
                 return -ENODATA;
         else if (r < 0)
@@ -52,31 +53,23 @@ static int link_get_flags(unsigned index, unsigned *flags) {
         else if (!s)
                 return -EIO;
 
-        return safe_atou(s, flags);
-}
-
-_public_ int sd_network_link_is_loopback(unsigned index) {
-        unsigned flags;
-        int r;
+        if (streq(s, "initializing"))
+                return -EBUSY;
 
-        r = link_get_flags(index, &flags);
-        if (r < 0)
-                return 0;
+        *state = s;
+        s = NULL;
 
-        return flags & IFF_LOOPBACK;
+        return 0;
 }
 
-_public_ int sd_network_get_link_state(unsigned index, char **state) {
-        _cleanup_free_ char *s = NULL, *p = NULL;
+_public_ int sd_network_get_operational_state(char **state) {
+        _cleanup_free_ char *s = NULL;
         int r;
 
-        assert_return(index, -EINVAL);
         assert_return(state, -EINVAL);
 
-        if (asprintf(&p, "/run/systemd/network/links/%u", index) < 0)
-                return -ENOMEM;
-
-        r = parse_env_file(p, NEWLINE, "ADMIN_STATE", &s, NULL);
+        r = parse_env_file("/run/systemd/netif/state", NEWLINE, "OPER_STATE",
+                           &s, NULL);
         if (r == -ENOENT)
                 return -ENODATA;
         else if (r < 0)
@@ -84,25 +77,20 @@ _public_ int sd_network_get_link_state(unsigned index, char **state) {
         else if (!s)
                 return -EIO;
 
-        if (streq(s, "unmanaged"))
-                return -EUNATCH;
-        else if (streq(s, "initializing"))
-                return -EBUSY;
-
         *state = s;
         s = NULL;
 
         return 0;
 }
 
-_public_ int sd_network_get_link_operational_state(unsigned index, char **state) {
+_public_ int sd_network_get_link_operational_state(int ifindex, char **state) {
         _cleanup_free_ char *s = NULL, *p = NULL;
         int r;
 
-        assert_return(index, -EINVAL);
+        assert_return(ifindex > 0, -EINVAL);
         assert_return(state, -EINVAL);
 
-        if (asprintf(&p, "/run/systemd/network/links/%u", index) < 0)
+        if (asprintf(&p, "/run/systemd/netif/links/%d", ifindex) < 0)
                 return -ENOMEM;
 
         r = parse_env_file(p, NEWLINE, "OPER_STATE", &s, NULL);
@@ -119,24 +107,22 @@ _public_ int sd_network_get_link_operational_state(unsigned index, char **state)
         return 0;
 }
 
-_public_ int sd_network_get_dhcp_lease(unsigned index, sd_dhcp_lease **ret) {
-        sd_dhcp_lease *lease;
-        char *p, *s = NULL;
+_public_ int sd_network_get_dhcp_lease(int ifindex, sd_dhcp_lease **ret) {
+        _cleanup_free_ char *p = NULL, *s = NULL;
+        sd_dhcp_lease *lease = NULL;
         int r;
 
-        assert_return(index, -EINVAL);
+        assert_return(ifindex > 0, -EINVAL);
         assert_return(ret, -EINVAL);
 
-        if (asprintf(&p, "/run/systemd/network/links/%u", index) < 0)
+        if (asprintf(&p, "/run/systemd/netif/links/%d", ifindex) < 0)
                 return -ENOMEM;
 
         r = parse_env_file(p, NEWLINE, "DHCP_LEASE", &s, NULL);
-        free(p);
 
-        if (r < 0) {
-                free(s);
+        if (r < 0)
                 return r;
-        } else if (!s)
+        else if (!s)
                 return -EIO;
 
         r = dhcp_lease_load(s, &lease);
@@ -148,62 +134,76 @@ _public_ int sd_network_get_dhcp_lease(unsigned index, sd_dhcp_lease **ret) {
         return 0;
 }
 
-_public_ int sd_network_get_ifindices(unsigned **indices) {
-        _cleanup_closedir_ DIR *d;
-        int r = 0;
-        unsigned n = 0;
-        _cleanup_free_ uid_t *l = NULL;
+static int network_get_in_addr(const char *key, int ifindex, struct in_addr **addr) {
+        _cleanup_free_ char *p = NULL, *s = NULL;
+        int r;
 
-        d = opendir("/run/systemd/network/links/");
-        if (!d)
-                return -errno;
+        assert_return(ifindex > 0, -EINVAL);
+        assert_return(addr, -EINVAL);
 
-        for (;;) {
-                struct dirent *de;
-                int k;
-                unsigned index;
+        if (asprintf(&p, "/run/systemd/netif/links/%d", ifindex) < 0)
+                return -ENOMEM;
 
-                errno = 0;
-                de = readdir(d);
-                if (!de && errno != 0)
-                        return -errno;
+        r = parse_env_file(p, NEWLINE, key, &s, NULL);
+        if (r < 0)
+                return r;
+        else if (!s)
+                return -EIO;
 
-                if (!de)
-                        break;
+        return deserialize_in_addrs(addr, s);
+}
 
-                dirent_ensure_type(d, de);
+_public_ int sd_network_get_dns(int ifindex, struct in_addr **addr) {
+        return network_get_in_addr("DNS", ifindex, addr);
+}
 
-                if (!dirent_is_file(de))
-                        continue;
+static int network_get_in6_addr(const char *key, int ifindex, struct in6_addr **addr) {
+        _cleanup_free_ char *p = NULL, *s = NULL;
+        int r;
 
-                k = safe_atou(de->d_name, &index);
-                if (k < 0)
-                        continue;
+        assert_return(ifindex > 0, -EINVAL);
+        assert_return(addr, -EINVAL);
 
-                if (indices) {
-                        if ((unsigned) r >= n) {
-                                unsigned *t;
+        if (asprintf(&p, "/run/systemd/netif/links/%d", ifindex) < 0)
+                return -ENOMEM;
 
-                                n = MAX(16, 2*r);
-                                t = realloc(l, sizeof(unsigned) * n);
-                                if (!t)
-                                        return -ENOMEM;
+        r = parse_env_file(p, NEWLINE, key, &s, NULL);
+        if (r < 0)
+                return r;
+        else if (!s)
+                return -EIO;
 
-                                l = t;
-                        }
+        return deserialize_in6_addrs(addr, s);
+}
 
-                        assert((unsigned) r < n);
-                        l[r++] = index;
-                } else
-                        r++;
-        }
+_public_ int sd_network_get_dns6(int ifindex, struct in6_addr **addr) {
+        return network_get_in6_addr("DNS", ifindex, addr);
+}
 
-        if (indices) {
-                *indices = l;
-                l = NULL;
-        }
+static int network_get_boolean(const char *key, int ifindex) {
+        _cleanup_free_ char *p = NULL, *s = NULL;
+        int r;
+
+        assert_return(ifindex > 0, -EINVAL);
+
+        if (asprintf(&p, "/run/systemd/netif/links/%d", ifindex) < 0)
+                return -ENOMEM;
+
+        r = parse_env_file(p, NEWLINE, key, &s, NULL);
+        if (r < 0)
+                return r;
+        else if (!s)
+                return false;
+
+        return parse_boolean(s);
+}
+
+_public_ int sd_network_dhcp_use_dns(int ifindex) {
+        return network_get_boolean("DHCP_USE_DNS", ifindex);
+}
 
-        return r;
+_public_ int sd_network_dhcp_use_ntp(int ifindex) {
+        return network_get_boolean("DHCP_USE_NTP", ifindex);
 }
 
 static inline int MONITOR_TO_FD(sd_network_monitor *m) {
@@ -214,7 +214,7 @@ static inline sd_network_monitor* FD_TO_MONITOR(int fd) {
         return (sd_network_monitor*) (unsigned long) (fd + 1);
 }
 
-_public_ int sd_network_monitor_new(const char *category, sd_network_monitor **m) {
+_public_ int sd_network_monitor_new(sd_network_monitor **m, const char *category) {
         int fd, k;
         bool good = false;
 
@@ -225,7 +225,7 @@ _public_ int sd_network_monitor_new(const char *category, sd_network_monitor **m
                 return -errno;
 
         if (!category || streq(category, "links")) {
-                k = inotify_add_watch(fd, "/run/systemd/network/links/", IN_MOVED_TO|IN_DELETE);
+                k = inotify_add_watch(fd, "/run/systemd/netif/links/", IN_MOVED_TO|IN_DELETE);
                 if (k < 0) {
                         safe_close(fd);
                         return -errno;
@@ -235,7 +235,7 @@ _public_ int sd_network_monitor_new(const char *category, sd_network_monitor **m
         }
 
         if (!category || streq(category, "leases")) {
-                k = inotify_add_watch(fd, "/run/systemd/network/leases/", IN_MOVED_TO|IN_DELETE);
+                k = inotify_add_watch(fd, "/run/systemd/netif/leases/", IN_MOVED_TO|IN_DELETE);
                 if (k < 0) {
                         safe_close(fd);
                         return -errno;