sd-network: if a boolean is mising, we should just take it as false

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

diff --git a/src/network/sd-network.c b/src/network/sd-network.c
index 3b541a2764e85db2b9c5f349cf42865cfbb3743f..1b7518fd94dbe06c89b4a335da58d8b4467a0df0 100644 (file)
--- a/src/network/sd-network.c
+++ b/src/network/sd-network.c
@@ -25,14 +25,48 @@
 #include <errno.h>
 #include <sys/inotify.h>
 #include <sys/poll.h>
 #include <errno.h>
 #include <sys/inotify.h>
 #include <sys/poll.h>

+#include <net/if.h>

 
 #include "util.h"
 #include "macro.h"
 #include "strv.h"
 #include "fileio.h"
 #include "sd-network.h"
 
 #include "util.h"
 #include "macro.h"
 #include "strv.h"
 #include "fileio.h"
 #include "sd-network.h"

+#include "network-internal.h"

 #include "dhcp-lease-internal.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/netif/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) {
         _cleanup_free_ char *s = NULL, *p = NULL;
         int r;
 _public_ int sd_network_get_link_state(unsigned index, char **state) {
         _cleanup_free_ char *s = NULL, *p = NULL;
         int r;


@@ -40,11 +74,10 @@ _public_ int sd_network_get_link_state(unsigned index, char **state) {
         assert_return(index, -EINVAL);
         assert_return(state, -EINVAL);
 
         assert_return(index, -EINVAL);
         assert_return(state, -EINVAL);
 

-        if (asprintf(&p, "/run/systemd/network/links/%u", index) < 0)
+        if (asprintf(&p, "/run/systemd/netif/links/%u", index) < 0)

                 return -ENOMEM;
 
                 return -ENOMEM;
 

-        r = parse_env_file(p, NEWLINE, "STATE", &s, NULL);
-
+        r = parse_env_file(p, NEWLINE, "ADMIN_STATE", &s, NULL);

         if (r == -ENOENT)
                 return -ENODATA;
         else if (r < 0)
         if (r == -ENOENT)
                 return -ENODATA;
         else if (r < 0)


@@ -54,6 +87,53 @@ _public_ int sd_network_get_link_state(unsigned index, char **state) {
 
         if (streq(s, "unmanaged"))
                 return -EUNATCH;
 
         if (streq(s, "unmanaged"))
                 return -EUNATCH;

+        else if (streq(s, "initializing"))
+                return -EBUSY;
+
+        *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/netif/state", 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;
+}
+
+_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/netif/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;
 
         *state = s;
         s = NULL;


@@ -62,23 +142,21 @@ _public_ int sd_network_get_link_state(unsigned index, char **state) {
 }
 
 _public_ int sd_network_get_dhcp_lease(unsigned index, sd_dhcp_lease **ret) {
 }
 
 _public_ int sd_network_get_dhcp_lease(unsigned index, sd_dhcp_lease **ret) {

-        sd_dhcp_lease *lease;
-        char *p, *s = NULL;
+        _cleanup_free_ char *p = NULL, *s = NULL;
+        sd_dhcp_lease *lease = NULL;

         int r;
 
         assert_return(index, -EINVAL);
         assert_return(ret, -EINVAL);
 
         int r;
 
         assert_return(index, -EINVAL);
         assert_return(ret, -EINVAL);
 

-        if (asprintf(&p, "/run/systemd/network/links/%u", index) < 0)
+        if (asprintf(&p, "/run/systemd/netif/links/%u", index) < 0)

                 return -ENOMEM;
 
         r = parse_env_file(p, NEWLINE, "DHCP_LEASE", &s, NULL);
                 return -ENOMEM;
 
         r = parse_env_file(p, NEWLINE, "DHCP_LEASE", &s, NULL);

-        free(p);

 
 

-        if (r < 0) {
-                free(s);
+        if (r < 0)

                 return r;
                 return r;

-        } else if (!s)
+        else if (!s)

                 return -EIO;
 
         r = dhcp_lease_load(s, &lease);
                 return -EIO;
 
         r = dhcp_lease_load(s, &lease);


@@ -90,13 +168,93 @@ _public_ int sd_network_get_dhcp_lease(unsigned index, sd_dhcp_lease **ret) {
         return 0;
 }
 
         return 0;
 }
 

+static int network_get_in_addr(const char *key, unsigned index, struct in_addr **addr) {
+        _cleanup_free_ char *p = NULL, *s = NULL;
+        int r;
+
+        assert_return(index, -EINVAL);
+        assert_return(addr, -EINVAL);
+
+        if (asprintf(&p, "/run/systemd/netif/links/%u", index) < 0)
+                return -ENOMEM;
+
+        r = parse_env_file(p, NEWLINE, key, &s, NULL);
+        if (r < 0)
+                return r;
+        else if (!s)
+                return -EIO;
+
+        return deserialize_in_addrs(addr, s);
+}
+
+_public_ int sd_network_get_dns(unsigned index, struct in_addr **addr) {
+        return network_get_in_addr("DNS", index, addr);
+}
+
+_public_ int sd_network_get_ntp(unsigned index, struct in_addr **addr) {
+        return network_get_in_addr("NTP", index, addr);
+}
+
+static int network_get_in6_addr(const char *key, unsigned index, struct in6_addr **addr) {
+        _cleanup_free_ char *p = NULL, *s = NULL;
+        int r;
+
+        assert_return(index, -EINVAL);
+        assert_return(addr, -EINVAL);
+
+        if (asprintf(&p, "/run/systemd/netif/links/%u", index) < 0)
+                return -ENOMEM;
+
+        r = parse_env_file(p, NEWLINE, key, &s, NULL);
+        if (r < 0)
+                return r;
+        else if (!s)
+                return -EIO;
+
+        return deserialize_in6_addrs(addr, s);
+}
+
+_public_ int sd_network_get_dns6(unsigned index, struct in6_addr **addr) {
+        return network_get_in6_addr("DNS", index, addr);
+}
+
+_public_ int sd_network_get_ntp6(unsigned index, struct in6_addr **addr) {
+        return network_get_in6_addr("NTP", index, addr);
+}
+
+static int network_get_boolean(const char *key, unsigned index) {
+        _cleanup_free_ char *p = NULL, *s = NULL;
+        int r;
+
+        assert_return(index, -EINVAL);
+
+        if (asprintf(&p, "/run/systemd/netif/links/%u", index) < 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(unsigned index) {
+        return network_get_boolean("DHCP_USE_DNS", index);
+}
+
+_public_ int sd_network_dhcp_use_ntp(unsigned index) {
+        return network_get_boolean("DHCP_USE_NTP", index);
+}
+

 _public_ int sd_network_get_ifindices(unsigned **indices) {
         _cleanup_closedir_ DIR *d;
         int r = 0;
         unsigned n = 0;
         _cleanup_free_ uid_t *l = NULL;
 
 _public_ int sd_network_get_ifindices(unsigned **indices) {
         _cleanup_closedir_ DIR *d;
         int r = 0;
         unsigned n = 0;
         _cleanup_free_ uid_t *l = NULL;
 

-        d = opendir("/run/systemd/network/links/");
+        d = opendir("/run/systemd/netif/links/");

         if (!d)
                 return -errno;
 
         if (!d)
                 return -errno;
 


@@ -156,7 +314,7 @@ static inline sd_network_monitor* FD_TO_MONITOR(int fd) {
         return (sd_network_monitor*) (unsigned long) (fd + 1);
 }
 
         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;
 
         int fd, k;
         bool good = false;
 


@@ -166,8 +324,18 @@ _public_ int sd_network_monitor_new(const char *category, sd_network_monitor **m
         if (fd < 0)
                 return -errno;
 
         if (fd < 0)
                 return -errno;
 

-        if (!category || streq(category, "netif")) {
-                k = inotify_add_watch(fd, "/run/systemd/network/links/", IN_MOVED_TO|IN_DELETE);
+        if (!category || streq(category, "links")) {
+                k = inotify_add_watch(fd, "/run/systemd/netif/links/", IN_MOVED_TO|IN_DELETE);
+                if (k < 0) {
+                        safe_close(fd);
+                        return -errno;
+                }
+
+                good = true;
+        }
+
+        if (!category || streq(category, "leases")) {
+                k = inotify_add_watch(fd, "/run/systemd/netif/leases/", IN_MOVED_TO|IN_DELETE);

                 if (k < 0) {
                         safe_close(fd);
                         return -errno;
                 if (k < 0) {
                         safe_close(fd);
                         return -errno;