X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Fnetwork%2Fsd-network.c;h=a0f147e02316b9720ed33f21ec18f90bd9c9fa97;hb=bd8f65387673e29f46136a4ed172097035002c23;hp=64e3aaae484b8648e6f071f2407d76f8fee7ddd9;hpb=7dbf94a9c4dcdf9b56384e66eb2652fb61da5063;p=elogind.git diff --git a/src/network/sd-network.c b/src/network/sd-network.c index 64e3aaae4..a0f147e02 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/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); @@ -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; @@ -102,7 +68,7 @@ _public_ int sd_network_get_operational_state(char **state) { 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; @@ -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/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); @@ -141,149 +107,91 @@ _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) { - sd_dhcp_lease *lease; - char *p, *s = NULL; +_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); - free(p); + assert_return(ifindex > 0, -EINVAL); + assert_return(llmnr, -EINVAL); - if (r < 0) { - free(s); - return r; - } else if (!s) - return -EIO; - - 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; } -_public_ int sd_network_get_dns(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, "DNS", &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); -} - -_public_ int sd_network_get_dns6(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, "DNS", &s, NULL); + r = dhcp_lease_load(s, &lease); if (r < 0) return r; - else if (!s) - return -EIO; - return deserialize_in6_addrs(addr, addr_size, s); + *ret = lease; + + return 0; } -_public_ int sd_network_dhcp_use_dns(unsigned index) { +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(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_USE_DNS", &s, NULL); + 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 parse_boolean(s); -} - -_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; + 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) { @@ -294,7 +202,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; @@ -305,7 +213,7 @@ _public_ int sd_network_monitor_new(const char *category, sd_network_monitor **m 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; @@ -315,7 +223,7 @@ _public_ int sd_network_monitor_new(const char *category, sd_network_monitor **m } 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;