#include <sys/socket.h>
#include <linux/if.h>
-#include <libkmod.h>
#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"
#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;
-}
+ /* Add in the well-known private address ranges. */
-static int setup_signals(Manager *m) {
- sigset_t mask;
- int r;
-
- 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;
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;
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)
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 */
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;
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);
netdev_unref(netdev);
hashmap_free(m->netdevs);
+ while ((pool = m->address_pools))
+ address_pool_free(pool);
+
sd_rtnl_unref(m->rtnl);
free(m);
Link *link = NULL;
NetDev *netdev = NULL;
uint16_t type;
- char *name;
+ const char *name;
int r, ifindex;
assert(rtnl);
/* 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;
}
}
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;
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;
_cleanup_fclose_ FILE *f = NULL;
- LinkOperationalState operstate = LINK_OPERSTATE_UNKNOWN;
+ 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->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);
r = fopen_temporary(m->state_file, &f, &temp_path);
if (r < 0)
- goto finish;
+ return r;
fchmod(fileno(f), 0644);
"# This is private data. Do not parse.\n"
"OPER_STATE=%s\n", operstate_str);
- fflush(f);
+ if (!set_isempty(dns)) {
+ 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("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);
}
-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;
+}
~ianmdlvl / elogind.git / blobdiff