SymbX/systemd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

sd-network: expose DNS/NTP servers as strings

Browse Source 
This avoids having to distinguish between IPv4 and IPv6, allowing us
to keep their internal orderings. The consumers now has to turn the
strings into addresses.
This commit is contained in:
Tom Gundersen
2014-07-23 23:54:52 +02:00
parent 6073b6f26a
commit 6f4dedb250
3 changed files with 39 additions and 90 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/resolve/resolved-link.c
+14 -30
View File
@@ -133,49 +133,33 @@ int link_update_rtnl(Link *l, sd_rtnl_message *m) {
}
static int link_update_dns_servers(Link *l) {
_cleanup_free_ struct in_addr *nameservers = NULL;
_cleanup_free_ struct in6_addr *nameservers6 = NULL;
_cleanup_strv_free_ char **nameservers = NULL;
char **nameserver;
DnsServer *s, *nx;
int r, n, i;
int r;
assert(l);
LIST_FOREACH(servers, s, l->dns_servers)
s->marked = true;
n = sd_network_get_dns(l->ifindex, &nameservers);
if (n < 0) {
r = n;
r = sd_network_get_dns(l->ifindex, &nameservers);
if (r < 0)
goto clear;
}
for (i = 0; i < n; i++) {
union in_addr_union a = { .in = nameservers[i] };
STRV_FOREACH(nameserver, nameservers) {
union in_addr_union a;
int family;
s = link_find_dns_server(l, AF_INET, &a);
r = in_addr_from_string_auto(*nameserver, &family, &a);
if (r < 0)
goto clear;
s = link_find_dns_server(l, family, &a);
if (s)
s->marked = false;
else {
r = dns_server_new(l->manager, NULL, l, AF_INET, &a);
if (r < 0)
goto clear;
}
}
n = sd_network_get_dns6(l->ifindex, &nameservers6);
if (n < 0) {
r = n;
goto clear;
}
for (i = 0; i < n; i++) {
union in_addr_union a = { .in6 = nameservers6[i] };
s = link_find_dns_server(l, AF_INET6, &a);
if (s)
s->marked = false;
else {
r = dns_server_new(l->manager, NULL, l, AF_INET6, &a);
r = dns_server_new(l->manager, NULL, l, family, &a);
if (r < 0)
goto clear;
}