X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=src%2Fnetwork%2Fsd-network.c;h=91d6275056bf3eff87c8abd0124ccb4fac0f0cae;hp=2057e537740a2eea9ff30f0fda2badd8c9401e0a;hb=653912918f594ebbca46806b302ef6b477402575;hpb=0014a4ad505d119c7ac4346d9d774c3f17f663a5 diff --git a/src/network/sd-network.c b/src/network/sd-network.c index 2057e5377..91d627505 100644 --- a/src/network/sd-network.c +++ b/src/network/sd-network.c @@ -35,46 +35,14 @@ #include "network-internal.h" #include "dhcp-lease-internal.h" -static int link_get_flags(unsigned index, unsigned *flags) { +_public_ int sd_network_get_link_state(int ifindex, char **state) { _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; - - assert_return(index, -EINVAL); + assert_return(ifindex > 0, -EINVAL); assert_return(state, -EINVAL); - if (asprintf(&p, "/run/systemd/netif/links/%u", index) < 0) + if (asprintf(&p, "/run/systemd/netif/links/%d", ifindex) < 0) return -ENOMEM; r = parse_env_file(p, NEWLINE, "ADMIN_STATE", &s, NULL); @@ -85,9 +53,7 @@ _public_ int sd_network_get_link_state(unsigned index, char **state) { else if (!s) return -EIO; - if (streq(s, "unmanaged")) - return -EUNATCH; - else if (streq(s, "initializing")) + if (streq(s, "initializing")) return -EBUSY; *state = s; @@ -117,14 +83,14 @@ _public_ int sd_network_get_operational_state(char **state) { return 0; } -_public_ int sd_network_get_link_operational_state(unsigned index, char **state) { +_public_ int sd_network_get_link_operational_state(int ifindex, char **state) { _cleanup_free_ char *s = NULL, *p = NULL; int r; - assert_return(index, -EINVAL); + assert_return(ifindex > 0, -EINVAL); assert_return(state, -EINVAL); - if (asprintf(&p, "/run/systemd/netif/links/%u", index) < 0) + if (asprintf(&p, "/run/systemd/netif/links/%d", ifindex) < 0) return -ENOMEM; r = parse_env_file(p, NEWLINE, "OPER_STATE", &s, NULL); @@ -141,15 +107,15 @@ _public_ int sd_network_get_link_operational_state(unsigned index, char **state) return 0; } -_public_ int sd_network_get_dhcp_lease(unsigned index, sd_dhcp_lease **ret) { +_public_ int sd_network_get_dhcp_lease(int ifindex, sd_dhcp_lease **ret) { _cleanup_free_ char *p = NULL, *s = NULL; sd_dhcp_lease *lease = NULL; int r; - assert_return(index, -EINVAL); + assert_return(ifindex > 0, -EINVAL); assert_return(ret, -EINVAL); - if (asprintf(&p, "/run/systemd/netif/links/%u", index) < 0) + if (asprintf(&p, "/run/systemd/netif/links/%d", ifindex) < 0) return -ENOMEM; r = parse_env_file(p, NEWLINE, "DHCP_LEASE", &s, NULL); @@ -168,15 +134,14 @@ _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) { +static int network_get_in_addr(const char *key, int ifindex, struct in_addr **addr) { _cleanup_free_ char *p = NULL, *s = NULL; int r; - assert_return(index, -EINVAL); + assert_return(ifindex > 0, -EINVAL); assert_return(addr, -EINVAL); - assert_return(addr_size, -EINVAL); - if (asprintf(&p, "/run/systemd/netif/links/%u", index) < 0) + if (asprintf(&p, "/run/systemd/netif/links/%d", ifindex) < 0) return -ENOMEM; r = parse_env_file(p, NEWLINE, key, &s, NULL); @@ -185,26 +150,21 @@ static int network_get_in_addr(const char *key, unsigned index, struct in_addr * 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); + return deserialize_in_addrs(addr, s); } -_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); +_public_ int sd_network_get_dns(int ifindex, struct in_addr **addr) { + return network_get_in_addr("DNS", ifindex, addr); } -static int network_get_in6_addr(const char *key, unsigned index, struct in6_addr **addr, size_t *addr_size) { +static int network_get_in6_addr(const char *key, int ifindex, struct in6_addr **addr) { _cleanup_free_ char *p = NULL, *s = NULL; int r; - assert_return(index, -EINVAL); + assert_return(ifindex > 0, -EINVAL); assert_return(addr, -EINVAL); - assert_return(addr_size, -EINVAL); - if (asprintf(&p, "/run/systemd/netif/links/%u", index) < 0) + if (asprintf(&p, "/run/systemd/netif/links/%d", ifindex) < 0) return -ENOMEM; r = parse_env_file(p, NEWLINE, key, &s, NULL); @@ -213,99 +173,37 @@ static int network_get_in6_addr(const char *key, unsigned index, struct in6_addr else if (!s) return -EIO; - return deserialize_in6_addrs(addr, addr_size, s); + return deserialize_in6_addrs(addr, 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_dns6(int ifindex, struct in6_addr **addr) { + return network_get_in6_addr("DNS", ifindex, addr); } -_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) { +static int network_get_boolean(const char *key, int ifindex) { _cleanup_free_ char *p = NULL, *s = NULL; int r; - assert_return(index, -EINVAL); + assert_return(ifindex > 0, -EINVAL); - if (asprintf(&p, "/run/systemd/netif/links/%u", index) < 0) + if (asprintf(&p, "/run/systemd/netif/links/%d", ifindex) < 0) return -ENOMEM; r = parse_env_file(p, NEWLINE, key, &s, NULL); if (r < 0) return r; else if (!s) - return -EIO; + 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_dns(int ifindex) { + return network_get_boolean("DHCP_USE_DNS", ifindex); } -_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; - - d = opendir("/run/systemd/netif/links/"); - if (!d) - return -errno; - - for (;;) { - struct dirent *de; - int k; - unsigned index; - - errno = 0; - de = readdir(d); - if (!de && errno != 0) - return -errno; - - if (!de) - break; - - dirent_ensure_type(d, de); - - if (!dirent_is_file(de)) - continue; - - k = safe_atou(de->d_name, &index); - if (k < 0) - continue; - - if (indices) { - if ((unsigned) r >= n) { - unsigned *t; - - n = MAX(16, 2*r); - t = realloc(l, sizeof(unsigned) * n); - if (!t) - return -ENOMEM; - - l = t; - } - - assert((unsigned) r < n); - l[r++] = index; - } else - r++; - } - - if (indices) { - *indices = l; - l = NULL; - } - - return r; +_public_ int sd_network_dhcp_use_ntp(int ifindex) { + return network_get_boolean("DHCP_USE_NTP", ifindex); } static inline int MONITOR_TO_FD(sd_network_monitor *m) {