chiark / gitweb /
~ianmdlvl / elogind.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
sd-network: add _get_network_file api
[elogind.git] / src / libsystemd / sd-network / sd-network.c
diff --git a/src/libsystemd/sd-network/sd-network.c b/src/libsystemd/sd-network/sd-network.c
index 6375788c95f2b46bb0b461277b05b196ff8c1437..d63e6f9dfa8bb990aada6332f9348d251c2f9a59 100644 (file)
--- a/src/libsystemd/sd-network/sd-network.c
+++ b/src/libsystemd/sd-network/sd-network.c
@@ -34,7 +34,69 @@
 #include "sd-network.h"
 #include "network-internal.h"
 
 #include "sd-network.h"
 #include "network-internal.h"
 
-_public_ int sd_network_get_link_state(int ifindex, char **state) {
+_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;
+        if (r < 0)
+                return r;
+        if (isempty(s))
+                return -ENODATA;
+
+        *state = s;
+        s = NULL;
+
+        return 0;
+}
+
+static int network_get_strv(const char *key, char ***ret) {
+        _cleanup_strv_free_ char **a = NULL;
+        _cleanup_free_ char *s = NULL;
+        int r;
+
+        assert_return(ret, -EINVAL);
+
+        r = parse_env_file("/run/systemd/netif/state", NEWLINE, key, &s, NULL);
+        if (r == -ENOENT)
+                return -ENODATA;
+        if (r < 0)
+                return r;
+        if (isempty(s)) {
+                *ret = NULL;
+                return 0;
+        }
+
+        a = strv_split(s, " ");
+        if (!a)
+                return -ENOMEM;
+
+        strv_uniq(a);
+        r = strv_length(a);
+
+        *ret = a;
+        a = NULL;
+
+        return r;
+}
+
+_public_ int sd_network_get_dns(char ***ret) {
+        return network_get_strv("DNS", ret);
+}
+
+_public_ int sd_network_get_ntp(char ***ret) {
+        return network_get_strv("NTP", ret);
+}
+
+_public_ int sd_network_get_domains(char ***ret) {
+        return network_get_strv("DOMAINS", ret);
+}
+
+_public_ int sd_network_link_get_setup_state(int ifindex, char **state) {
         _cleanup_free_ char *s = NULL, *p = NULL;
         int r;
 
         _cleanup_free_ char *s = NULL, *p = NULL;
         int r;
 
@@ -47,13 +109,10 @@ _public_ int sd_network_get_link_state(int ifindex, char **state) {
         r = parse_env_file(p, NEWLINE, "ADMIN_STATE", &s, NULL);
         if (r == -ENOENT)
                 return -ENODATA;
         r = parse_env_file(p, NEWLINE, "ADMIN_STATE", &s, NULL);
         if (r == -ENOENT)
                 return -ENODATA;
-        else if (r < 0)
+        if (r < 0)
                 return r;
                 return r;
-        else if (!s)
-                return -EIO;
-
-        if (streq(s, "initializing"))
-                return -EBUSY;
+        if (isempty(s))
+                return -ENODATA;
 
         *state = s;
         s = NULL;
 
         *state = s;
         s = NULL;
@@ -61,28 +120,31 @@ _public_ int sd_network_get_link_state(int ifindex, char **state) {
         return 0;
 }
 
         return 0;
 }
 
-_public_ int sd_network_get_operational_state(char **state) {
-        _cleanup_free_ char *s = NULL;
+_public_ int sd_network_link_get_network_file(int ifindex, char **filename) {
+        _cleanup_free_ char *s = NULL, *p = NULL;
         int r;
 
         int r;
 
-        assert_return(state, -EINVAL);
+        assert_return(ifindex > 0, -EINVAL);
+        assert_return(filename, -EINVAL);
+
+        if (asprintf(&p, "/run/systemd/netif/links/%d", ifindex) < 0)
+                return -ENOMEM;
 
 
-        r = parse_env_file("/run/systemd/netif/state", NEWLINE, "OPER_STATE",
-                           &s, NULL);
+        r = parse_env_file(p, NEWLINE, "NETWORK_FILE", &s, NULL);
         if (r == -ENOENT)
                 return -ENODATA;
         if (r == -ENOENT)
                 return -ENODATA;
-        else if (r < 0)
+        if (r < 0)
                 return r;
                 return r;
-        else if (!s)
-                return -EIO;
+        if (isempty(s))
+                return -ENODATA;
 
 
-        *state = s;
+        *filename = s;
         s = NULL;
 
         return 0;
 }
 
         s = NULL;
 
         return 0;
 }
 
-_public_ int sd_network_get_link_operational_state(int ifindex, char **state) {
+_public_ int sd_network_link_get_operational_state(int ifindex, char **state) {
         _cleanup_free_ char *s = NULL, *p = NULL;
         int r;
 
         _cleanup_free_ char *s = NULL, *p = NULL;
         int r;
 
@@ -95,10 +157,10 @@ _public_ int sd_network_get_link_operational_state(int ifindex, char **state) {
         r = parse_env_file(p, NEWLINE, "OPER_STATE", &s, NULL);
         if (r == -ENOENT)
                 return -ENODATA;
         r = parse_env_file(p, NEWLINE, "OPER_STATE", &s, NULL);
         if (r == -ENOENT)
                 return -ENODATA;
-        else if (r < 0)
+        if (r < 0)
                 return r;
                 return r;
-        else if (!s)
-                return -EIO;
+        if (isempty(s))
+                return -ENODATA;
 
         *state = s;
         s = NULL;
 
         *state = s;
         s = NULL;
@@ -106,7 +168,7 @@ _public_ int sd_network_get_link_operational_state(int ifindex, char **state) {
         return 0;
 }
 
         return 0;
 }
 
-_public_ int sd_network_get_link_llmnr(int ifindex, char **llmnr) {
+_public_ int sd_network_link_get_llmnr(int ifindex, char **llmnr) {
         _cleanup_free_ char *s = NULL, *p = NULL;
         int r;
 
         _cleanup_free_ char *s = NULL, *p = NULL;
         int r;
 
@@ -119,9 +181,9 @@ _public_ int sd_network_get_link_llmnr(int ifindex, char **llmnr) {
         r = parse_env_file(p, NEWLINE, "LLMNR", &s, NULL);
         if (r == -ENOENT)
                 return -ENODATA;
         r = parse_env_file(p, NEWLINE, "LLMNR", &s, NULL);
         if (r == -ENOENT)
                 return -ENODATA;
-        else if (r < 0)
+        if (r < 0)
                 return r;
                 return r;
-        else if (!s)
+        if (isempty(s))
                 return -ENODATA;
 
         *llmnr = s;
                 return -ENODATA;
 
         *llmnr = s;
@@ -142,11 +204,12 @@ static int network_get_link_strv(const char *key, int ifindex, char ***ret) {
                 return -ENOMEM;
 
         r = parse_env_file(p, NEWLINE, key, &s, NULL);
                 return -ENOMEM;
 
         r = parse_env_file(p, NEWLINE, key, &s, NULL);
+        if (r == -ENOENT)
+                return -ENODATA;
         if (r < 0)
                 return r;
         if (r < 0)
                 return r;
-        else if (!s) {
+        if (isempty(s)) {
                 *ret = NULL;
                 *ret = NULL;
-
                 return 0;
         }
 
                 return 0;
         }
 
@@ -163,14 +226,38 @@ static int network_get_link_strv(const char *key, int ifindex, char ***ret) {
         return r;
 }
 
         return r;
 }
 
-_public_ int sd_network_get_link_dns(int ifindex, char ***ret) {
+_public_ int sd_network_link_get_dns(int ifindex, char ***ret) {
         return network_get_link_strv("DNS", ifindex, ret);
 }
 
         return network_get_link_strv("DNS", ifindex, ret);
 }
 
-_public_ int sd_network_get_link_ntp(int ifindex, char ***ret) {
+_public_ int sd_network_link_get_ntp(int ifindex, char ***ret) {
         return network_get_link_strv("NTP", ifindex, ret);
 }
 
         return network_get_link_strv("NTP", ifindex, ret);
 }
 
+_public_ int sd_network_link_get_domains(int ifindex, char ***ret) {
+        return network_get_link_strv("DOMAINS", ifindex, ret);
+}
+
+_public_ int sd_network_link_get_wildcard_domain(int ifindex) {
+        int r;
+        _cleanup_free_ char *p = NULL, *s = NULL;
+
+        assert_return(ifindex > 0, -EINVAL);
+
+        if (asprintf(&p, "/run/systemd/netif/links/%d", ifindex) < 0)
+                return -ENOMEM;
+
+        r = parse_env_file(p, NEWLINE, "WILDCARD_DOMAIN", &s, NULL);
+        if (r == -ENOENT)
+                return -ENODATA;
+        if (r < 0)
+                return r;
+        if (isempty(s))
+                return -ENODATA;
+
+        return parse_boolean(s);
+}
+
 static inline int MONITOR_TO_FD(sd_network_monitor *m) {
         return (int) (unsigned long) m - 1;
 }
 static inline int MONITOR_TO_FD(sd_network_monitor *m) {
         return (int) (unsigned long) m - 1;
 }
Unnamed repository; edit this file 'description' to name the repository.