X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Fnetwork%2Fsd-network.c;h=ba13a30aec04e18f5dd5fe1932168db77e816013;hb=68baa8faf30f4e097bcf32d5b2d4880f85a0bdc7;hp=492e97c73f286b4979bc6be5f5d854744d85cc31;hpb=bbf7c04821a71fec67eaf0e7a34d17afc5913c13;p=elogind.git

diff --git a/src/network/sd-network.c b/src/network/sd-network.c
index 492e97c73..ba13a30ae 100644
--- a/src/network/sd-network.c
+++ b/src/network/sd-network.c
@@ -32,6 +32,7 @@
 #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) {
@@ -141,8 +142,8 @@ _public_ int sd_network_get_link_operational_state(unsigned index, char **state)
 }
 
 _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);
@@ -152,12 +153,10 @@ _public_ int sd_network_get_dhcp_lease(unsigned index, sd_dhcp_lease **ret) {
                 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);
@@ -169,6 +168,88 @@ _public_ int sd_network_get_dhcp_lease(unsigned index, sd_dhcp_lease **ret) {
         return 0;
 }
 
+static int network_get_in_addr(const char *key, unsigned index, struct in_addr **addr, size_t *addr_size) {
+        _cleanup_free_ char *p = NULL, *s = NULL;
+        int r;
+
+        assert_return(index, -EINVAL);
+        assert_return(addr, -EINVAL);
+        assert_return(addr_size, -EINVAL);
+
+        if (asprintf(&p, "/run/systemd/network/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, addr_size, s);
+}
+
+_public_ int sd_network_get_dns(unsigned index, struct in_addr **addr, size_t *addr_size) {
+        return network_get_in_addr("DNS", index, addr, addr_size);
+}
+
+_public_ int sd_network_get_ntp(unsigned index, struct in_addr **addr, size_t *addr_size) {
+        return network_get_in_addr("NTP", index, addr, addr_size);
+}
+
+static int network_get_in6_addr(const char *key, unsigned index, struct in6_addr **addr, size_t *addr_size) {
+        _cleanup_free_ char *p = NULL, *s = NULL;
+        int r;
+
+        assert_return(index, -EINVAL);
+        assert_return(addr, -EINVAL);
+        assert_return(addr_size, -EINVAL);
+
+        if (asprintf(&p, "/run/systemd/network/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, addr_size, s);
+}
+
+_public_ int sd_network_get_dns6(unsigned index, struct in6_addr **addr, size_t *addr_size) {
+        return network_get_in6_addr("DNS", index, addr, addr_size);
+}
+
+_public_ int sd_network_get_ntp6(unsigned index, struct in6_addr **addr, size_t *addr_size) {
+        return network_get_in6_addr("NTP", index, addr, addr_size);
+}
+
+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/network/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 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;