X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=src%2Fnetwork%2Fnetworkd-manager.c;h=223cb2a75aa5e7de77f8afaecc3c3dc51b0b3d1d;hp=013b1dc97561482bbf976cc5cdd0d5681d2218ff;hb=ae06ab1014641feb83ffd0d08f0957e69bbbae08;hpb=d4920165fe753751aaa274fdc568927d26284eea
diff --git a/src/network/networkd-manager.c b/src/network/networkd-manager.c
index 013b1dc97..223cb2a75 100644
--- a/src/network/networkd-manager.c
+++ b/src/network/networkd-manager.c
@@ -19,12 +19,13 @@
along with systemd; If not, see .
***/
-#include
+#include
#include
-#include
+#include "conf-parser.h"
#include "path-util.h"
#include "networkd.h"
+#include "networkd-netdev.h"
#include "network-internal.h"
#include "libudev-private.h"
#include "udev-util.h"
@@ -43,69 +44,29 @@ 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;
-
- 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;
+static int setup_default_address_pool(Manager *m) {
+ AddressPool *p;
int r;
assert(m);
- assert_se(sigemptyset(&mask) == 0);
- sigset_add_many(&mask, SIGINT, SIGTERM, -1);
- assert_se(sigprocmask(SIG_SETMASK, &mask, NULL) == 0);
+ /* Add in the well-known private address ranges. */
- r = sd_event_add_signal(m->event, &m->sigterm_event_source, SIGTERM, dispatch_sigterm, m);
+ r = address_pool_new_from_string(m, &p, AF_INET6, "fc00::", 7);
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, "192.168.0.0", 16);
if (r < 0)
return r;
- return 0;
-}
-
-static int set_fallback_dns(Manager *m, const char *string) {
- char *word, *state;
- size_t length;
- int r;
-
- assert(m);
- assert(string);
-
- FOREACH_WORD_QUOTED(word, length, string, state) {
- _cleanup_address_free_ Address *address = NULL;
- Address *tail;
- _cleanup_free_ char *addrstr = NULL;
-
- r = address_new_dynamic(&address);
- if (r < 0)
- return r;
-
- addrstr = strndup(word, length);
- if (!addrstr)
- return -ENOMEM;
-
- r = net_parse_inaddr(addrstr, &address->family, &address->in_addr);
- if (r < 0) {
- log_debug("Ignoring invalid DNS address '%s'", addrstr);
- continue;
- }
+ r = address_pool_new_from_string(m, &p, AF_INET, "172.16.0.0", 12);
+ if (r < 0)
+ return r;
- LIST_FIND_TAIL(addresses, m->fallback_dns, tail);
- LIST_INSERT_AFTER(addresses, m->fallback_dns, tail, address);
- address = NULL;
- }
+ r = address_pool_new_from_string(m, &p, AF_INET, "10.0.0.0", 8);
+ if (r < 0)
+ return r;
return 0;
}
@@ -118,20 +79,19 @@ 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;
- r = set_fallback_dns(m, DNS_SERVERS);
- if (r < 0)
- return r;
-
r = sd_event_default(&m->event);
if (r < 0)
return r;
sd_event_set_watchdog(m->event, true);
+ 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)
@@ -141,10 +101,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 */
@@ -158,20 +114,16 @@ int manager_new(Manager **ret) {
return -ENOMEM;
}
- m->kmod_ctx = kmod_new(NULL, NULL);
- if (!m->kmod_ctx)
- 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;
@@ -182,13 +134,13 @@ void manager_free(Manager *m) {
Network *network;
NetDev *netdev;
Link *link;
+ AddressPool *pool;
if (!m)
return;
free(m->state_file);
- kmod_unref(m->kmod_ctx);
udev_monitor_unref(m->udev_monitor);
udev_unref(m->udev);
sd_bus_unref(m->bus);
@@ -208,6 +160,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);
@@ -268,7 +223,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);
@@ -301,7 +256,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;
}
}
@@ -419,6 +375,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;
@@ -457,109 +415,13 @@ 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;
- int r;
-
- assert(m);
-
- r = fopen_temporary("/run/systemd/network/resolv.conf", &f, &temp_path);
- 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);
- }
- }
-
- 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);
- }
- }
- }
-
- HASHMAP_FOREACH(link, m->links, i) {
- if (link->network && link->network->dns) {
- Address *address;
-
- LIST_FOREACH(addresses, address, link->network->dns) {
- append_dns(f, &address->in_addr.in,
- address->family, &count);
- }
- }
- }
-
- if (!count) {
- Address *address;
-
- LIST_FOREACH(addresses, address, m->fallback_dns)
- append_dns(f, &address->in_addr.in,
- address->family, &count);
- }
-
- fflush(f);
-
- 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;
- }
-
- return 0;
-}
-
int manager_save(Manager *m) {
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_UNKNOWN;
+ const char *operstate_str;
int r;
assert(m);
@@ -569,16 +431,12 @@ int manager_save(Manager *m) {
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 (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)
@@ -588,7 +446,7 @@ int manager_save(Manager *m) {
fprintf(f,
"# This is private data. Do not parse.\n"
- "OPER_STATE=%s\n", oper_state);
+ "OPER_STATE=%s\n", operstate_str);
fflush(f);
@@ -604,3 +462,23 @@ finish:
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;
+}