X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=src%2Fnetwork%2Fnetworkd-manager.c;h=e3d72edeceac2c4c9723c52002f102d96284fb19;hp=0456eef0d3a6964f4d9166c6b58f3dadfa359e3c;hb=db73295accbec0c6513817f0a64a92018592bb26;hpb=86e6e5d1b4e78d62d1a45539c1de141bc5e839aa
diff --git a/src/network/networkd-manager.c b/src/network/networkd-manager.c
index 0456eef0d..e3d72edec 100644
--- a/src/network/networkd-manager.c
+++ b/src/network/networkd-manager.c
@@ -19,11 +19,15 @@
along with systemd; If not, see .
***/
-#include
+#include
#include
+#include "conf-parser.h"
#include "path-util.h"
#include "networkd.h"
+#include "networkd-netdev.h"
+#include "networkd-link.h"
+#include "network-internal.h"
#include "libudev-private.h"
#include "udev-util.h"
#include "rtnl-util.h"
@@ -41,32 +45,27 @@ const char* const network_dirs[] = {
#endif
NULL};
-static int dispatch_sigterm(sd_event_source *es, const struct signalfd_siginfo *si, void *userdata) {
- Manager *m = userdata;
+static int setup_default_address_pool(Manager *m) {
+ AddressPool *p;
+ int r;
assert(m);
- log_received_signal(LOG_INFO, si);
-
- sd_event_exit(m->event, 0);
- return 0;
-}
-
-static int setup_signals(Manager *m) {
- sigset_t mask;
- int r;
+ /* Add in the well-known private address ranges. */
- assert(m);
+ r = address_pool_new_from_string(m, &p, AF_INET6, "fc00::", 7);
+ if (r < 0)
+ return r;
- assert_se(sigemptyset(&mask) == 0);
- sigset_add_many(&mask, SIGINT, SIGTERM, -1);
- assert_se(sigprocmask(SIG_SETMASK, &mask, NULL) == 0);
+ r = address_pool_new_from_string(m, &p, AF_INET, "192.168.0.0", 16);
+ if (r < 0)
+ return r;
- r = sd_event_add_signal(m->event, &m->sigterm_event_source, SIGTERM, dispatch_sigterm, m);
+ r = address_pool_new_from_string(m, &p, AF_INET, "172.16.0.0", 12);
if (r < 0)
return r;
- r = sd_event_add_signal(m->event, &m->sigint_event_source, SIGINT, dispatch_sigterm, m);
+ r = address_pool_new_from_string(m, &p, AF_INET, "10.0.0.0", 8);
if (r < 0)
return r;
@@ -81,7 +80,7 @@ int manager_new(Manager **ret) {
if (!m)
return -ENOMEM;
- m->state_file = strdup("/run/systemd/network/state");
+ m->state_file = strdup("/run/systemd/netif/state");
if (!m->state_file)
return -ENOMEM;
@@ -91,7 +90,11 @@ int manager_new(Manager **ret) {
sd_event_set_watchdog(m->event, true);
- r = sd_rtnl_open(&m->rtnl, RTMGRP_LINK | RTMGRP_IPV4_IFADDR);
+ sd_event_add_signal(m->event, NULL, SIGTERM, NULL, NULL);
+ sd_event_add_signal(m->event, NULL, SIGINT, NULL, NULL);
+
+ r = sd_rtnl_open(&m->rtnl, 3, RTNLGRP_LINK, RTNLGRP_IPV4_IFADDR,
+ RTNLGRP_IPV6_IFADDR);
if (r < 0)
return r;
@@ -99,10 +102,6 @@ int manager_new(Manager **ret) {
if (r < 0 && r != -ENOENT) /* TODO: drop when we can rely on kdbus */
return r;
- r = setup_signals(m);
- if (r < 0)
- return r;
-
/* udev does not initialize devices inside containers,
* so we rely on them being already initialized before
* entering the container */
@@ -116,16 +115,16 @@ int manager_new(Manager **ret) {
return -ENOMEM;
}
- m->links = hashmap_new(uint64_hash_func, uint64_compare_func);
- if (!m->links)
- return -ENOMEM;
-
m->netdevs = hashmap_new(string_hash_func, string_compare_func);
if (!m->netdevs)
return -ENOMEM;
LIST_HEAD_INIT(m->networks);
+ r = setup_default_address_pool(m);
+ if (r < 0)
+ return r;
+
*ret = m;
m = NULL;
@@ -136,6 +135,7 @@ void manager_free(Manager *m) {
Network *network;
NetDev *netdev;
Link *link;
+ AddressPool *pool;
if (!m)
return;
@@ -161,6 +161,9 @@ void manager_free(Manager *m) {
netdev_unref(netdev);
hashmap_free(m->netdevs);
+ while ((pool = m->address_pools))
+ address_pool_free(pool);
+
sd_rtnl_unref(m->rtnl);
free(m);
@@ -221,7 +224,7 @@ static int manager_rtnl_process_link(sd_rtnl *rtnl, sd_rtnl_message *message, vo
Link *link = NULL;
NetDev *netdev = NULL;
uint16_t type;
- char *name;
+ const char *name;
int r, ifindex;
assert(rtnl);
@@ -254,7 +257,8 @@ static int manager_rtnl_process_link(sd_rtnl *rtnl, sd_rtnl_message *message, vo
/* link is new, so add it */
r = link_add(m, message, &link);
if (r < 0) {
- log_debug("could not add new link");
+ log_debug("could not add new link: %s",
+ strerror(-r));
return 0;
}
}
@@ -372,6 +376,8 @@ int manager_udev_listen(Manager *m) {
int manager_rtnl_listen(Manager *m) {
int r;
+ assert(m);
+
r = sd_rtnl_attach_event(m->rtnl, m->event, 0);
if (r < 0)
return r;
@@ -384,6 +390,14 @@ int manager_rtnl_listen(Manager *m) {
if (r < 0)
return r;
+ r = sd_rtnl_add_match(m->rtnl, RTM_NEWADDR, &link_rtnl_process_address, m);
+ if (r < 0)
+ return r;
+
+ r = sd_rtnl_add_match(m->rtnl, RTM_DELADDR, &link_rtnl_process_address, m);
+ if (r < 0)
+ return r;
+
return 0;
}
@@ -402,143 +416,185 @@ int manager_bus_listen(Manager *m) {
return 0;
}
-static void append_dns(FILE *f, struct in_addr *dns, unsigned char family, unsigned *count) {
- char buf[INET6_ADDRSTRLEN];
- const char *address;
-
- address = inet_ntop(family, dns, buf, INET6_ADDRSTRLEN);
- if (!address) {
- log_warning("Invalid DNS address. Ignoring.");
- return;
- }
-
- if (*count == MAXNS)
- fputs("# Too many DNS servers configured, the following entries "
- "will be ignored\n", f);
-
- fprintf(f, "nameserver %s\n", address);
-
- (*count) ++;
-}
-
-int manager_update_resolv_conf(Manager *m) {
- _cleanup_free_ char *temp_path = NULL;
- _cleanup_fclose_ FILE *f = NULL;
- Link *link;
- Iterator i;
- unsigned count = 0;
- const char *domainname = NULL;
+static int set_put_in_addr(Set *s, const struct in_addr *address) {
+ char *p;
int r;
- assert(m);
+ assert(s);
- r = fopen_temporary("/run/systemd/network/resolv.conf", &f, &temp_path);
+ r = in_addr_to_string(AF_INET, (const union in_addr_union*) address, &p);
if (r < 0)
return r;
- fchmod(fileno(f), 0644);
-
- fputs("# This file is managed by systemd-networkd(8). Do not edit.\n#\n"
- "# Third party programs must not access this file directly, but\n"
- "# only through the symlink at /etc/resolv.conf. To manage\n"
- "# resolv.conf(5) in a different way, replace the symlink by a\n"
- "# static file or a different symlink.\n\n", f);
-
- HASHMAP_FOREACH(link, m->links, i) {
- if (link->dhcp_lease) {
- struct in_addr *nameservers;
- size_t nameservers_size;
-
- if (link->network->dhcp_dns) {
- r = sd_dhcp_lease_get_dns(link->dhcp_lease, &nameservers, &nameservers_size);
- if (r >= 0) {
- unsigned j;
-
- for (j = 0; j < nameservers_size; j++)
- append_dns(f, &nameservers[j], AF_INET, &count);
- }
- }
+ r = set_consume(s, p);
+ if (r == -EEXIST)
+ return 0;
- if (link->network->dhcp_domainname && !domainname) {
- r = sd_dhcp_lease_get_domainname(link->dhcp_lease, &domainname);
- if (r >= 0)
- fprintf(f, "domain %s\n", domainname);
- }
- }
- }
+ return r;
+}
- HASHMAP_FOREACH(link, m->links, i) {
- if (link->network && link->network->dns) {
- Address *address;
- Iterator j;
+static int set_put_in_addrv(Set *s, const struct in_addr *addresses, int n) {
+ int r, i, c = 0;
- SET_FOREACH(address, link->network->dns, j) {
- append_dns(f, &address->in_addr.in,
- address->family, &count);
- }
- }
- }
+ assert(s);
+ assert(n <= 0 || addresses);
- fflush(f);
+ for (i = 0; i < n; i++) {
+ r = set_put_in_addr(s, addresses+i);
+ if (r < 0)
+ return r;
- if (ferror(f) || rename(temp_path, "/run/systemd/network/resolv.conf") < 0) {
- r = -errno;
- unlink("/run/systemd/network/resolv.conf");
- unlink(temp_path);
- return r;
+ c += r;
}
- return 0;
+ 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;
_cleanup_fclose_ FILE *f = NULL;
- const char *oper_state = "unknown";
- bool dormant = false, carrier = false;
+ LinkOperationalState operstate = LINK_OPERSTATE_OFF;
+ const char *operstate_str;
int r;
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_has_carrier(link->flags, link->operstate))
- carrier = true;
- else if (link->operstate == IF_OPER_DORMANT)
- dormant = true;
+ 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;
+ }
}
- if (carrier)
- oper_state = "carrier";
- else if (dormant)
- oper_state = "dormant";
+ operstate_str = link_operstate_to_string(operstate);
+ assert(operstate_str);
r = fopen_temporary(m->state_file, &f, &temp_path);
if (r < 0)
- goto finish;
+ return r;
fchmod(fileno(f), 0644);
fprintf(f,
"# This is private data. Do not parse.\n"
- "OPER_STATE=%s\n", oper_state);
+ "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);
+ }
- fflush(f);
+ if (!set_isempty(ntp)) {
+ bool space = false;
+ char *p;
- if (ferror(f) || rename(temp_path, m->state_file) < 0) {
- r = -errno;
- unlink(m->state_file);
- unlink(temp_path);
+ fputs("NTP=", f);
+ SET_FOREACH(p, ntp, i) {
+ if (space)
+ fputc(' ', f);
+ fputs(p, f);
+ space = true;
+ }
+ fputc('\n', f);
}
-finish:
+ r = fflush_and_check(f);
if (r < 0)
- log_error("Failed to save network state to %s: %s", m->state_file, strerror(-r));
+ goto fail;
+
+ if (rename(temp_path, m->state_file) < 0) {
+ r = -errno;
+ goto fail;
+ }
+ return 0;
+
+fail:
+ log_error("Failed to save network state to %s: %s", m->state_file, strerror(-r));
+ unlink(m->state_file);
+ unlink(temp_path);
return r;
}
+
+int manager_address_pool_acquire(Manager *m, int family, unsigned prefixlen, union in_addr_union *found) {
+ AddressPool *p;
+ int r;
+
+ assert(m);
+ assert(prefixlen > 0);
+ assert(found);
+
+ LIST_FOREACH(address_pools, p, m->address_pools) {
+ if (p->family != family)
+ continue;
+
+ r = address_pool_acquire(p, prefixlen, found);
+ if (r != 0)
+ return r;
+ }
+
+ return 0;
+}