X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;ds=sidebyside;f=src%2Fnetwork%2Fsd-network.c;h=cc4b160e74e3598583d02c9ba5e66604364bda0a;hb=6436165dbc500f14abfec738af28f87a71f6a12a;hp=bfb8321c879ae9b4a99634fdb5579726f072612c;hpb=6f4dedb250f2d607eceefaa491f338becbeee7c0;p=elogind.git diff --git a/src/network/sd-network.c b/src/network/sd-network.c index bfb8321c8..cc4b160e7 100644 --- a/src/network/sd-network.c +++ b/src/network/sd-network.c @@ -107,7 +107,31 @@ _public_ int sd_network_get_link_operational_state(int ifindex, char **state) { return 0; } -_public_ int sd_network_get_dhcp_lease(int ifindex, sd_dhcp_lease **ret) { +_public_ int sd_network_get_link_llmnr(int ifindex, char **llmnr) { + _cleanup_free_ char *s = NULL, *p = NULL; + int r; + + assert_return(ifindex > 0, -EINVAL); + assert_return(llmnr, -EINVAL); + + if (asprintf(&p, "/run/systemd/netif/links/%d", ifindex) < 0) + return -ENOMEM; + + r = parse_env_file(p, NEWLINE, "LLMNR", &s, NULL); + if (r == -ENOENT) + return -ENODATA; + else if (r < 0) + return r; + else if (!s) + return -ENODATA; + + *llmnr = s; + s = NULL; + + return 0; +} + +_public_ int sd_network_get_link_dhcp_lease(int ifindex, sd_dhcp_lease **ret) { _cleanup_free_ char *p = NULL, *s = NULL; sd_dhcp_lease *lease = NULL; int r; @@ -134,7 +158,7 @@ _public_ int sd_network_get_dhcp_lease(int ifindex, sd_dhcp_lease **ret) { return 0; } -static int network_get_strv(const char *key, int ifindex, char ***ret) { +static int network_get_link_strv(const char *key, int ifindex, char ***ret) { _cleanup_free_ char *p = NULL, *s = NULL; _cleanup_strv_free_ char **a = NULL; int r; @@ -167,12 +191,12 @@ static int network_get_strv(const char *key, int ifindex, char ***ret) { return r; } -_public_ int sd_network_get_dns(int ifindex, char ***ret) { - return network_get_strv("DNS", ifindex, ret); +_public_ int sd_network_get_link_dns(int ifindex, char ***ret) { + return network_get_link_strv("DNS", ifindex, ret); } -_public_ int sd_network_get_ntp(int ifindex, char ***ret) { - return network_get_strv("NTP", ifindex, ret); +_public_ int sd_network_get_link_ntp(int ifindex, char ***ret) { + return network_get_link_strv("NTP", ifindex, ret); } static inline int MONITOR_TO_FD(sd_network_monitor *m) {