#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/network/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/network/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);
else if (!s)
return -EIO;
- if (streq(s, "unmanaged"))
- return -EUNATCH;
- else if (streq(s, "initializing"))
+ if (streq(s, "initializing"))
return -EBUSY;
*state = s;
assert_return(state, -EINVAL);
- r = parse_env_file("/run/systemd/network/state", NEWLINE, "OPER_STATE",
+ r = parse_env_file("/run/systemd/netif/state", NEWLINE, "OPER_STATE",
&s, NULL);
if (r == -ENOENT)
return -ENODATA;
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/network/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);
return 0;
}
-_public_ int sd_network_get_dhcp_lease(unsigned index, sd_dhcp_lease **ret) {
- _cleanup_free_ char *p = NULL, *s = NULL;
- sd_dhcp_lease *lease;
+_public_ int sd_network_get_llmnr(int ifindex, char **llmnr) {
+ _cleanup_free_ char *s = NULL, *p = NULL;
int r;
- assert_return(index, -EINVAL);
- assert_return(ret, -EINVAL);
-
- if (asprintf(&p, "/run/systemd/network/links/%u", index) < 0)
- return -ENOMEM;
-
- r = parse_env_file(p, NEWLINE, "DHCP_LEASE", &s, NULL);
-
- if (r < 0)
- return r;
- else if (!s)
- return -EIO;
+ assert_return(ifindex > 0, -EINVAL);
+ assert_return(llmnr, -EINVAL);
- r = dhcp_lease_load(s, &lease);
- if (r < 0)
+ r = parse_env_file(p, NEWLINE, "LLMNR", &s, NULL);
+ if (r == -ENOENT)
+ return -ENODATA;
+ else if (r < 0)
return r;
- *ret = lease;
+ *llmnr = s;
+ s = NULL;
return 0;
}
-static int network_get_in_addr(const char *key, unsigned index, struct in_addr **addr, size_t *addr_size) {
+_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(addr, -EINVAL);
- assert_return(addr_size, -EINVAL);
+ assert_return(ifindex > 0, -EINVAL);
+ assert_return(ret, -EINVAL);
- if (asprintf(&p, "/run/systemd/network/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);
+ r = parse_env_file(p, NEWLINE, "DHCP_LEASE", &s, NULL);
+
if (r < 0)
return r;
else if (!s)
return -EIO;
- return deserialize_in_addrs(addr, addr_size, s);
-}
+ r = dhcp_lease_load(s, &lease);
+ if (r < 0)
+ return r;
-_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);
-}
+ *ret = lease;
-_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);
+ return 0;
}
-static int network_get_in6_addr(const char *key, unsigned index, struct in6_addr **addr, size_t *addr_size) {
+static int network_get_strv(const char *key, int ifindex, char ***ret) {
_cleanup_free_ char *p = NULL, *s = NULL;
+ _cleanup_strv_free_ char **a = NULL;
int r;
- assert_return(index, -EINVAL);
- assert_return(addr, -EINVAL);
- assert_return(addr_size, -EINVAL);
+ assert_return(ifindex > 0, -EINVAL);
+ assert_return(ret, -EINVAL);
- if (asprintf(&p, "/run/systemd/network/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;
+ else if (!s) {
+ *ret = NULL;
- 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);
+ return 0;
+ }
- if (asprintf(&p, "/run/systemd/network/links/%u", index) < 0)
+ a = strv_split(s, " ");
+ if (!a)
return -ENOMEM;
- r = parse_env_file(p, NEWLINE, key, &s, NULL);
- if (r < 0)
- return r;
- else if (!s)
- return -EIO;
+ strv_uniq(a);
+ r = strv_length(a);
- return parse_boolean(s);
-}
+ *ret = a;
+ a = NULL;
-_public_ int sd_network_dhcp_use_dns(unsigned index) {
- return network_get_boolean("DHCP_USE_DNS", index);
+ return r;
}
-_public_ int sd_network_dhcp_use_ntp(unsigned index) {
- return network_get_boolean("DHCP_USE_NTP", index);
+_public_ int sd_network_get_dns(int ifindex, char ***ret) {
+ return network_get_strv("DNS", ifindex, ret);
}
-_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/");
- 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_get_ntp(int ifindex, char ***ret) {
+ return network_get_strv("NTP", ifindex, ret);
}
static inline int MONITOR_TO_FD(sd_network_monitor *m) {
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;
return -errno;
if (!category || streq(category, "links")) {
- k = inotify_add_watch(fd, "/run/systemd/network/links/", IN_MOVED_TO|IN_DELETE);
+ k = inotify_add_watch(fd, "/run/systemd/netif/links/", IN_MOVED_TO|IN_DELETE);
if (k < 0) {
safe_close(fd);
return -errno;
}
if (!category || streq(category, "leases")) {
- k = inotify_add_watch(fd, "/run/systemd/network/leases/", IN_MOVED_TO|IN_DELETE);
+ k = inotify_add_watch(fd, "/run/systemd/netif/leases/", IN_MOVED_TO|IN_DELETE);
if (k < 0) {
safe_close(fd);
return -errno;
~ianmdlvl / elogind.git / blobdiff