networkd: manager - refactor link tracking a bit

[elogind.git] / src / network / sd-network.c

diff --git a/src/network/sd-network.c b/src/network/sd-network.c
index 74698736641aa18bb966aca1040ba5df3789b768..492e97c73f286b4979bc6be5f5d854744d85cc31 100644 (file)
--- a/src/network/sd-network.c
+++ b/src/network/sd-network.c
@@ -25,6 +25,7 @@
 #include <errno.h>
 #include <sys/inotify.h>
 #include <sys/poll.h>
+#include <net/if.h>
 
 #include "util.h"
 #include "macro.h"
@@ -33,8 +34,40 @@
 #include "sd-network.h"
 #include "dhcp-lease-internal.h"
 
+static int link_get_flags(unsigned index, unsigned *flags) {
+        _cleanup_free_ char *s = NULL, *p = NULL;
+        int r;
+
+        assert(index);
+        assert(flags);
+
+        if (asprintf(&p, "/run/systemd/network/links/%u", index) < 0)
+                return -ENOMEM;
+
+        r = parse_env_file(p, NEWLINE, "FLAGS", &s, NULL);
+        if (r == -ENOENT)
+                return -ENODATA;
+        else if (r < 0)
+                return r;
+        else if (!s)
+                return -EIO;
+
+        return safe_atou(s, flags);
+}
+
+_public_ int sd_network_link_is_loopback(unsigned index) {
+        unsigned flags;
+        int r;
+
+        r = link_get_flags(index, &flags);
+        if (r < 0)
+                return 0;
+
+        return flags & IFF_LOOPBACK;
+}
+
 _public_ int sd_network_get_link_state(unsigned index, char **state) {
-        char *p, *s = NULL;
+        _cleanup_free_ char *s = NULL, *p = NULL;
         int r;
 
         assert_return(index, -EINVAL);
@@ -43,24 +76,67 @@ _public_ int sd_network_get_link_state(unsigned index, char **state) {
         if (asprintf(&p, "/run/systemd/network/links/%u", index) < 0)
                 return -ENOMEM;
 
-        r = parse_env_file(p, NEWLINE, "STATE", &s, NULL);
-        free(p);
+        r = parse_env_file(p, NEWLINE, "ADMIN_STATE", &s, NULL);
+        if (r == -ENOENT)
+                return -ENODATA;
+        else if (r < 0)
+                return r;
+        else if (!s)
+                return -EIO;
 
-        if (r == -ENOENT) {
-                free(s);
-                s = strdup("unknown");
-                if (!s)
-                        return -ENOMEM;
+        if (streq(s, "unmanaged"))
+                return -EUNATCH;
+        else if (streq(s, "initializing"))
+                return -EBUSY;
 
-                *state = s;
-                return 0;
-        } else if (r < 0) {
-                free(s);
+        *state = s;
+        s = NULL;
+
+        return 0;
+}
+
+_public_ int sd_network_get_operational_state(char **state) {
+        _cleanup_free_ char *s = NULL;
+        int r;
+
+        assert_return(state, -EINVAL);
+
+        r = parse_env_file("/run/systemd/network/state", NEWLINE, "OPER_STATE",
+                           &s, NULL);
+        if (r == -ENOENT)
+                return -ENODATA;
+        else if (r < 0)
                 return r;
-        } else if (!s)
+        else if (!s)
                 return -EIO;
 
         *state = s;
+        s = NULL;
+
+        return 0;
+}
+
+_public_ int sd_network_get_link_operational_state(unsigned index, char **state) {
+        _cleanup_free_ char *s = NULL, *p = 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, "OPER_STATE", &s, NULL);
+        if (r == -ENOENT)
+                return -ENODATA;
+        else if (r < 0)
+                return r;
+        else if (!s)
+                return -EIO;
+
+        *state = s;
+        s = NULL;
+
         return 0;
 }
 
@@ -169,10 +245,20 @@ _public_ int sd_network_monitor_new(const char *category, sd_network_monitor **m
         if (fd < 0)
                 return -errno;
 
-        if (!category || streq(category, "netif")) {
+        if (!category || streq(category, "links")) {
                 k = inotify_add_watch(fd, "/run/systemd/network/links/", IN_MOVED_TO|IN_DELETE);
                 if (k < 0) {
-                        close_nointr_nofail(fd);
+                        safe_close(fd);
+                        return -errno;
+                }
+
+                good = true;
+        }
+
+        if (!category || streq(category, "leases")) {
+                k = inotify_add_watch(fd, "/run/systemd/network/leases/", IN_MOVED_TO|IN_DELETE);
+                if (k < 0) {
+                        safe_close(fd);
                         return -errno;
                 }