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=bfb8321c879ae9b4a99634fdb5579726f072612c;hp=23af9409035877d8205fa951d5afb70599241950;hb=6f4dedb250f2d607eceefaa491f338becbeee7c0;hpb=cb6fa44cb5411ed574f14109ee862ff663ab0a36 diff --git a/src/network/sd-network.c b/src/network/sd-network.c index 23af94090..bfb8321c8 100644 --- a/src/network/sd-network.c +++ b/src/network/sd-network.c @@ -25,26 +25,51 @@ #include #include #include +#include #include "util.h" #include "macro.h" #include "strv.h" #include "fileio.h" #include "sd-network.h" +#include "network-internal.h" #include "dhcp-lease-internal.h" -_public_ int sd_network_get_link_state(unsigned index, char **state) { +_public_ int sd_network_get_link_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, "STATE", &s, NULL); + r = parse_env_file(p, NEWLINE, "ADMIN_STATE", &s, NULL); + if (r == -ENOENT) + return -ENODATA; + else if (r < 0) + return r; + else if (!s) + return -EIO; + + if (streq(s, "initializing")) + return -EBUSY; + + *state = s; + s = NULL; + + return 0; +} + +_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; else if (r < 0) @@ -52,8 +77,29 @@ _public_ int sd_network_get_link_state(unsigned index, char **state) { else if (!s) return -EIO; - if (streq(s, "unmanaged")) - return -EUNATCH; + *state = s; + s = NULL; + + return 0; +} + +_public_ int sd_network_get_link_operational_state(int ifindex, char **state) { + _cleanup_free_ char *s = NULL, *p = NULL; + int r; + + assert_return(ifindex > 0, -EINVAL); + assert_return(state, -EINVAL); + + if (asprintf(&p, "/run/systemd/netif/links/%d", ifindex) < 0) + return -ENOMEM; + + r = parse_env_file(p, NEWLINE, "OPER_STATE", &s, NULL); + if (r == -ENOENT) + return -ENODATA; + else if (r < 0) + return r; + else if (!s) + return -EIO; *state = s; s = NULL; @@ -61,24 +107,22 @@ _public_ int sd_network_get_link_state(unsigned index, char **state) { return 0; } -_public_ int sd_network_get_dhcp_lease(unsigned index, sd_dhcp_lease **ret) { - sd_dhcp_lease *lease; - char *p, *s = NULL; +_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/network/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); - 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); @@ -90,62 +134,45 @@ _public_ int sd_network_get_dhcp_lease(unsigned index, sd_dhcp_lease **ret) { return 0; } -_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; +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; - if (!de) - break; + assert_return(ifindex > 0, -EINVAL); + assert_return(ret, -EINVAL); - dirent_ensure_type(d, de); + if (asprintf(&p, "/run/systemd/netif/links/%d", ifindex) < 0) + return -ENOMEM; - if (!dirent_is_file(de)) - continue; + r = parse_env_file(p, NEWLINE, key, &s, NULL); + if (r < 0) + return r; + else if (!s) { + *ret = NULL; - k = safe_atou(de->d_name, &index); - if (k < 0) - continue; + return 0; + } - if (indices) { - if ((unsigned) r >= n) { - unsigned *t; + a = strv_split(s, " "); + if (!a) + return -ENOMEM; - n = MAX(16, 2*r); - t = realloc(l, sizeof(unsigned) * n); - if (!t) - return -ENOMEM; + strv_uniq(a); + r = strv_length(a); - l = t; - } + *ret = a; + a = NULL; - assert((unsigned) r < n); - l[r++] = index; - } else - r++; - } + return r; +} - if (indices) { - *indices = l; - l = NULL; - } +_public_ int sd_network_get_dns(int ifindex, char ***ret) { + return network_get_strv("DNS", ifindex, ret); +} - 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) { @@ -156,7 +183,7 @@ static inline sd_network_monitor* FD_TO_MONITOR(int fd) { 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; @@ -166,10 +193,20 @@ _public_ int sd_network_monitor_new(const char *category, sd_network_monitor **m if (fd < 0) return -errno; - if (!category || streq(category, "netif")) { - k = inotify_add_watch(fd, "/run/systemd/network/links/", IN_MOVED_TO|IN_DELETE); + if (!category || streq(category, "links")) { + k = inotify_add_watch(fd, "/run/systemd/netif/links/", IN_MOVED_TO|IN_DELETE); + if (k < 0) { + safe_close(fd); + return -errno; + } + + good = true; + } + + if (!category || streq(category, "leases")) { + k = inotify_add_watch(fd, "/run/systemd/netif/leases/", IN_MOVED_TO|IN_DELETE); if (k < 0) { - close_nointr_nofail(fd); + safe_close(fd); return -errno; }