sd-network: turn states 'unknown' and 'unmanaged' into errnos

diff --git a/src/network/networkd-wait-online.c b/src/network/networkd-wait-online.c
index 900dc05125a800e9be402993205c4034d66f08c8..51c6bbd4953e9c51fcfc3ae50d3b05e7ddfa4cb9 100644 (file)
--- a/src/network/networkd-wait-online.c
+++ b/src/network/networkd-wait-online.c
@@ -38,20 +38,15 @@ static bool all_configured(void) {
                 _cleanup_free_ char *state = NULL;
 
                 r = sd_network_get_link_state(indices[i], &state);
                 _cleanup_free_ char *state = NULL;
 
                 r = sd_network_get_link_state(indices[i], &state);

-                if (r < 0)
+                if (r == -EUNATCH)
+                        continue;
+                if (r < 0 || !streq(state, "configured"))

                         return false;
 
                         return false;
 

-                if (streq(state, "configured"))
-                        one_ready = true;
-
-                if (!streq(state, "configured") && !streq(state, "unmanaged"))
-                        return false;
+                one_ready = true;

         }
 
         }
 

-        if (one_ready)
-                return true;
-
-        return false;
+        return one_ready;

 }
 
 static int event_handler(sd_event_source *s, int fd, uint32_t revents,
 }
 
 static int event_handler(sd_event_source *s, int fd, uint32_t revents,

diff --git a/src/network/sd-network.c b/src/network/sd-network.c
index 74698736641aa18bb966aca1040ba5df3789b768..23af9409035877d8205fa951d5afb70599241950 100644 (file)
--- a/src/network/sd-network.c
+++ b/src/network/sd-network.c
@@ -34,7 +34,7 @@
 #include "dhcp-lease-internal.h"
 
 _public_ int sd_network_get_link_state(unsigned index, char **state) {
 #include "dhcp-lease-internal.h"
 
 _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);
         int r;
 
         assert_return(index, -EINVAL);


@@ -44,23 +44,20 @@ _public_ int sd_network_get_link_state(unsigned index, char **state) {
                 return -ENOMEM;
 
         r = parse_env_file(p, NEWLINE, "STATE", &s, NULL);
                 return -ENOMEM;
 
         r = parse_env_file(p, NEWLINE, "STATE", &s, NULL);

-        free(p);
-
-        if (r == -ENOENT) {
-                free(s);
-                s = strdup("unknown");
-                if (!s)
-                        return -ENOMEM;

 
 

-                *state = s;
-                return 0;
-        } else if (r < 0) {
-                free(s);
+        if (r == -ENOENT)
+                return -ENODATA;
+        else if (r < 0)

                 return r;
                 return r;

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

                 return -EIO;
 
                 return -EIO;
 

+        if (streq(s, "unmanaged"))
+                return -EUNATCH;
+

         *state = s;
         *state = s;

+        s = NULL;
+

         return 0;
 }
 
         return 0;
 }