From c0c743cb3df7197b51bb89cc3c8ca7ed16d06396 Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Tue, 12 Aug 2014 13:01:58 +0200 Subject: networkd: expose a global list of DNS and NTP servers in the state file --- src/network/networkd-manager.c | 112 +++++++++++++++++++++++++++++++++++++++++ src/shared/set.c | 34 +++++++++++++ src/shared/set.h | 2 + 3 files changed, 148 insertions(+) (limited to 'src') diff --git a/src/network/networkd-manager.c b/src/network/networkd-manager.c index 8a0ed5ea2b..28d72617dd 100644 --- a/src/network/networkd-manager.c +++ b/src/network/networkd-manager.c @@ -415,7 +415,42 @@ int manager_bus_listen(Manager *m) { return 0; } +static int set_put_in_addr(Set *s, const struct in_addr *address) { + char *p; + int r; + + assert(s); + + r = in_addr_to_string(AF_INET, (const union in_addr_union*) address, &p); + if (r < 0) + return r; + + r = set_consume(s, p); + if (r == -EEXIST) + return 0; + + return r; +} + +static int set_put_in_addrv(Set *s, const struct in_addr *addresses, int n) { + int r, i, c = 0; + + assert(s); + assert(n <= 0 || addresses); + + for (i = 0; i < n; i++) { + r = set_put_in_addr(s, addresses+i); + if (r < 0) + return r; + + c += r; + } + + return c; +} + int manager_save(Manager *m) { + _cleanup_set_free_free_ Set *dns = NULL, *ntp = NULL; Link *link; Iterator i; _cleanup_free_ char *temp_path = NULL; @@ -427,12 +462,61 @@ int manager_save(Manager *m) { assert(m); assert(m->state_file); + /* We add all NTP and DNS server to a set, to filter out duplicates */ + dns = set_new(string_hash_func, string_compare_func); + if (!dns) + return -ENOMEM; + + ntp = set_new(string_hash_func, string_compare_func); + if (!ntp) + return -ENOMEM; + HASHMAP_FOREACH(link, m->links, i) { if (link->flags & IFF_LOOPBACK) continue; if (link->operstate > operstate) operstate = link->operstate; + + if (!link->network) + continue; + + /* First add the static configured entries */ + r = set_put_strdupv(dns, link->network->dns); + if (r < 0) + return r; + + r = set_put_strdupv(ntp, link->network->ntp); + if (r < 0) + return r; + + if (!link->dhcp_lease) + continue; + + /* Secondly, add the entries acquired via DHCP */ + if (link->network->dhcp_dns) { + const struct in_addr *addresses; + + r = sd_dhcp_lease_get_dns(link->dhcp_lease, &addresses); + if (r > 0) { + r = set_put_in_addrv(dns, addresses, r); + if (r < 0) + return r; + } else if (r != -ENOENT) + return r; + } + + if (link->network->dhcp_ntp) { + const struct in_addr *addresses; + + r = sd_dhcp_lease_get_ntp(link->dhcp_lease, &addresses); + if (r > 0) { + r = set_put_in_addrv(ntp, addresses, r); + if (r < 0) + return r; + } else if (r != -ENOENT) + return r; + } } operstate_str = link_operstate_to_string(operstate); @@ -448,6 +532,34 @@ int manager_save(Manager *m) { "# This is private data. Do not parse.\n" "OPER_STATE=%s\n", operstate_str); + if (!set_isempty(dns)) { + bool space = false; + char *p; + + fputs("DNS=", f); + SET_FOREACH(p, dns, i) { + if (space) + fputc(' ', f); + fputs(p, f); + space = true; + } + fputc('\n', f); + } + + if (!set_isempty(ntp)) { + bool space = false; + char *p; + + fputs("NTP=", f); + SET_FOREACH(p, ntp, i) { + if (space) + fputc(' ', f); + fputs(p, f); + space = true; + } + fputc('\n', f); + } + r = fflush_and_check(f); if (r < 0) goto fail; diff --git a/src/shared/set.c b/src/shared/set.c index 5a4bf11bdf..02ea831593 100644 --- a/src/shared/set.c +++ b/src/shared/set.c @@ -23,6 +23,7 @@ #include "set.h" #include "hashmap.h" +#include "strv.h" #define MAKE_SET(h) ((Set*) (h)) #define MAKE_HASHMAP(s) ((Hashmap*) (s)) @@ -59,6 +60,39 @@ int set_consume(Set *s, void *value) { return r; } +int set_put_strdup(Set *s, const char *p) { + char *c; + int r; + + assert(s); + assert(p); + + c = strdup(p); + if (!c) + return -ENOMEM; + + r = set_consume(s, c); + if (r == -EEXIST) + return 0; + + return r; +} + +int set_put_strdupv(Set *s, char **l) { + int n = 0, r; + char **i; + + STRV_FOREACH(i, l) { + r = set_put_strdup(s, *i); + if (r < 0) + return r; + + n += r; + } + + return n; +} + int set_replace(Set *s, void *value) { return hashmap_replace(MAKE_HASHMAP(s), value, value); } diff --git a/src/shared/set.h b/src/shared/set.h index 5612478d4e..e0b9c9e0a8 100644 --- a/src/shared/set.h +++ b/src/shared/set.h @@ -41,6 +41,8 @@ int set_ensure_allocated(Set **s, hash_func_t hash_func, compare_func_t compare_ int set_put(Set *s, void *value); int set_consume(Set *s, void *value); +int set_put_strdup(Set *s, const char *p); +int set_put_strdupv(Set *s, char **l); int set_replace(Set *s, void *value); void *set_get(Set *s, void *value); bool set_contains(Set *s, void *value); -- cgit v1.2.3-54-g00ecf