X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=src%2Fnetwork%2Fnetworkd-link.c;h=d929a8012919ea69a6a854fcb1b89d8b5961bf98;hp=37a572dc0fd28006c7204a9329e8a284d5bd6276;hb=c6d3b3034acf1faec43b1281d3c7b94c23eb69d1;hpb=19befb2d5fc087f96e40ddc432b2cc9385666209 diff --git a/src/network/networkd-link.c b/src/network/networkd-link.c index 37a572dc0..d929a8012 100644 --- a/src/network/networkd-link.c +++ b/src/network/networkd-link.c @@ -21,29 +21,27 @@ #include #include +#include -#include "networkd.h" +#include "networkd-link.h" +#include "networkd-netdev.h" #include "libudev-private.h" #include "udev-util.h" #include "util.h" #include "virt.h" #include "bus-util.h" #include "network-internal.h" +#include "conf-parser.h" -#include "network-util.h" #include "dhcp-lease-internal.h" -static int ipv4ll_address_update(Link *link, bool deprecate); -static bool ipv4ll_is_bound(sd_ipv4ll *ll); - static int link_new(Manager *manager, sd_rtnl_message *message, Link **ret) { _cleanup_link_unref_ Link *link = NULL; uint16_t type; - char *ifname; + const char *ifname; int r, ifindex; assert(manager); - assert(manager->links); assert(message); assert(ret); @@ -69,23 +67,31 @@ static int link_new(Manager *manager, sd_rtnl_message *message, Link **ret) { link->n_ref = 1; link->manager = manager; - link->state = LINK_STATE_INITIALIZING; + link->state = LINK_STATE_PENDING; link->ifindex = ifindex; link->ifname = strdup(ifname); if (!link->ifname) return -ENOMEM; - r = asprintf(&link->state_file, "/run/systemd/network/links/%"PRIu64, + r = sd_rtnl_message_read_ether_addr(message, IFLA_ADDRESS, &link->mac); + if (r < 0) + log_debug_link(link, "MAC address not found for new device, continuing without"); + + r = asprintf(&link->state_file, "/run/systemd/netif/links/%d", link->ifindex); if (r < 0) return -ENOMEM; - r = asprintf(&link->lease_file, "/run/systemd/network/leases/%"PRIu64, + r = asprintf(&link->lease_file, "/run/systemd/netif/leases/%d", link->ifindex); if (r < 0) return -ENOMEM; - r = hashmap_put(manager->links, &link->ifindex, link); + r = hashmap_ensure_allocated(&manager->links, NULL, NULL); + if (r < 0) + return r; + + r = hashmap_put(manager->links, INT_TO_PTR(link->ifindex), link); if (r < 0) return r; @@ -96,10 +102,20 @@ static int link_new(Manager *manager, sd_rtnl_message *message, Link **ret) { } static void link_free(Link *link) { + Address *address; + if (!link) return; - assert(link->manager); + while ((address = link->addresses)) { + LIST_REMOVE(addresses, link->addresses, address); + address_free(address); + } + + while ((address = link->pool_addresses)) { + LIST_REMOVE(addresses, link->pool_addresses, address); + address_free(address); + } sd_dhcp_client_unref(link->dhcp_client); sd_dhcp_lease_unref(link->dhcp_lease); @@ -108,8 +124,11 @@ static void link_free(Link *link) { free(link->lease_file); sd_ipv4ll_unref(link->ipv4ll); + sd_dhcp6_client_unref(link->dhcp6_client); + sd_icmp6_nd_unref(link->icmp6_router_discovery); - hashmap_remove(link->manager->links, &link->ifindex); + if (link->manager) + hashmap_remove(link->manager->links, INT_TO_PTR(link->ifindex)); free(link->ifname); @@ -137,15 +156,12 @@ Link *link_ref(Link *link) { int link_get(Manager *m, int ifindex, Link **ret) { Link *link; - uint64_t ifindex_64; assert(m); - assert(m->links); assert(ifindex); assert(ret); - ifindex_64 = ifindex; - link = hashmap_get(m->links, &ifindex_64); + link = hashmap_get(m->links, INT_TO_PTR(ifindex)); if (!link) return -ENODEV; @@ -167,19 +183,6 @@ void link_drop(Link *link) { return; } -static int link_enter_configured(Link *link) { - assert(link); - assert(link->state == LINK_STATE_SETTING_ROUTES); - - log_info_link(link, "link configured"); - - link->state = LINK_STATE_CONFIGURED; - - link_save(link); - - return 0; -} - static void link_enter_unmanaged(Link *link) { assert(link); @@ -200,22 +203,49 @@ static int link_stop_clients(Link *link) { if (!link->network) return 0; - if (link->network->dhcp) { - assert(link->dhcp_client); - + if (link->dhcp_client) { k = sd_dhcp_client_stop(link->dhcp_client); if (k < 0) { - log_warning_link(link, "Could not stop DHCPv4 client: %s", strerror(-r)); + log_warning_link(link, "Could not stop DHCPv4 client: %s", + strerror(-r)); r = k; } } - if (link->network->ipv4ll) { - assert(link->ipv4ll); - + if (link->ipv4ll) { k = sd_ipv4ll_stop(link->ipv4ll); if (k < 0) { - log_warning_link(link, "Could not stop IPv4 link-local: %s", strerror(-r)); + log_warning_link(link, "Could not stop IPv4 link-local: %s", + strerror(-r)); + r = k; + } + } + + if (link->dhcp_server) { + k = sd_dhcp_server_stop(link->dhcp_server); + if (k < 0) { + log_warning_link(link, "Could not stop DHCPv4 server: %s", + strerror(-r)); + r = k; + } + } + + if(link->icmp6_router_discovery) { + + if (link->dhcp6_client) { + k = sd_dhcp6_client_stop(link->dhcp6_client); + if (k < 0) { + log_warning_link(link, "Could not stop DHCPv6 client: %s", + strerror(-r)); + r = k; + } + } + + k = sd_icmp6_nd_stop(link->icmp6_router_discovery); + if (k < 0) { + log_warning_link(link, + "Could not stop ICMPv6 router discovery: %s", + strerror(-r)); r = k; } } @@ -223,7 +253,7 @@ static int link_stop_clients(Link *link) { return r; } -static void link_enter_failed(Link *link) { +void link_enter_failed(Link *link) { assert(link); if (IN_SET(link->state, LINK_STATE_FAILED, LINK_STATE_LINGER)) @@ -238,233 +268,272 @@ static void link_enter_failed(Link *link) { link_save(link); } -static int route_handler(sd_rtnl *rtnl, sd_rtnl_message *m, void *userdata) { - Link *link = userdata; - int r; +static Address* link_find_dhcp_server_address(Link *link) { + Address *address; - assert(link->route_messages > 0); - assert(IN_SET(link->state, LINK_STATE_SETTING_ADDRESSES, - LINK_STATE_SETTING_ROUTES, LINK_STATE_FAILED, - LINK_STATE_LINGER)); + assert(link); + assert(link->network); - link->route_messages --; + /* The the first statically configured address if there is any */ + LIST_FOREACH(addresses, address, link->network->static_addresses) { - if (IN_SET(LINK_STATE_FAILED, LINK_STATE_LINGER)) { - link_unref(link); - return 1; - } + if (address->family != AF_INET) + continue; - r = sd_rtnl_message_get_errno(m); - if (r < 0 && r != -EEXIST) - log_struct_link(LOG_WARNING, link, - "MESSAGE=%s: could not set route: %s", - link->ifname, strerror(-r), - "ERRNO=%d", -r, - NULL); + if (in_addr_is_null(address->family, &address->in_addr)) + continue; - /* we might have received an old reply after moving back to SETTING_ADDRESSES, - * ignore it */ - if (link->route_messages == 0 && link->state == LINK_STATE_SETTING_ROUTES) { - log_debug_link(link, "routes set"); - link_enter_configured(link); + return address; } - link_unref(link); + /* If that didn't work, find a suitable address we got from the pool */ + LIST_FOREACH(addresses, address, link->pool_addresses) { + if (address->family != AF_INET) + continue; - return 1; + return address; + } + + return NULL; } -static int link_enter_set_routes(Link *link) { - Route *rt; +static int link_enter_configured(Link *link) { int r; assert(link); assert(link->network); - assert(link->state == LINK_STATE_SETTING_ADDRESSES); - - link->state = LINK_STATE_SETTING_ROUTES; - - if (!link->network->static_routes && !link->dhcp_lease && - (!link->ipv4ll || ipv4ll_is_bound(link->ipv4ll) == false)) - return link_enter_configured(link); + assert(link->state == LINK_STATE_SETTING_ROUTES); - log_debug_link(link, "setting routes"); + if (link->network->dhcp_server && + !sd_dhcp_server_is_running(link->dhcp_server)) { + struct in_addr pool_start; + Address *address; - LIST_FOREACH(static_routes, rt, link->network->static_routes) { - r = route_configure(rt, link, &route_handler); - if (r < 0) { + address = link_find_dhcp_server_address(link); + if (!address) { log_warning_link(link, - "could not set routes: %s", strerror(-r)); + "Failed to find suitable address for DHCPv4 server instance."); link_enter_failed(link); - return r; + return 0; } - link_ref(link); - link->route_messages ++; - } + log_debug_link(link, "offering DHCPv4 leases"); - if (link->ipv4ll && !link->dhcp_lease) { - _cleanup_route_free_ Route *route = NULL; - struct in_addr addr; + r = sd_dhcp_server_set_address(link->dhcp_server, + &address->in_addr.in, + address->prefixlen); + if (r < 0) + return r; - r = sd_ipv4ll_get_address(link->ipv4ll, &addr); - if (r < 0 && r != -ENOENT) { - log_warning_link(link, "IPV4LL error: no address: %s", - strerror(-r)); + /* offer 32 addresses starting from the address following the server address */ + pool_start.s_addr = htobe32(be32toh(address->in_addr.in.s_addr) + 1); + r = sd_dhcp_server_set_lease_pool(link->dhcp_server, + &pool_start, 32); + if (r < 0) return r; - } - if (r != -ENOENT) { - r = route_new_dynamic(&route); - if (r < 0) { - log_error_link(link, "Could not allocate route: %s", - strerror(-r)); - return r; - } + /* TODO: + r = sd_dhcp_server_set_router(link->dhcp_server, + &main_address->in_addr.in); + if (r < 0) + return r; - route->family = AF_INET; - route->scope = RT_SCOPE_LINK; - route->metrics = 99; + r = sd_dhcp_server_set_prefixlen(link->dhcp_server, + main_address->prefixlen); + if (r < 0) + return r; + */ - r = route_configure(route, link, &route_handler); - if (r < 0) { - log_warning_link(link, - "could not set routes: %s", strerror(-r)); - link_enter_failed(link); - return r; - } + r = sd_dhcp_server_start(link->dhcp_server); + if (r < 0) { + log_warning_link(link, "could not start DHCPv4 server " + "instance: %s", strerror(-r)); - link_ref(link); - link->route_messages ++; + link_enter_failed(link); + + return 0; } } - if (link->dhcp_lease) { - _cleanup_route_free_ Route *route = NULL; - _cleanup_route_free_ Route *route_gw = NULL; - struct in_addr gateway; + log_info_link(link, "link configured"); - r = sd_dhcp_lease_get_router(link->dhcp_lease, &gateway); - if (r < 0 && r != -ENOENT) { - log_warning_link(link, "DHCP error: %s", strerror(-r)); - return r; - } + link->state = LINK_STATE_CONFIGURED; - if (r >= 0) { - r = route_new_dynamic(&route); - if (r < 0) { - log_error_link(link, "Could not allocate route: %s", - strerror(-r)); - return r; - } + link_save(link); - r = route_new_dynamic(&route_gw); - if (r < 0) { - log_error_link(link, "Could not allocate route: %s", - strerror(-r)); - return r; - } + return 0; +} - /* The dhcp netmask may mask out the gateway. Add an explicit - * route for the gw host so that we can route no matter the - * netmask or existing kernel route tables. */ - route_gw->family = AF_INET; - route_gw->dst_addr.in = gateway; - route_gw->dst_prefixlen = 32; - route_gw->scope = RT_SCOPE_LINK; +void link_client_handler(Link *link) { + assert(link); + assert(link->network); - r = route_configure(route_gw, link, &route_handler); - if (r < 0) { - log_warning_link(link, - "could not set host route: %s", strerror(-r)); - return r; - } + if (!link->static_configured) + return; - link_ref(link); - link->route_messages ++; + if (link->network->ipv4ll) + if (!link->ipv4ll_address || + !link->ipv4ll_route) + return; - route->family = AF_INET; - route->in_addr.in = gateway; + if (IN_SET(link->network->dhcp, DHCP_SUPPORT_BOTH, DHCP_SUPPORT_V4)) + if (!link->dhcp4_configured) + return; - r = route_configure(route, link, &route_handler); - if (r < 0) { - log_warning_link(link, - "could not set routes: %s", strerror(-r)); - link_enter_failed(link); - return r; - } + link_enter_configured(link); - link_ref(link); - link->route_messages ++; - } + return; +} + +static int route_handler(sd_rtnl *rtnl, sd_rtnl_message *m, void *userdata) { + _cleanup_link_unref_ Link *link = userdata; + int r; + + assert(link->link_messages > 0); + assert(IN_SET(link->state, LINK_STATE_SETTING_ADDRESSES, + LINK_STATE_SETTING_ROUTES, LINK_STATE_FAILED, + LINK_STATE_LINGER)); + + link->link_messages --; + + if (IN_SET(link->state, LINK_STATE_FAILED, LINK_STATE_LINGER)) + return 1; + + r = sd_rtnl_message_get_errno(m); + if (r < 0 && r != -EEXIST) + log_struct_link(LOG_WARNING, link, + "MESSAGE=%-*s: could not set route: %s", + IFNAMSIZ, + link->ifname, strerror(-r), + "ERRNO=%d", -r, + NULL); + + if (link->link_messages == 0) { + log_debug_link(link, "routes set"); + link->static_configured = true; + link_client_handler(link); } - if (link->route_messages == 0) { - link_enter_configured(link); + return 1; +} + +static int link_enter_set_routes(Link *link) { + Route *rt; + int r; + + assert(link); + assert(link->network); + assert(link->state == LINK_STATE_SETTING_ADDRESSES); + + link->state = LINK_STATE_SETTING_ROUTES; + + LIST_FOREACH(routes, rt, link->network->static_routes) { + r = route_configure(rt, link, &route_handler); + if (r < 0) { + log_warning_link(link, + "could not set routes: %s", + strerror(-r)); + link_enter_failed(link); + return r; + } + + link->link_messages ++; } + if (link->link_messages == 0) { + link->static_configured = true; + link_client_handler(link); + } else + log_debug_link(link, "setting routes"); + return 0; } -static int route_drop_handler(sd_rtnl *rtnl, sd_rtnl_message *m, void *userdata) { - Link *link = userdata; +int link_route_drop_handler(sd_rtnl *rtnl, sd_rtnl_message *m, void *userdata) { + _cleanup_link_unref_ Link *link = userdata; int r; assert(m); assert(link); assert(link->ifname); - if (IN_SET(link->state, LINK_STATE_FAILED, LINK_STATE_LINGER)) { - link_unref(link); + if (IN_SET(link->state, LINK_STATE_FAILED, LINK_STATE_LINGER)) return 1; - } r = sd_rtnl_message_get_errno(m); if (r < 0 && r != -ESRCH) log_struct_link(LOG_WARNING, link, - "MESSAGE=%s: could not drop route: %s", + "MESSAGE=%-*s: could not drop route: %s", + IFNAMSIZ, link->ifname, strerror(-r), "ERRNO=%d", -r, NULL); - link_unref(link); + return 1; +} - return 0; +int link_get_address_handler(sd_rtnl *rtnl, sd_rtnl_message *m, void *userdata) { + _cleanup_link_unref_ Link *link = userdata; + int r; + + assert(rtnl); + assert(m); + assert(link); + assert(link->manager); + + for (; m; m = sd_rtnl_message_next(m)) { + r = sd_rtnl_message_get_errno(m); + if (r < 0) { + log_debug_link(link, "getting address failed: %s", + strerror(-r)); + continue; + } + + r = link_rtnl_process_address(rtnl, m, link->manager); + if (r < 0) + log_warning_link(link, "could not process address: %s", + strerror(-r)); + } + + return 1; } static int address_handler(sd_rtnl *rtnl, sd_rtnl_message *m, void *userdata) { - Link *link = userdata; + _cleanup_link_unref_ Link *link = userdata; int r; + assert(rtnl); assert(m); assert(link); assert(link->ifname); - assert(link->addr_messages > 0); + assert(link->link_messages > 0); assert(IN_SET(link->state, LINK_STATE_SETTING_ADDRESSES, LINK_STATE_FAILED, LINK_STATE_LINGER)); - link->addr_messages --; + link->link_messages --; - if (IN_SET(link->state, LINK_STATE_FAILED, LINK_STATE_LINGER)) { - link_unref(link); + if (IN_SET(link->state, LINK_STATE_FAILED, LINK_STATE_LINGER)) return 1; - } r = sd_rtnl_message_get_errno(m); if (r < 0 && r != -EEXIST) log_struct_link(LOG_WARNING, link, - "MESSAGE=%s: could not set address: %s", + "MESSAGE=%-*s: could not set address: %s", + IFNAMSIZ, link->ifname, strerror(-r), "ERRNO=%d", -r, NULL); + else if (r >= 0) { + /* calling handler directly so take a ref */ + link_ref(link); + link_get_address_handler(rtnl, m, link); + } - if (link->addr_messages == 0) { + if (link->link_messages == 0) { log_debug_link(link, "addresses set"); link_enter_set_routes(link); } - link_unref(link); - return 1; } @@ -478,184 +547,71 @@ static int link_enter_set_addresses(Link *link) { link->state = LINK_STATE_SETTING_ADDRESSES; - if (!link->network->static_addresses && !link->dhcp_lease && - (!link->ipv4ll || ipv4ll_is_bound(link->ipv4ll) == false)) - return link_enter_set_routes(link); - - log_debug_link(link, "setting addresses"); - - LIST_FOREACH(static_addresses, ad, link->network->static_addresses) { + LIST_FOREACH(addresses, ad, link->network->static_addresses) { r = address_configure(ad, link, &address_handler); if (r < 0) { log_warning_link(link, - "could not set addresses: %s", strerror(-r)); - link_enter_failed(link); - return r; - } - - link_ref(link); - link->addr_messages ++; - } - - if (link->ipv4ll && !link->dhcp_lease) { - _cleanup_address_free_ Address *ll_addr = NULL; - struct in_addr addr; - - r = sd_ipv4ll_get_address(link->ipv4ll, &addr); - if (r < 0 && r != -ENOENT) { - log_warning_link(link, "IPV4LL error: no address: %s", - strerror(-r)); - return r; - } - - if (r != -ENOENT) { - r = address_new_dynamic(&ll_addr); - if (r < 0) { - log_error_link(link, "Could not allocate address: %s", strerror(-r)); - return r; - } - - ll_addr->family = AF_INET; - ll_addr->in_addr.in = addr; - ll_addr->prefixlen = 16; - ll_addr->broadcast.s_addr = ll_addr->in_addr.in.s_addr | htonl(0xfffffffflu >> ll_addr->prefixlen); - ll_addr->scope = RT_SCOPE_LINK; - - r = address_configure(ll_addr, link, &address_handler); - if (r < 0) { - log_warning_link(link, - "could not set addresses: %s", strerror(-r)); - link_enter_failed(link); - return r; - } - - link_ref(link); - link->addr_messages ++; - } - } - - if (link->dhcp_lease) { - _cleanup_address_free_ Address *address = NULL; - struct in_addr addr; - struct in_addr netmask; - unsigned prefixlen; - - r = sd_dhcp_lease_get_address(link->dhcp_lease, &addr); - if (r < 0) { - log_warning_link(link, "DHCP error: no address: %s", + "could not set addresses: %s", strerror(-r)); - return r; - } - - r = sd_dhcp_lease_get_netmask(link->dhcp_lease, &netmask); - if (r < 0) { - log_warning_link(link, "DHCP error: no netmask: %s", - strerror(-r)); - return r; - } - - prefixlen = net_netmask_to_prefixlen(&netmask); - - r = address_new_dynamic(&address); - if (r < 0) { - log_error_link(link, "Could not allocate address: %s", - strerror(-r)); - return r; - } - - address->family = AF_INET; - address->in_addr.in = addr; - address->prefixlen = prefixlen; - address->broadcast.s_addr = addr.s_addr | ~netmask.s_addr; - - r = address_configure(address, link, &address_handler); - if (r < 0) { - log_warning_link(link, - "could not set addresses: %s", strerror(-r)); link_enter_failed(link); return r; } - link_ref(link); - link->addr_messages ++; + link->link_messages ++; } - return 0; -} - -static int address_update_handler(sd_rtnl *rtnl, sd_rtnl_message *m, void *userdata) { - Link *link = userdata; - int r; - - assert(m); - assert(link); - assert(link->ifname); - - if (IN_SET(link->state, LINK_STATE_FAILED, LINK_STATE_LINGER)) { - link_unref(link); - return 1; - } - - r = sd_rtnl_message_get_errno(m); - if (r < 0 && r != -ENOENT) - log_struct_link(LOG_WARNING, link, - "MESSAGE=%s: could not update address: %s", - link->ifname, strerror(-r), - "ERRNO=%d", -r, - NULL); - - link_unref(link); + if (link->link_messages == 0) { + link_enter_set_routes(link); + } else + log_debug_link(link, "setting addresses"); return 0; } -static int address_drop_handler(sd_rtnl *rtnl, sd_rtnl_message *m, void *userdata) { - Link *link = userdata; +int link_address_drop_handler(sd_rtnl *rtnl, sd_rtnl_message *m, void *userdata) { + _cleanup_link_unref_ Link *link = userdata; int r; assert(m); assert(link); assert(link->ifname); - if (IN_SET(link->state, LINK_STATE_FAILED, LINK_STATE_LINGER)) { - link_unref(link); + if (IN_SET(link->state, LINK_STATE_FAILED, LINK_STATE_LINGER)) return 1; - } r = sd_rtnl_message_get_errno(m); if (r < 0 && r != -EADDRNOTAVAIL) log_struct_link(LOG_WARNING, link, - "MESSAGE=%s: could not drop address: %s", + "MESSAGE=%-*s: could not drop address: %s", + IFNAMSIZ, link->ifname, strerror(-r), "ERRNO=%d", -r, NULL); - link_unref(link); - - return 0; + return 1; } -static int set_hostname_handler(sd_bus *bus, sd_bus_message *m, void *userdata, sd_bus_error *ret_error) { - Link *link = userdata; +static int set_hostname_handler(sd_bus *bus, sd_bus_message *m, void *userdata, + sd_bus_error *ret_error) { + _cleanup_link_unref_ Link *link = userdata; int r; assert(link); - if (IN_SET(link->state, LINK_STATE_FAILED, LINK_STATE_LINGER)) { - link_unref(link); + if (IN_SET(link->state, LINK_STATE_FAILED, LINK_STATE_LINGER)) return 1; - } r = sd_bus_message_get_errno(m); if (r < 0) - log_warning("Could not set hostname: %s", strerror(-r)); - - link_unref(link); + r = -r; + if (r > 0) + log_warning_link(link, "Could not set hostname: %s", + strerror(r)); return 1; } -static int link_set_hostname(Link *link, const char *hostname) { +int link_set_hostname(Link *link, const char *hostname) { _cleanup_bus_message_unref_ sd_bus_message *m = NULL; int r = 0; @@ -665,8 +621,10 @@ static int link_set_hostname(Link *link, const char *hostname) { log_debug_link(link, "Setting transient hostname: '%s'", hostname); - if (!link->manager->bus) { /* TODO: replace by assert when we can rely on kdbus */ - log_info_link(link, "Not connected to system bus, ignoring transient hostname."); + if (!link->manager->bus) { + /* TODO: replace by assert when we can rely on kdbus */ + log_info_link(link, + "Not connected to system bus, ignoring transient hostname."); return 0; } @@ -684,42 +642,42 @@ static int link_set_hostname(Link *link, const char *hostname) { if (r < 0) return r; - r = sd_bus_call_async(link->manager->bus, NULL, m, set_hostname_handler, link, 0); - if (r < 0) - log_error_link(link, "Could not set transient hostname: %s", strerror(-r)); + r = sd_bus_call_async(link->manager->bus, NULL, m, set_hostname_handler, + link, 0); + if (r < 0) { + log_error_link(link, "Could not set transient hostname: %s", + strerror(-r)); + return r; + } link_ref(link); - return r; + return 0; } static int set_mtu_handler(sd_rtnl *rtnl, sd_rtnl_message *m, void *userdata) { - Link *link = userdata; + _cleanup_link_unref_ Link *link = userdata; int r; assert(m); assert(link); assert(link->ifname); - if (IN_SET(link->state, LINK_STATE_FAILED, LINK_STATE_LINGER)) { - link_unref(link); + if (IN_SET(link->state, LINK_STATE_FAILED, LINK_STATE_LINGER)) return 1; - } r = sd_rtnl_message_get_errno(m); if (r < 0) log_struct_link(LOG_WARNING, link, - "MESSAGE=%s: could not set MTU: %s", - link->ifname, strerror(-r), + "MESSAGE=%-*s: could not set MTU: %s", + IFNAMSIZ, link->ifname, strerror(-r), "ERRNO=%d", -r, NULL); - link_unref(link); - return 1; } -static int link_set_mtu(Link *link, uint32_t mtu) { +int link_set_mtu(Link *link, uint32_t mtu) { _cleanup_rtnl_message_unref_ sd_rtnl_message *req = NULL; int r; @@ -742,404 +700,51 @@ static int link_set_mtu(Link *link, uint32_t mtu) { return r; } - r = sd_rtnl_call_async(link->manager->rtnl, req, set_mtu_handler, link, 0, NULL); + r = sd_rtnl_call_async(link->manager->rtnl, req, set_mtu_handler, link, + 0, NULL); if (r < 0) { log_error_link(link, - "Could not send rtnetlink message: %s", strerror(-r)); - return r; - } - - link_unref(link); - - return 0; -} - -static int dhcp_lease_lost(Link *link) { - _cleanup_address_free_ Address *address = NULL; - _cleanup_route_free_ Route *route_gw = NULL; - _cleanup_route_free_ Route *route = NULL; - struct in_addr addr; - struct in_addr netmask; - struct in_addr gateway; - unsigned prefixlen; - int r; - - assert(link); - assert(link->dhcp_lease); - - log_warning_link(link, "DHCP lease lost"); - - r = address_new_dynamic(&address); - if (r >= 0) { - r = sd_dhcp_lease_get_router(link->dhcp_lease, &gateway); - if (r >= 0) { - r = route_new_dynamic(&route_gw); - if (r >= 0) { - route_gw->family = AF_INET; - route_gw->dst_addr.in = gateway; - route_gw->dst_prefixlen = 32; - route_gw->scope = RT_SCOPE_LINK; - - route_drop(route_gw, link, &route_drop_handler); - link_ref(link); - } - - r = route_new_dynamic(&route); - if (r >= 0) { - route->family = AF_INET; - route->in_addr.in = gateway; - - route_drop(route, link, &route_drop_handler); - link_ref(link); - } - } - - sd_dhcp_lease_get_address(link->dhcp_lease, &addr); - sd_dhcp_lease_get_netmask(link->dhcp_lease, &netmask); - prefixlen = net_netmask_to_prefixlen(&netmask); - - address->family = AF_INET; - address->in_addr.in = addr; - address->prefixlen = prefixlen; - - address_drop(address, link, &address_drop_handler); - link_ref(link); - } - - if (link->network->dhcp_mtu) { - uint16_t mtu; - - r = sd_dhcp_lease_get_mtu(link->dhcp_lease, &mtu); - if (r >= 0 && link->original_mtu != mtu) { - r = link_set_mtu(link, link->original_mtu); - if (r < 0) { - log_warning_link(link, "DHCP error: could not reset MTU"); - link_enter_failed(link); - return r; - } - } - } - - if (link->network->dhcp_hostname) { - const char *hostname = NULL; - - r = sd_dhcp_lease_get_hostname(link->dhcp_lease, &hostname); - if (r >= 0 && hostname) { - r = link_set_hostname(link, ""); - if (r < 0) - log_error("Failed to reset transient hostname"); - } - } - - link->dhcp_lease = sd_dhcp_lease_unref(link->dhcp_lease); - - return 0; -} - -static int dhcp_lease_acquired(sd_dhcp_client *client, Link *link) { - sd_dhcp_lease *lease; - struct in_addr address; - struct in_addr netmask; - struct in_addr gateway; - unsigned prefixlen; - struct in_addr *nameservers; - size_t nameservers_size; - int r; - - assert(client); - assert(link); - - r = sd_dhcp_client_get_lease(client, &lease); - if (r < 0) { - log_warning_link(link, "DHCP error: no lease: %s", - strerror(-r)); - return r; - } - - r = sd_dhcp_lease_get_address(lease, &address); - if (r < 0) { - log_warning_link(link, "DHCP error: no address: %s", - strerror(-r)); + "Could not send rtnetlink message: %s", + strerror(-r)); return r; } - r = sd_dhcp_lease_get_netmask(lease, &netmask); - if (r < 0) { - log_warning_link(link, "DHCP error: no netmask: %s", - strerror(-r)); - return r; - } - - prefixlen = net_netmask_to_prefixlen(&netmask); - - r = sd_dhcp_lease_get_router(lease, &gateway); - if (r < 0 && r != -ENOENT) { - log_warning_link(link, "DHCP error: %s", strerror(-r)); - return r; - } - - if (r >= 0) - log_struct_link(LOG_INFO, link, - "MESSAGE=%s: DHCPv4 address %u.%u.%u.%u/%u via %u.%u.%u.%u", - link->ifname, - ADDRESS_FMT_VAL(address), - prefixlen, - ADDRESS_FMT_VAL(gateway), - "ADDRESS=%u.%u.%u.%u", - ADDRESS_FMT_VAL(address), - "PREFIXLEN=%u", - prefixlen, - "GATEWAY=%u.%u.%u.%u", - ADDRESS_FMT_VAL(gateway), - NULL); - else - log_struct_link(LOG_INFO, link, - "MESSAGE=%s: DHCPv4 address %u.%u.%u.%u/%u", - link->ifname, - ADDRESS_FMT_VAL(address), - prefixlen, - "ADDRESS=%u.%u.%u.%u", - ADDRESS_FMT_VAL(address), - "PREFIXLEN=%u", - prefixlen, - NULL); - - link->dhcp_lease = lease; - - if (link->network->dhcp_dns) { - r = sd_dhcp_lease_get_dns(lease, &nameservers, &nameservers_size); - if (r >= 0) { - r = manager_update_resolv_conf(link->manager); - if (r < 0) - log_error("Failed to update resolv.conf"); - } - } - - if (link->network->dhcp_mtu) { - uint16_t mtu; - - r = sd_dhcp_lease_get_mtu(lease, &mtu); - if (r >= 0) { - r = link_set_mtu(link, mtu); - if (r < 0) - log_error_link(link, "Failed to set MTU " - "to %" PRIu16, mtu); - } - } - - if (link->network->dhcp_hostname) { - const char *hostname; - - r = sd_dhcp_lease_get_hostname(lease, &hostname); - if (r >= 0) { - r = link_set_hostname(link, hostname); - if (r < 0) - log_error("Failed to set transient hostname " - "to '%s'", hostname); - } - } - - link_enter_set_addresses(link); + link_ref(link); return 0; } -static void dhcp_handler(sd_dhcp_client *client, int event, void *userdata) { +static void dhcp6_handler(sd_dhcp6_client *client, int event, void *userdata) { Link *link = userdata; - int r = 0; assert(link); assert(link->network); assert(link->manager); - if (IN_SET(link->state, LINK_STATE_FAILED, LINK_STATE_LINGER)) - return; - - switch (event) { - case DHCP_EVENT_NO_LEASE: - log_debug_link(link, "IP address in use."); - break; - case DHCP_EVENT_EXPIRED: - case DHCP_EVENT_STOP: - case DHCP_EVENT_IP_CHANGE: - if (link->network->dhcp_critical) { - log_error_link(link, "DHCPv4 connection considered system critical, " - "ignoring request to reconfigure it."); - return; - } - - if (link->dhcp_lease) { - r = dhcp_lease_lost(link); - if (r < 0) { - link_enter_failed(link); - return; - } - } - - if (event == DHCP_EVENT_IP_CHANGE) { - r = dhcp_lease_acquired(client, link); - if (r < 0) { - link_enter_failed(link); - return; - } - } - - if (event == DHCP_EVENT_EXPIRED && link->network->ipv4ll) { - if (!sd_ipv4ll_is_running(link->ipv4ll)) - r = sd_ipv4ll_start(link->ipv4ll); - else if (ipv4ll_is_bound(link->ipv4ll)) - r = ipv4ll_address_update(link, false); - if (r < 0) { - link_enter_failed(link); - return; - } - } - - break; - case DHCP_EVENT_IP_ACQUIRE: - r = dhcp_lease_acquired(client, link); - if (r < 0) { - link_enter_failed(link); - return; - } - if (link->ipv4ll) { - if (ipv4ll_is_bound(link->ipv4ll)) - r = ipv4ll_address_update(link, true); - else - r = sd_ipv4ll_stop(link->ipv4ll); - if (r < 0) { - link_enter_failed(link); - return; - } - } - break; - default: - if (event < 0) - log_warning_link(link, "DHCP error: %s", strerror(-event)); - else - log_warning_link(link, "DHCP unknown event: %d", event); - break; - } - - return; -} - -static int ipv4ll_address_update(Link *link, bool deprecate) { - int r; - struct in_addr addr; - - assert(link); - - r = sd_ipv4ll_get_address(link->ipv4ll, &addr); - if (r >= 0) { - _cleanup_address_free_ Address *address = NULL; - - log_debug_link(link, "IPv4 link-local %s %u.%u.%u.%u", - deprecate ? "deprecate" : "approve", - ADDRESS_FMT_VAL(addr)); - - r = address_new_dynamic(&address); - if (r < 0) { - log_error_link(link, "Could not allocate address: %s", strerror(-r)); - return r; - } - - address->family = AF_INET; - address->in_addr.in = addr; - address->prefixlen = 16; - address->scope = RT_SCOPE_LINK; - address->cinfo.ifa_prefered = deprecate ? 0 : CACHE_INFO_INFINITY_LIFE_TIME; - address->broadcast.s_addr = address->in_addr.in.s_addr | htonl(0xfffffffflu >> address->prefixlen); - - address_update(address, link, &address_update_handler); - link_ref(link); - } - - return 0; - -} - -static int ipv4ll_address_lost(Link *link) { - int r; - struct in_addr addr; - - assert(link); - - r = sd_ipv4ll_get_address(link->ipv4ll, &addr); - if (r >= 0) { - _cleanup_address_free_ Address *address = NULL; - _cleanup_route_free_ Route *route = NULL; - - log_debug_link(link, "IPv4 link-local release %u.%u.%u.%u", - ADDRESS_FMT_VAL(addr)); - - r = address_new_dynamic(&address); - if (r < 0) { - log_error_link(link, "Could not allocate address: %s", strerror(-r)); - return r; - } - - address->family = AF_INET; - address->in_addr.in = addr; - address->prefixlen = 16; - address->scope = RT_SCOPE_LINK; - - address_drop(address, link, &address_drop_handler); - link_ref(link); - - r = route_new_dynamic(&route); - if (r < 0) { - log_error_link(link, "Could not allocate route: %s", - strerror(-r)); - return r; - } - - route->family = AF_INET; - route->scope = RT_SCOPE_LINK; - route->metrics = 99; - - route_drop(route, link, &route_drop_handler); - link_ref(link); - } - - return 0; -} - -static bool ipv4ll_is_bound(sd_ipv4ll *ll) { - int r; - struct in_addr addr; - - assert(ll); - - r = sd_ipv4ll_get_address(ll, &addr); - if (r < 0) - return false; - return true; -} - -static int ipv4ll_address_claimed(sd_ipv4ll *ll, Link *link) { - struct in_addr address; - int r; - - assert(ll); - assert(link); - - r = sd_ipv4ll_get_address(ll, &address); - if (r < 0) - return r; + if (IN_SET(link->state, LINK_STATE_FAILED, LINK_STATE_LINGER)) + return; - log_struct_link(LOG_INFO, link, - "MESSAGE=%s: IPv4 link-local address %u.%u.%u.%u", - link->ifname, - ADDRESS_FMT_VAL(address), - NULL); + switch(event) { + case DHCP6_EVENT_STOP: + case DHCP6_EVENT_RESEND_EXPIRE: + case DHCP6_EVENT_RETRANS_MAX: + case DHCP6_EVENT_IP_ACQUIRE: + log_debug_link(link, "DHCPv6 event %d", event); - link_enter_set_addresses(link); + break; - return 0; + default: + if (event < 0) + log_warning_link(link, "DHCPv6 error: %s", + strerror(-event)); + else + log_warning_link(link, "DHCPv6 unknown event: %d", + event); + return; + } } -static void ipv4ll_handler(sd_ipv4ll *ll, int event, void *userdata){ +static void icmp6_router_handler(sd_icmp6_nd *nd, int event, void *userdata) { Link *link = userdata; int r; @@ -1151,28 +756,60 @@ static void ipv4ll_handler(sd_ipv4ll *ll, int event, void *userdata){ return; switch(event) { - case IPV4LL_EVENT_STOP: - case IPV4LL_EVENT_CONFLICT: - r = ipv4ll_address_lost(link); - if (r < 0) { - link_enter_failed(link); - return; - } - break; - case IPV4LL_EVENT_BIND: - r = ipv4ll_address_claimed(ll, link); - if (r < 0) { - link_enter_failed(link); - return; - } - break; - default: - if (event < 0) - log_warning_link(link, "IPv4 link-local error: %s", strerror(-event)); - else - log_warning_link(link, "IPv4 link-local unknown event: %d", event); - break; + case ICMP6_EVENT_ROUTER_ADVERTISMENT_NONE: + case ICMP6_EVENT_ROUTER_ADVERTISMENT_OTHER: + return; + + case ICMP6_EVENT_ROUTER_ADVERTISMENT_TIMEOUT: + case ICMP6_EVENT_ROUTER_ADVERTISMENT_MANAGED: + break; + + default: + if (event < 0) + log_warning_link(link, "ICMPv6 error: %s", + strerror(-event)); + else + log_warning_link(link, "ICMPv6 unknown event: %d", + event); + + return; + } + + if (link->dhcp6_client) + return; + + r = sd_dhcp6_client_new(&link->dhcp6_client); + if (r < 0) + return; + + r = sd_dhcp6_client_attach_event(link->dhcp6_client, NULL, 0); + if (r < 0) { + link->dhcp6_client = sd_dhcp6_client_unref(link->dhcp6_client); + return; } + + r = sd_dhcp6_client_set_mac(link->dhcp6_client, &link->mac); + if (r < 0) { + link->dhcp6_client = sd_dhcp6_client_unref(link->dhcp6_client); + return; + } + + r = sd_dhcp6_client_set_index(link->dhcp6_client, link->ifindex); + if (r < 0) { + link->dhcp6_client = sd_dhcp6_client_unref(link->dhcp6_client); + return; + } + + r = sd_dhcp6_client_set_callback(link->dhcp6_client, dhcp6_handler, + link); + if (r < 0) { + link->dhcp6_client = sd_dhcp6_client_unref(link->dhcp6_client); + return; + } + + r = sd_dhcp6_client_start(link->dhcp6_client); + if (r < 0) + link->dhcp6_client = sd_dhcp6_client_unref(link->dhcp6_client); } static int link_acquire_conf(Link *link) { @@ -1196,7 +833,7 @@ static int link_acquire_conf(Link *link) { } } - if (link->network->dhcp) { + if (IN_SET(link->network->dhcp, DHCP_SUPPORT_BOTH, DHCP_SUPPORT_V4)) { assert(link->dhcp_client); log_debug_link(link, "acquiring DHCPv4 lease"); @@ -1209,6 +846,19 @@ static int link_acquire_conf(Link *link) { } } + if (IN_SET(link->network->dhcp, DHCP_SUPPORT_BOTH, DHCP_SUPPORT_V6)) { + assert(link->icmp6_router_discovery); + + log_debug_link(link, "discovering IPv6 routers"); + + r = sd_icmp6_router_solicitation_start(link->icmp6_router_discovery); + if (r < 0) { + log_warning_link(link, + "could not start IPv6 router discovery"); + return r; + } + } + return 0; } @@ -1249,9 +899,9 @@ static int link_update_flags(Link *link, sd_rtnl_message *m) { if (r < 0) /* if we got a message without operstate, take it to mean the state was unchanged */ - operstate = link->operstate; + operstate = link->kernel_operstate; - if ((link->flags == flags) && (link->operstate == operstate)) + if ((link->flags == flags) && (link->kernel_operstate == operstate)) return 0; if (link->flags != flags) { @@ -1285,23 +935,26 @@ static int link_update_flags(Link *link, sd_rtnl_message *m) { unknown_flags_added = ((link->flags ^ flags) & flags & unknown_flags); unknown_flags_removed = ((link->flags ^ flags) & link->flags & unknown_flags); - /* link flags are currently at most 18 bits, let's align to printing 20 */ + /* link flags are currently at most 18 bits, let's align to + * printing 20 */ if (unknown_flags_added) - log_debug_link(link, "unknown link flags gained: %#.5x (ignoring)", + log_debug_link(link, + "unknown link flags gained: %#.5x (ignoring)", unknown_flags_added); if (unknown_flags_removed) - log_debug_link(link, "unknown link flags lost: %#.5x (ignoring)", + log_debug_link(link, + "unknown link flags lost: %#.5x (ignoring)", unknown_flags_removed); } - carrier_gained = !link_has_carrier(link->flags, link->operstate) && + carrier_gained = !link_has_carrier(link->flags, link->kernel_operstate) && link_has_carrier(flags, operstate); - carrier_lost = link_has_carrier(link->flags, link->operstate) && + carrier_lost = link_has_carrier(link->flags, link->kernel_operstate) && !link_has_carrier(flags, operstate); link->flags = flags; - link->operstate = operstate; + link->kernel_operstate = operstate; link_save(link); @@ -1333,29 +986,26 @@ static int link_update_flags(Link *link, sd_rtnl_message *m) { } static int link_up_handler(sd_rtnl *rtnl, sd_rtnl_message *m, void *userdata) { - Link *link = userdata; + _cleanup_link_unref_ Link *link = userdata; int r; assert(link); - if (IN_SET(link->state, LINK_STATE_FAILED, LINK_STATE_LINGER)) { - link_unref(link); + if (IN_SET(link->state, LINK_STATE_FAILED, LINK_STATE_LINGER)) return 1; - } r = sd_rtnl_message_get_errno(m); if (r < 0) { /* we warn but don't fail the link, as it may be brought up later */ log_struct_link(LOG_WARNING, link, - "MESSAGE=%s: could not bring up interface: %s", + "MESSAGE=%-*s: could not bring up interface: %s", + IFNAMSIZ, link->ifname, strerror(-r), "ERRNO=%d", -r, NULL); } - link_unref(link); - return 1; } @@ -1378,14 +1028,17 @@ static int link_up(Link *link) { r = sd_rtnl_message_link_set_flags(req, IFF_UP, IFF_UP); if (r < 0) { - log_error_link(link, "Could not set link flags: %s", strerror(-r)); + log_error_link(link, "Could not set link flags: %s", + strerror(-r)); return r; } - r = sd_rtnl_call_async(link->manager->rtnl, req, link_up_handler, link, 0, NULL); + r = sd_rtnl_call_async(link->manager->rtnl, req, link_up_handler, link, + 0, NULL); if (r < 0) { log_error_link(link, - "Could not send rtnetlink message: %s", strerror(-r)); + "Could not send rtnetlink message: %s", + strerror(-r)); return r; } @@ -1394,7 +1047,7 @@ static int link_up(Link *link) { return 0; } -static int link_enslaved(Link *link) { +static int link_joined(Link *link) { int r; assert(link); @@ -1409,14 +1062,12 @@ static int link_enslaved(Link *link) { } } - if (!link->network->dhcp && !link->network->ipv4ll) - return link_enter_set_addresses(link); - - return 0; + return link_enter_set_addresses(link); } -static int enslave_handler(sd_rtnl *rtnl, sd_rtnl_message *m, void *userdata) { - Link *link = userdata; +static int netdev_join_handler(sd_rtnl *rtnl, sd_rtnl_message *m, + void *userdata) { + _cleanup_link_unref_ Link *link = userdata; int r; assert(link); @@ -1426,41 +1077,36 @@ static int enslave_handler(sd_rtnl *rtnl, sd_rtnl_message *m, void *userdata) { link->enslaving --; - if (IN_SET(link->state, LINK_STATE_FAILED, LINK_STATE_LINGER)) { - link_unref(link); + if (IN_SET(link->state, LINK_STATE_FAILED, LINK_STATE_LINGER)) return 1; - } r = sd_rtnl_message_get_errno(m); - if (r < 0) { + if (r < 0 && r != -EEXIST) { log_struct_link(LOG_ERR, link, - "MESSAGE=%s: could not enslave: %s", + "MESSAGE=%-*s: could not join netdev: %s", + IFNAMSIZ, link->ifname, strerror(-r), "ERRNO=%d", -r, NULL); link_enter_failed(link); - link_unref(link); return 1; - } - - log_debug_link(link, "enslaved"); - - if (link->enslaving == 0) - link_enslaved(link); + } else + log_debug_link(link, "joined netdev"); - link_unref(link); + if (link->enslaving <= 0) + link_joined(link); return 1; } -static int link_enter_enslave(Link *link) { - NetDev *vlan, *macvlan; +static int link_enter_join_netdev(Link *link) { + NetDev *netdev; Iterator i; int r; assert(link); assert(link->network); - assert(link->state == LINK_STATE_INITIALIZING); + assert(link->state == LINK_STATE_PENDING); link->state = LINK_STATE_ENSLAVING; @@ -1468,112 +1114,77 @@ static int link_enter_enslave(Link *link) { if (!link->network->bridge && !link->network->bond && - !link->network->tunnel && - hashmap_isempty(link->network->vlans) && - hashmap_isempty(link->network->macvlans)) - return link_enslaved(link); + hashmap_isempty(link->network->stacked_netdevs)) + return link_joined(link); if (link->network->bond) { log_struct_link(LOG_DEBUG, link, - "MESSAGE=%s: enslaving by '%s'", - link->ifname, link->network->bond->name, - NETDEV(link->network->bond), + "MESSAGE=%-*s: enslaving by '%s'", + IFNAMSIZ, + link->ifname, link->network->bond->ifname, + NETDEVIF(link->network->bond), NULL); - r = netdev_enslave(link->network->bond, link, &enslave_handler); + r = netdev_join(link->network->bond, link, &netdev_join_handler); if (r < 0) { log_struct_link(LOG_WARNING, link, - "MESSAGE=%s: could not enslave by '%s': %s", - link->ifname, link->network->bond->name, strerror(-r), - NETDEV(link->network->bond), + "MESSAGE=%-*s: could not join netdev '%s': %s", + IFNAMSIZ, + link->ifname, link->network->bond->ifname, + strerror(-r), + NETDEVIF(link->network->bond), NULL); link_enter_failed(link); return r; } - link_ref(link); link->enslaving ++; } if (link->network->bridge) { log_struct_link(LOG_DEBUG, link, - "MESSAGE=%s: enslaving by '%s'", - link->ifname, link->network->bridge->name, - NETDEV(link->network->bridge), + "MESSAGE=%-*s: enslaving by '%s'", + IFNAMSIZ, + link->ifname, link->network->bridge->ifname, + NETDEVIF(link->network->bridge), NULL); - r = netdev_enslave(link->network->bridge, link, &enslave_handler); + r = netdev_join(link->network->bridge, link, + &netdev_join_handler); if (r < 0) { log_struct_link(LOG_WARNING, link, - "MESSAGE=%s: could not enslave by '%s': %s", - link->ifname, link->network->bridge->name, strerror(-r), - NETDEV(link->network->bridge), + "MESSAGE=%-*s: could not join netdev '%s': %s", + IFNAMSIZ, + link->ifname, link->network->bridge->ifname, + strerror(-r), + NETDEVIF(link->network->bridge), NULL); link_enter_failed(link); return r; } - link_ref(link); link->enslaving ++; } - if (link->network->tunnel) { + HASHMAP_FOREACH(netdev, link->network->stacked_netdevs, i) { log_struct_link(LOG_DEBUG, link, - "MESSAGE=%s: enslaving by '%s'", - link->ifname, link->network->tunnel->name, - NETDEV(link->network->tunnel), + "MESSAGE=%-*s: enslaving by '%s'", + IFNAMSIZ, + link->ifname, netdev->ifname, NETDEVIF(netdev), NULL); - r = netdev_enslave(link->network->tunnel, link, &enslave_handler); - if (r < 0) { - log_struct_link(LOG_WARNING, link, - "MESSAGE=%s: could not enslave by '%s': %s", - link->ifname, link->network->tunnel->name, strerror(-r), - NETDEV(link->network->tunnel), - NULL); - link_enter_failed(link); - return r; - } - - link_ref(link); - link->enslaving ++; - } - - HASHMAP_FOREACH(vlan, link->network->vlans, i) { - log_struct_link(LOG_DEBUG, link, - "MESSAGE=%s: enslaving by '%s'", - link->ifname, vlan->name, NETDEV(vlan), NULL); - - r = netdev_enslave(vlan, link, &enslave_handler); - if (r < 0) { - log_struct_link(LOG_WARNING, link, - "MESSAGE=%s: could not enslave by '%s': %s", - link->ifname, vlan->name, strerror(-r), - NETDEV(vlan), NULL); - link_enter_failed(link); - return r; - } - - link_ref(link); - link->enslaving ++; - } - - HASHMAP_FOREACH(macvlan, link->network->macvlans, i) { - log_struct_link(LOG_DEBUG, link, - "MESSAGE=%s: enslaving by '%s'", - link->ifname, macvlan->name, NETDEV(macvlan), NULL); - - r = netdev_enslave(macvlan, link, &enslave_handler); + r = netdev_join(netdev, link, &netdev_join_handler); if (r < 0) { log_struct_link(LOG_WARNING, link, - "MESSAGE=%s: could not enslave by '%s': %s", - link->ifname, macvlan->name, strerror(-r), - NETDEV(macvlan), NULL); + "MESSAGE=%-*s: could not join netdev '%s': %s", + IFNAMSIZ, + link->ifname, netdev->ifname, + strerror(-r), + NETDEVIF(netdev), NULL); link_enter_failed(link); return r; } - link_ref(link); link->enslaving ++; } @@ -1584,79 +1195,69 @@ static int link_configure(Link *link) { int r; assert(link); - assert(link->state == LINK_STATE_INITIALIZING); + assert(link->network); + assert(link->state == LINK_STATE_PENDING); if (link->network->ipv4ll) { - uint8_t seed[8]; - - r = sd_ipv4ll_new(&link->ipv4ll); - if (r < 0) - return r; - - if (link->udev_device) { - r = net_get_unique_predictable_data(link->udev_device, seed); - if (r >= 0) { - r = sd_ipv4ll_set_address_seed(link->ipv4ll, seed); - if (r < 0) - return r; - } - } - - r = sd_ipv4ll_attach_event(link->ipv4ll, NULL, 0); + r = ipv4ll_configure(link); if (r < 0) return r; + } - r = sd_ipv4ll_set_mac(link->ipv4ll, &link->mac); + if (IN_SET(link->network->dhcp, DHCP_SUPPORT_BOTH, DHCP_SUPPORT_V4)) { + r = dhcp4_configure(link); if (r < 0) return r; + } - r = sd_ipv4ll_set_index(link->ipv4ll, link->ifindex); + if (link->network->dhcp_server) { + r = sd_dhcp_server_new(&link->dhcp_server, link->ifindex); if (r < 0) return r; - r = sd_ipv4ll_set_callback(link->ipv4ll, ipv4ll_handler, link); + r = sd_dhcp_server_attach_event(link->dhcp_server, NULL, 0); if (r < 0) return r; } - if (link->network->dhcp) { - r = sd_dhcp_client_new(&link->dhcp_client); + if (IN_SET(link->network->dhcp, DHCP_SUPPORT_BOTH, DHCP_SUPPORT_V6)) { + r = sd_icmp6_nd_new(&link->icmp6_router_discovery); if (r < 0) return r; - r = sd_dhcp_client_attach_event(link->dhcp_client, NULL, 0); + r = sd_icmp6_nd_attach_event(link->icmp6_router_discovery, + NULL, 0); if (r < 0) return r; - r = sd_dhcp_client_set_mac(link->dhcp_client, &link->mac); + r = sd_icmp6_nd_set_mac(link->icmp6_router_discovery, + &link->mac); if (r < 0) return r; - r = sd_dhcp_client_set_index(link->dhcp_client, link->ifindex); + r = sd_icmp6_nd_set_index(link->icmp6_router_discovery, + link->ifindex); if (r < 0) return r; - r = sd_dhcp_client_set_callback(link->dhcp_client, dhcp_handler, link); + r = sd_icmp6_nd_set_callback(link->icmp6_router_discovery, + icmp6_router_handler, link); if (r < 0) return r; - - if (link->network->dhcp_mtu) { - r = sd_dhcp_client_set_request_option(link->dhcp_client, 26); - if (r < 0) - return r; - } } - if (link_has_carrier(link->flags, link->operstate)) { + if (link_has_carrier(link->flags, link->kernel_operstate)) { r = link_acquire_conf(link); if (r < 0) return r; } - return link_enter_enslave(link); + return link_enter_join_netdev(link); } -int link_initialized(Link *link, struct udev_device *device) { +static int link_initialized_and_synced(sd_rtnl *rtnl, sd_rtnl_message *m, + void *userdata) { + _cleanup_link_unref_ Link *link = userdata; Network *network; int r; @@ -1664,18 +1265,16 @@ int link_initialized(Link *link, struct udev_device *device) { assert(link->ifname); assert(link->manager); - if (link->state != LINK_STATE_INITIALIZING) - return 0; - - if (device) - link->udev_device = udev_device_ref(device); + if (link->state != LINK_STATE_PENDING) + return 1; - log_debug_link(link, "link initialized"); + log_debug_link(link, "link state is up-to-date"); - r = network_get(link->manager, device, link->ifname, &link->mac, &network); + r = network_get(link->manager, link->udev_device, link->ifname, + &link->mac, &network); if (r == -ENOENT) { link_enter_unmanaged(link); - return 0; + return 1; } else if (r < 0) return r; @@ -1687,15 +1286,59 @@ int link_initialized(Link *link, struct udev_device *device) { if (r < 0) return r; + return 1; +} + +int link_initialized(Link *link, struct udev_device *device) { + _cleanup_rtnl_message_unref_ sd_rtnl_message *req = NULL; + int r; + + assert(link); + assert(link->manager); + assert(link->manager->rtnl); + assert(device); + + if (link->state != LINK_STATE_PENDING) + return 0; + + if (link->udev_device) + return 0; + + log_debug_link(link, "udev initialized link"); + + link->udev_device = udev_device_ref(device); + + /* udev has initialized the link, but we don't know if we have yet + * processed the NEWLINK messages with the latest state. Do a GETLINK, + * when it returns we know that the pending NEWLINKs have already been + * processed and that we are up-to-date */ + + r = sd_rtnl_message_new_link(link->manager->rtnl, &req, RTM_GETLINK, + link->ifindex); + if (r < 0) + return r; + + r = sd_rtnl_call_async(link->manager->rtnl, req, + link_initialized_and_synced, link, 0, NULL); + if (r < 0) + return r; + + link_ref(link); + return 0; } -int link_rtnl_process_address(sd_rtnl *rtnl, sd_rtnl_message *message, void *userdata) { +int link_rtnl_process_address(sd_rtnl *rtnl, sd_rtnl_message *message, + void *userdata) { Manager *m = userdata; Link *link = NULL; uint16_t type; _cleanup_address_free_ Address *address = NULL; + Address *ad; char buf[INET6_ADDRSTRLEN]; + char valid_buf[FORMAT_TIMESPAN_MAX]; + const char *valid_str = NULL; + bool address_dropped = false; int r, ifindex; assert(rtnl); @@ -1710,46 +1353,59 @@ int link_rtnl_process_address(sd_rtnl *rtnl, sd_rtnl_message *message, void *use r = sd_rtnl_message_addr_get_ifindex(message, &ifindex); if (r < 0 || ifindex <= 0) { - log_warning("rtnl: received address message without valid ifindix, ignoring"); + log_warning("rtnl: received address message without valid ifindex, ignoring"); return 0; } else { r = link_get(m, ifindex, &link); if (r < 0 || !link) { - log_warning("rtnl: received address for non-existing link, ignoring"); + log_warning("rtnl: received address for a nonexistent link, ignoring"); return 0; } } r = address_new_dynamic(&address); if (r < 0) - return 0; + return r; r = sd_rtnl_message_addr_get_family(message, &address->family); if (r < 0 || !IN_SET(address->family, AF_INET, AF_INET6)) { - log_warning("rtnl: received address with invalid family, ignoring"); + log_warning_link(link, + "rtnl: received address with invalid family, ignoring"); return 0; } r = sd_rtnl_message_addr_get_prefixlen(message, &address->prefixlen); if (r < 0) { - log_warning("rtnl: recevied address with invalid prefixlen, ignoring"); + log_warning_link(link, + "rtnl: received address with invalid prefixlen, ignoring"); + return 0; + } + + r = sd_rtnl_message_addr_get_scope(message, &address->scope); + if (r < 0) { + log_warning_link(link, + "rtnl: received address with invalid scope, ignoring"); return 0; } switch (address->family) { case AF_INET: - r = sd_rtnl_message_read_in_addr(message, IFA_LOCAL, &address->in_addr.in); + r = sd_rtnl_message_read_in_addr(message, IFA_LOCAL, + &address->in_addr.in); if (r < 0) { - log_warning("rtnl: received address without valid address, ignoring"); + log_warning_link(link, + "rtnl: received address without valid address, ignoring"); return 0; } break; case AF_INET6: - r = sd_rtnl_message_read_in6_addr(message, IFA_ADDRESS, &address->in_addr.in6); + r = sd_rtnl_message_read_in6_addr(message, IFA_ADDRESS, + &address->in_addr.in6); if (r < 0) { - log_warning("rtnl: received address without valid address, ignoring"); + log_warning_link(link, + "rtnl: received address without valid address, ignoring"); return 0; } @@ -1759,46 +1415,68 @@ int link_rtnl_process_address(sd_rtnl *rtnl, sd_rtnl_message *message, void *use assert_not_reached("invalid address family"); } - if (!inet_ntop(address->family, &address->in_addr, buf, INET6_ADDRSTRLEN)) { - log_warning("could not print address"); + if (!inet_ntop(address->family, &address->in_addr, buf, + INET6_ADDRSTRLEN)) { + log_warning_link(link, "could not print address"); return 0; } - switch (type) { - case RTM_NEWADDR: - log_info("added address: %s/%u to ifindex %d", buf, - address->prefixlen, ifindex); - break; - - case RTM_DELADDR: - log_info("removed address: %s/%u from ifindex %d", buf, - address->prefixlen, ifindex); - break; - default: - assert_not_reached("Received invalid RTNL message type"); + r = sd_rtnl_message_read_cache_info(message, IFA_CACHEINFO, + &address->cinfo); + if (r >= 0) { + if (address->cinfo.ifa_valid == CACHE_INFO_INFINITY_LIFE_TIME) + valid_str = "ever"; + else + valid_str = format_timespan(valid_buf, FORMAT_TIMESPAN_MAX, + address->cinfo.ifa_valid * USEC_PER_SEC, + USEC_PER_SEC); } - return 1; -} + LIST_FOREACH(addresses, ad, link->addresses) { + if (address_equal(ad, address)) { + LIST_REMOVE(addresses, link->addresses, ad); -static int link_get_address_handler(sd_rtnl *rtnl, sd_rtnl_message *m, void *userdata) { - Link *link = userdata; - int r; + address_free(ad); - assert(rtnl); - assert(m); - assert(link); + address_dropped = true; - for (; m; m = sd_rtnl_message_next(m)) { - r = sd_rtnl_message_get_errno(m); - if (r < 0) { - log_debug_link(link, "getting address failed: %s", strerror(-r)); - continue; + break; } + } - r = link_rtnl_process_address(rtnl, m, link->manager); - if (r < 0) - log_warning_link(link, "could not process address: %s", strerror(-r)); + switch (type) { + case RTM_NEWADDR: + if (!address_dropped) + log_debug_link(link, "added address: %s/%u (valid for %s)", + buf, address->prefixlen, + strna(valid_str)); + else + log_debug_link(link, "updated address: %s/%u (valid for %s)", + buf, address->prefixlen, + strna(valid_str)); + + LIST_PREPEND(addresses, link->addresses, address); + address = NULL; + + link_save(link); + + break; + case RTM_DELADDR: + if (address_dropped) { + log_debug_link(link, "removed address: %s/%u (valid for %s)", + buf, address->prefixlen, + strna(valid_str)); + + link_save(link); + } else + log_warning_link(link, + "removing non-existent address: %s/%u (valid for %s)", + buf, address->prefixlen, + strna(valid_str)); + + break; + default: + assert_not_reached("Received invalid RTNL message type"); } return 1; @@ -1822,40 +1500,55 @@ int link_add(Manager *m, sd_rtnl_message *message, Link **ret) { link = *ret; - log_debug_link(link, "link added"); + log_debug_link(link, "link %d added", link->ifindex); - r = sd_rtnl_message_new_addr(m->rtnl, &req, RTM_GETADDR, link->ifindex, 0); + r = sd_rtnl_message_new_addr(m->rtnl, &req, RTM_GETADDR, link->ifindex, + 0); if (r < 0) return r; - r = sd_rtnl_call_async(m->rtnl, req, link_get_address_handler, link, 0, NULL); + r = sd_rtnl_call_async(m->rtnl, req, link_get_address_handler, link, 0, + NULL); if (r < 0) return r; + link_ref(link); + if (detect_container(NULL) <= 0) { /* not in a container, udev will be around */ - sprintf(ifindex_str, "n%"PRIu64, link->ifindex); + sprintf(ifindex_str, "n%d", link->ifindex); device = udev_device_new_from_device_id(m->udev, ifindex_str); if (!device) { - log_warning_link(link, "could not find udev device"); + log_warning_link(link, + "could not find udev device: %m"); return -errno; } - if (udev_device_get_is_initialized(device) <= 0) + if (udev_device_get_is_initialized(device) <= 0) { /* not yet ready */ + log_debug_link(link, "link pending udev initialization..."); return 0; - } + } - r = link_initialized(link, device); - if (r < 0) - return r; + r = link_initialized(link, device); + if (r < 0) + return r; + } else { + /* we are calling a callback directly, so must take a ref */ + link_ref(link); + + r = link_initialized_and_synced(m->rtnl, NULL, link); + if (r < 0) + return r; + } return 0; } int link_update(Link *link, sd_rtnl_message *m) { struct ether_addr mac; - char *ifname; + const char *ifname; + uint32_t mtu; int r; assert(link); @@ -1878,20 +1571,36 @@ int link_update(Link *link, sd_rtnl_message *m) { return -ENOMEM; } - if (!link->original_mtu) { - r = sd_rtnl_message_read_u16(m, IFLA_MTU, &link->original_mtu); - if (r >= 0) + r = sd_rtnl_message_read_u32(m, IFLA_MTU, &mtu); + if (r >= 0 && mtu > 0) { + link->mtu = mtu; + if (!link->original_mtu) { + link->original_mtu = mtu; log_debug_link(link, "saved original MTU: %" - PRIu16, link->original_mtu); + PRIu32, link->original_mtu); + } + + if (link->dhcp_client) { + r = sd_dhcp_client_set_mtu(link->dhcp_client, + link->mtu); + if (r < 0) { + log_warning_link(link, + "Could not update MTU in DHCP client: %s", + strerror(-r)); + return r; + } + } } /* The kernel may broadcast NEWLINK messages without the MAC address set, simply ignore them. */ r = sd_rtnl_message_read_ether_addr(m, IFLA_ADDRESS, &mac); if (r >= 0) { - if (memcmp(link->mac.ether_addr_octet, mac.ether_addr_octet, ETH_ALEN)) { + if (memcmp(link->mac.ether_addr_octet, mac.ether_addr_octet, + ETH_ALEN)) { - memcpy(link->mac.ether_addr_octet, mac.ether_addr_octet, ETH_ALEN); + memcpy(link->mac.ether_addr_octet, mac.ether_addr_octet, + ETH_ALEN); log_debug_link(link, "MAC address: " "%02hhx:%02hhx:%02hhx:%02hhx:%02hhx:%02hhx", @@ -1905,18 +1614,30 @@ int link_update(Link *link, sd_rtnl_message *m) { if (link->ipv4ll) { r = sd_ipv4ll_set_mac(link->ipv4ll, &link->mac); if (r < 0) { - log_warning_link(link, "Could not update MAC " - "address in IPv4LL client: %s", + log_warning_link(link, + "Could not update MAC address in IPv4LL client: %s", strerror(-r)); return r; } } if (link->dhcp_client) { - r = sd_dhcp_client_set_mac(link->dhcp_client, &link->mac); + r = sd_dhcp_client_set_mac(link->dhcp_client, + &link->mac); + if (r < 0) { + log_warning_link(link, + "Could not update MAC address in DHCP client: %s", + strerror(-r)); + return r; + } + } + + if (link->dhcp6_client) { + r = sd_dhcp6_client_set_mac(link->dhcp6_client, + &link->mac); if (r < 0) { - log_warning_link(link, "Could not update MAC " - "address in DHCP client: %s", + log_warning_link(link, + "Could not update MAC address in DHCPv6 client: %s", strerror(-r)); return r; } @@ -1927,10 +1648,41 @@ int link_update(Link *link, sd_rtnl_message *m) { return link_update_flags(link, m); } +static void link_update_operstate(Link *link) { + + assert(link); + + if (link->kernel_operstate == IF_OPER_DORMANT) + link->operstate = LINK_OPERSTATE_DORMANT; + else if (link_has_carrier(link->flags, link->kernel_operstate)) { + Address *address; + uint8_t scope = RT_SCOPE_NOWHERE; + + /* if we have carrier, check what addresses we have */ + LIST_FOREACH(addresses, address, link->addresses) { + if (address->scope < scope) + scope = address->scope; + } + + if (scope < RT_SCOPE_SITE) + /* universally accessible addresses found */ + link->operstate = LINK_OPERSTATE_ROUTABLE; + else if (scope < RT_SCOPE_HOST) + /* only link or site local addresses found */ + link->operstate = LINK_OPERSTATE_DEGRADED; + else + /* no useful addresses found */ + link->operstate = LINK_OPERSTATE_CARRIER; + } else if (link->flags & IFF_UP) + link->operstate = LINK_OPERSTATE_NO_CARRIER; + else + link->operstate = LINK_OPERSTATE_OFF; +} + int link_save(Link *link) { _cleanup_free_ char *temp_path = NULL; _cleanup_fclose_ FILE *f = NULL; - const char *admin_state, *oper_state = "unknown"; + const char *admin_state, *oper_state; int r; assert(link); @@ -1938,6 +1690,8 @@ int link_save(Link *link) { assert(link->lease_file); assert(link->manager); + link_update_operstate(link); + r = manager_save(link->manager); if (r < 0) return r; @@ -1950,50 +1704,100 @@ int link_save(Link *link) { admin_state = link_state_to_string(link->state); assert(admin_state); - if (link->operstate == IF_OPER_DORMANT) - oper_state = "dormant"; - else if (link_has_carrier(link->flags, link->operstate)) - oper_state = "carrier"; + oper_state = link_operstate_to_string(link->operstate); + assert(oper_state); r = fopen_temporary(link->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" "ADMIN_STATE=%s\n" - "OPER_STATE=%s\n" - "FLAGS=%u\n", - admin_state, oper_state, link->flags); + "OPER_STATE=%s\n", + admin_state, oper_state); + + if (link->network) { + char **address; + + fputs("DNS=", f); + + if (link->network->dhcp_dns && + link->dhcp_lease) { + const struct in_addr *addresses; + + r = sd_dhcp_lease_get_dns(link->dhcp_lease, &addresses); + if (r > 0) { + serialize_in_addrs(f, addresses, r); + if (link->network->dns) + fputs(" ", f); + } + } + + STRV_FOREACH(address, link->network->dns) + fprintf(f, "%s%s", *address, + (address + 1 ? " " : "")); + + fputs("\n", f); + + fprintf(f, "NTP="); + + if (link->network->dhcp_ntp && + link->dhcp_lease) { + const struct in_addr *addresses; + + r = sd_dhcp_lease_get_ntp(link->dhcp_lease, &addresses); + if (r > 0) { + serialize_in_addrs(f, addresses, r); + if (link->network->ntp) + fputs(" ", f); + } + } + + STRV_FOREACH(address, link->network->ntp) + fprintf(f, "%s%s", *address, + (address + 1 ? " " : "")); + + fputs("\n", f); + + fprintf(f, "LLMNR=%s\n", + llmnr_support_to_string(link->network->llmnr)); + } if (link->dhcp_lease) { + assert(link->network); + r = dhcp_lease_save(link->dhcp_lease, link->lease_file); if (r < 0) - goto finish; + goto fail; - fprintf(f, "DHCP_LEASE=%s\n", link->lease_file); + fprintf(f, + "DHCP_LEASE=%s\n", + link->lease_file); } else unlink(link->lease_file); - fflush(f); + r = fflush_and_check(f); + if (r < 0) + goto fail; - if (ferror(f) || rename(temp_path, link->state_file) < 0) { + if (rename(temp_path, link->state_file) < 0) { r = -errno; - unlink(link->state_file); - unlink(temp_path); + goto fail; } -finish: - if (r < 0) - log_error("Failed to save link data to %s: %s", link->state_file, strerror(-r)); - + return 0; +fail: + log_error_link(link, "Failed to save link data to %s: %s", link->state_file, strerror(-r)); + unlink(link->state_file); + unlink(temp_path); return r; } static const char* const link_state_table[_LINK_STATE_MAX] = { - [LINK_STATE_INITIALIZING] = "initializing", + [LINK_STATE_PENDING] = "pending", [LINK_STATE_ENSLAVING] = "configuring", [LINK_STATE_SETTING_ADDRESSES] = "configuring", [LINK_STATE_SETTING_ROUTES] = "configuring", @@ -2004,3 +1808,14 @@ static const char* const link_state_table[_LINK_STATE_MAX] = { }; DEFINE_STRING_TABLE_LOOKUP(link_state, LinkState); + +static const char* const link_operstate_table[_LINK_OPERSTATE_MAX] = { + [LINK_OPERSTATE_OFF] = "off", + [LINK_OPERSTATE_NO_CARRIER] = "no-carrier", + [LINK_OPERSTATE_DORMANT] = "dormant", + [LINK_OPERSTATE_CARRIER] = "carrier", + [LINK_OPERSTATE_DEGRADED] = "degraded", + [LINK_OPERSTATE_ROUTABLE] = "routable", +}; + +DEFINE_STRING_TABLE_LOOKUP(link_operstate, LinkOperationalState);