chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
sd-network: expose DNS/NTP servers as strings
[elogind.git]
/
src
/
network
/
sd-network.c
diff --git
a/src/network/sd-network.c
b/src/network/sd-network.c
index c86781220957347fa4b0440737a4cd8fcbf0d02c..bfb8321c879ae9b4a99634fdb5579726f072612c 100644
(file)
--- a/
src/network/sd-network.c
+++ b/
src/network/sd-network.c
@@
-32,19
+32,20
@@
#include "strv.h"
#include "fileio.h"
#include "sd-network.h"
#include "strv.h"
#include "fileio.h"
#include "sd-network.h"
+#include "network-internal.h"
#include "dhcp-lease-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;
_cleanup_free_ char *s = NULL, *p = NULL;
int r;
- assert
(index
);
- assert
(flags
);
+ assert
_return(ifindex > 0, -EINVAL
);
+ assert
_return(state, -EINVAL
);
- if (asprintf(&p, "/run/systemd/net
work/links/%u",
index) < 0)
+ if (asprintf(&p, "/run/systemd/net
if/links/%d", if
index) < 0)
return -ENOMEM;
return -ENOMEM;
- r = parse_env_file(p, NEWLINE, "
FLAGS
", &s, NULL);
+ r = parse_env_file(p, NEWLINE, "
ADMIN_STATE
", &s, NULL);
if (r == -ENOENT)
return -ENODATA;
else if (r < 0)
if (r == -ENOENT)
return -ENODATA;
else if (r < 0)
@@
-52,31
+53,23
@@
static int link_get_flags(unsigned index, unsigned *flags) {
else if (!s)
return -EIO;
else if (!s)
return -EIO;
- return safe_atou(s, flags);
-}
-
-_public_ int sd_network_link_is_loopback(unsigned index) {
- unsigned flags;
- int r;
+ if (streq(s, "initializing"))
+ return -EBUSY;
- r = link_get_flags(index, &flags);
- if (r < 0)
- return 0;
+ *state = s;
+ s = NULL;
- return
flags & IFF_LOOPBACK
;
+ return
0
;
}
}
-_public_ int sd_network_get_
link_state(unsigned index,
char **state) {
- _cleanup_free_ char *s = NULL
, *p = NULL
;
+_public_ int sd_network_get_
operational_state(
char **state) {
+ _cleanup_free_ char *s = NULL;
int r;
int r;
- assert_return(index, -EINVAL);
assert_return(state, -EINVAL);
assert_return(state, -EINVAL);
- if (asprintf(&p, "/run/systemd/network/links/%u", index) < 0)
- return -ENOMEM;
-
- r = parse_env_file(p, NEWLINE, "ADMIN_STATE", &s, NULL);
+ r = parse_env_file("/run/systemd/netif/state", NEWLINE, "OPER_STATE",
+ &s, NULL);
if (r == -ENOENT)
return -ENODATA;
else if (r < 0)
if (r == -ENOENT)
return -ENODATA;
else if (r < 0)
@@
-84,25
+77,20
@@
_public_ int sd_network_get_link_state(unsigned index, char **state) {
else if (!s)
return -EIO;
else if (!s)
return -EIO;
- if (streq(s, "unmanaged"))
- return -EUNATCH;
- else if (streq(s, "initializing"))
- return -EBUSY;
-
*state = s;
s = NULL;
return 0;
}
*state = s;
s = NULL;
return 0;
}
-_public_ int sd_network_get_link_operational_state(
unsigned
index, char **state) {
+_public_ int sd_network_get_link_operational_state(
int if
index, char **state) {
_cleanup_free_ char *s = NULL, *p = NULL;
int r;
_cleanup_free_ char *s = NULL, *p = NULL;
int r;
- assert_return(i
ndex
, -EINVAL);
+ assert_return(i
findex > 0
, -EINVAL);
assert_return(state, -EINVAL);
assert_return(state, -EINVAL);
- if (asprintf(&p, "/run/systemd/net
work/links/%u",
index) < 0)
+ if (asprintf(&p, "/run/systemd/net
if/links/%d", if
index) < 0)
return -ENOMEM;
r = parse_env_file(p, NEWLINE, "OPER_STATE", &s, NULL);
return -ENOMEM;
r = parse_env_file(p, NEWLINE, "OPER_STATE", &s, NULL);
@@
-119,24
+107,22
@@
_public_ int sd_network_get_link_operational_state(unsigned index, char **state)
return 0;
}
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 if
index, sd_dhcp_lease **ret) {
+
_cleanup_free_ char *p = NULL, *s = NULL
;
+
sd_dhcp_lease *lease
= NULL;
int r;
int r;
- assert_return(i
ndex
, -EINVAL);
+ assert_return(i
findex > 0
, -EINVAL);
assert_return(ret, -EINVAL);
assert_return(ret, -EINVAL);
- if (asprintf(&p, "/run/systemd/net
work/links/%u",
index) < 0)
+ if (asprintf(&p, "/run/systemd/net
if/links/%d", if
index) < 0)
return -ENOMEM;
r = parse_env_file(p, NEWLINE, "DHCP_LEASE", &s, NULL);
return -ENOMEM;
r = parse_env_file(p, NEWLINE, "DHCP_LEASE", &s, NULL);
- free(p);
- if (r < 0) {
- free(s);
+ if (r < 0)
return r;
return r;
-
}
else if (!s)
+ else if (!s)
return -EIO;
r = dhcp_lease_load(s, &lease);
return -EIO;
r = dhcp_lease_load(s, &lease);
@@
-148,62
+134,45
@@
_public_ int sd_network_get_dhcp_lease(unsigned index, sd_dhcp_lease **ret) {
return 0;
}
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) {
}
static inline int MONITOR_TO_FD(sd_network_monitor *m) {
@@
-214,7
+183,7
@@
static inline sd_network_monitor* FD_TO_MONITOR(int fd) {
return (sd_network_monitor*) (unsigned long) (fd + 1);
}
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;
int fd, k;
bool good = false;
@@
-225,7
+194,7
@@
_public_ int sd_network_monitor_new(const char *category, sd_network_monitor **m
return -errno;
if (!category || streq(category, "links")) {
return -errno;
if (!category || streq(category, "links")) {
- k = inotify_add_watch(fd, "/run/systemd/net
work
/links/", IN_MOVED_TO|IN_DELETE);
+ k = inotify_add_watch(fd, "/run/systemd/net
if
/links/", IN_MOVED_TO|IN_DELETE);
if (k < 0) {
safe_close(fd);
return -errno;
if (k < 0) {
safe_close(fd);
return -errno;
@@
-235,7
+204,7
@@
_public_ int sd_network_monitor_new(const char *category, sd_network_monitor **m
}
if (!category || streq(category, "leases")) {
}
if (!category || streq(category, "leases")) {
- k = inotify_add_watch(fd, "/run/systemd/net
work
/leases/", IN_MOVED_TO|IN_DELETE);
+ k = inotify_add_watch(fd, "/run/systemd/net
if
/leases/", IN_MOVED_TO|IN_DELETE);
if (k < 0) {
safe_close(fd);
return -errno;
if (k < 0) {
safe_close(fd);
return -errno;