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=d13a47bb2ebc705dc9fd0009b1bd015309c2ea93;hp=44147b2c0d95037b46113f9addbf7a0c9c1b477b;hb=44e7b9492617408130d11ffa451c2660942974f6;hpb=6b66097b9534da434cdb56d22c49452cfc0dcaf1 diff --git a/src/network/networkd-link.c b/src/network/networkd-link.c index 44147b2c0..d13a47bb2 100644 --- a/src/network/networkd-link.c +++ b/src/network/networkd-link.c @@ -21,29 +21,28 @@ #include #include +#include #include "networkd.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); @@ -77,19 +76,21 @@ static int link_new(Manager *manager, sd_rtnl_message *message, Link **ret) { r = sd_rtnl_message_read_ether_addr(message, IFLA_ADDRESS, &link->mac); if (r < 0) - return r; + log_debug_link(link, "MAC address not found for new device, continuing without"); - r = asprintf(&link->state_file, "/run/systemd/netif/links/%"PRIu64, - link->ifindex); + r = asprintf(&link->state_file, "/run/systemd/netif/links/%d", link->ifindex); if (r < 0) return -ENOMEM; - r = asprintf(&link->lease_file, "/run/systemd/netif/leases/%"PRIu64, - link->ifindex); + 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; @@ -105,8 +106,6 @@ static void link_free(Link *link) { if (!link) return; - assert(link->manager); - while ((address = link->addresses)) { LIST_REMOVE(addresses, link->addresses, address); address_free(address); @@ -127,7 +126,8 @@ static void link_free(Link *link) { 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); @@ -155,15 +155,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; @@ -205,9 +202,7 @@ 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)); @@ -215,9 +210,7 @@ static int link_stop_clients(Link *link) { } } - 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)); @@ -225,9 +218,7 @@ static int link_stop_clients(Link *link) { } } - if (link->network->dhcp_server) { - assert(link->dhcp_server); - + 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)); @@ -235,12 +226,19 @@ static int link_stop_clients(Link *link) { } } - if (link->network->dhcp6) { - assert(link->dhcp6_client); + if(link->icmp6_router_discovery) { - k = sd_dhcp6_client_stop(link->dhcp6_client); + 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 DHCPv6 client: %s", strerror(-r)); + log_warning_link(link, "Could not stop ICMPv6 router discovery: %s", strerror(-r)); r = k; } } @@ -275,7 +273,7 @@ static Address* link_find_dhcp_server_address(Link *link) { if (address->family != AF_INET) continue; - if (in_addr_null(address->family, &address->in_addr)) + if (in_addr_is_null(address->family, &address->in_addr)) continue; return address; @@ -299,7 +297,8 @@ static int link_enter_configured(Link *link) { assert(link->network); assert(link->state == LINK_STATE_SETTING_ROUTES); - if (link->network->dhcp_server) { + if (link->network->dhcp_server && + !sd_dhcp_server_is_running(link->dhcp_server)) { struct in_addr pool_start; Address *address; @@ -312,7 +311,7 @@ static int link_enter_configured(Link *link) { log_debug_link(link, "offering DHCPv4 leases"); - r = sd_dhcp_server_set_address(link->dhcp_server, &address->in_addr.in); + r = sd_dhcp_server_set_address(link->dhcp_server, &address->in_addr.in, address->prefixlen); if (r < 0) return r; @@ -356,7 +355,7 @@ static int link_enter_configured(Link *link) { } static int route_handler(sd_rtnl *rtnl, sd_rtnl_message *m, void *userdata) { - Link *link = userdata; + _cleanup_link_unref_ Link *link = userdata; int r; assert(link->route_messages > 0); @@ -366,10 +365,8 @@ static int route_handler(sd_rtnl *rtnl, sd_rtnl_message *m, void *userdata) { link->route_messages --; - if (IN_SET(LINK_STATE_FAILED, LINK_STATE_LINGER)) { - link_unref(link); + if (IN_SET(LINK_STATE_FAILED, LINK_STATE_LINGER)) return 1; - } r = sd_rtnl_message_get_errno(m); if (r < 0 && r != -EEXIST) @@ -387,11 +384,65 @@ static int route_handler(sd_rtnl *rtnl, sd_rtnl_message *m, void *userdata) { link_enter_configured(link); } - link_unref(link); - return 1; } +static int link_set_dhcp_routes(Link *link) { + struct sd_dhcp_route *static_routes; + int r, n, i; + + assert(link); + + n = sd_dhcp_lease_get_routes(link->dhcp_lease, &static_routes); + if (n < 0) { + if (n != -ENOENT) + log_warning_link(link, "DHCP error: could not get routes: %s", strerror(-n)); + return n; + } + + for (i = 0; i < n; i++) { + _cleanup_route_free_ Route *route = NULL; + + r = route_new_dynamic(&route, RTPROT_DHCP); + if (r < 0) { + log_error_link(link, "Could not allocate route: %s", + strerror(-r)); + return r; + } + + route->family = AF_INET; + route->in_addr.in = static_routes[i].gw_addr; + route->dst_addr.in = static_routes[i].dst_addr; + route->dst_prefixlen = static_routes[i].dst_prefixlen; + route->metrics = DHCP_ROUTE_METRIC; + + r = route_configure(route, link, &route_handler); + if (r < 0) { + log_warning_link(link, + "could not set host route: %s", strerror(-r)); + return r; + } + + link->route_messages ++; + } + + return 0; +} + +static bool ipv4ll_is_bound(sd_ipv4ll *ll) { + int r; + struct in_addr addr; + + if (!ll) + return false; + + r = sd_ipv4ll_get_address(ll, &addr); + if (r < 0) + return false; + + return true; +} + static int link_enter_set_routes(Link *link) { Route *rt; int r; @@ -402,8 +453,9 @@ static int link_enter_set_routes(Link *link) { link->state = LINK_STATE_SETTING_ROUTES; - if (!link->network->static_routes && !link->dhcp_lease && - (!link->ipv4ll || ipv4ll_is_bound(link->ipv4ll) == false)) + if (!link->network->static_routes && + !link->dhcp_lease && + !ipv4ll_is_bound(link->ipv4ll)) return link_enter_configured(link); log_debug_link(link, "setting routes"); @@ -417,44 +469,32 @@ static int link_enter_set_routes(Link *link) { return r; } - link_ref(link); link->route_messages ++; } - if (link->ipv4ll && !link->dhcp_lease) { + if (ipv4ll_is_bound(link->ipv4ll)) { _cleanup_route_free_ Route *route = 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)); + r = route_new_dynamic(&route, RTPROT_STATIC); + if (r < 0) { + log_error_link(link, "Could not allocate route: %s", + strerror(-r)); 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; - } - - route->family = AF_INET; - route->scope = RT_SCOPE_LINK; - route->metrics = 99; - - 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; - } + route->family = AF_INET; + route->scope = RT_SCOPE_LINK; + route->metrics = IPV4LL_ROUTE_METRIC; - link_ref(link); - link->route_messages ++; + 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->route_messages ++; } if (link->dhcp_lease) { @@ -464,19 +504,20 @@ static int link_enter_set_routes(Link *link) { r = sd_dhcp_lease_get_router(link->dhcp_lease, &gateway); if (r < 0 && r != -ENOENT) { - log_warning_link(link, "DHCP error: %s", strerror(-r)); + log_warning_link(link, "DHCP error: could not get gateway: %s", + strerror(-r)); return r; } if (r >= 0) { - r = route_new_dynamic(&route); + r = route_new_dynamic(&route, RTPROT_DHCP); if (r < 0) { log_error_link(link, "Could not allocate route: %s", strerror(-r)); return r; } - r = route_new_dynamic(&route_gw); + r = route_new_dynamic(&route_gw, RTPROT_DHCP); if (r < 0) { log_error_link(link, "Could not allocate route: %s", strerror(-r)); @@ -490,6 +531,7 @@ static int link_enter_set_routes(Link *link) { route_gw->dst_addr.in = gateway; route_gw->dst_prefixlen = 32; route_gw->scope = RT_SCOPE_LINK; + route_gw->metrics = DHCP_ROUTE_METRIC; r = route_configure(route_gw, link, &route_handler); if (r < 0) { @@ -498,11 +540,11 @@ static int link_enter_set_routes(Link *link) { return r; } - link_ref(link); link->route_messages ++; route->family = AF_INET; route->in_addr.in = gateway; + route->metrics = DHCP_ROUTE_METRIC; r = route_configure(route, link, &route_handler); if (r < 0) { @@ -512,9 +554,11 @@ static int link_enter_set_routes(Link *link) { return r; } - link_ref(link); link->route_messages ++; } + + if (link->network->dhcp_routes) + link_set_dhcp_routes(link); } if (link->route_messages == 0) { @@ -525,17 +569,15 @@ static int link_enter_set_routes(Link *link) { } static int route_drop_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 && r != -ESRCH) @@ -546,15 +588,38 @@ static int route_drop_handler(sd_rtnl *rtnl, sd_rtnl_message *m, void *userdata) "ERRNO=%d", -r, NULL); - link_unref(link); + return 1; +} - return 0; +static 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); @@ -564,10 +629,8 @@ static int address_handler(sd_rtnl *rtnl, sd_rtnl_message *m, void *userdata) { link->addr_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) @@ -577,20 +640,24 @@ static int address_handler(sd_rtnl *rtnl, sd_rtnl_message *m, void *userdata) { 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) { log_debug_link(link, "addresses set"); link_enter_set_routes(link); } - link_unref(link); - return 1; } static int link_enter_set_addresses(Link *link) { Address *ad; int r; + uint32_t lifetime = CACHE_INFO_INFINITY_LIFE_TIME; assert(link); assert(link->network); @@ -598,8 +665,9 @@ 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)) + if (!link->network->static_addresses && + !link->dhcp_lease && + !ipv4ll_is_bound(link->ipv4ll)) return link_enter_set_routes(link); log_debug_link(link, "setting addresses"); @@ -613,11 +681,10 @@ static int link_enter_set_addresses(Link *link) { return r; } - link_ref(link); link->addr_messages ++; } - if (link->ipv4ll && !link->dhcp_lease) { + if (link->ipv4ll) { _cleanup_address_free_ Address *ll_addr = NULL; struct in_addr addr; @@ -649,7 +716,6 @@ static int link_enter_set_addresses(Link *link) { return r; } - link_ref(link); link->addr_messages ++; } } @@ -667,6 +733,16 @@ static int link_enter_set_addresses(Link *link) { return r; } + if (!link->network->dhcp_critical) { + r = sd_dhcp_lease_get_lifetime(link->dhcp_lease, + &lifetime); + if (r < 0) { + log_warning_link(link, "DHCP error: no lifetime: %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", @@ -674,7 +750,7 @@ static int link_enter_set_addresses(Link *link) { return r; } - prefixlen = net_netmask_to_prefixlen(&netmask); + prefixlen = in_addr_netmask_to_prefixlen(&netmask); r = address_new_dynamic(&address); if (r < 0) { @@ -685,10 +761,14 @@ static int link_enter_set_addresses(Link *link) { address->family = AF_INET; address->in_addr.in = addr; + address->cinfo.ifa_prefered = lifetime; + address->cinfo.ifa_valid = lifetime; address->prefixlen = prefixlen; address->broadcast.s_addr = addr.s_addr | ~netmask.s_addr; - r = address_configure(address, link, &address_handler); + /* use update rather than configure so that we will update the lifetime + of an existing address if it has already been configured */ + r = address_update(address, link, &address_handler); if (r < 0) { log_warning_link(link, "could not set addresses: %s", strerror(-r)); @@ -696,52 +776,22 @@ static int link_enter_set_addresses(Link *link) { return r; } - link_ref(link); link->addr_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", - IFNAMSIZ, - link->ifname, strerror(-r), - "ERRNO=%d", -r, - NULL); - - link_unref(link); - - return 0; -} - static int address_drop_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 && r != -EADDRNOTAVAIL) @@ -752,27 +802,23 @@ static int address_drop_handler(sd_rtnl *rtnl, sd_rtnl_message *m, void *userdat "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; + _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_link(link, "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; } @@ -807,26 +853,26 @@ static int link_set_hostname(Link *link, const char *hostname) { return r; r = sd_bus_call_async(link->manager->bus, NULL, m, set_hostname_handler, link, 0); - if (r < 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) @@ -836,8 +882,6 @@ static int set_mtu_handler(sd_rtnl *rtnl, sd_rtnl_message *m, void *userdata) { "ERRNO=%d", -r, NULL); - link_unref(link); - return 1; } @@ -878,8 +922,6 @@ static int link_set_mtu(Link *link, uint32_t mtu) { 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; @@ -891,11 +933,36 @@ static int dhcp_lease_lost(Link *link) { log_warning_link(link, "DHCP lease lost"); + if (link->network->dhcp_routes) { + struct sd_dhcp_route *routes; + int n, i; + + n = sd_dhcp_lease_get_routes(link->dhcp_lease, &routes); + if (n >= 0) { + for (i = 0; i < n; i++) { + _cleanup_route_free_ Route *route = NULL; + + r = route_new_dynamic(&route, RTPROT_UNSPEC); + if (r >= 0) { + route->family = AF_INET; + route->in_addr.in = routes[i].gw_addr; + route->dst_addr.in = routes[i].dst_addr; + route->dst_prefixlen = routes[i].dst_prefixlen; + + route_drop(route, link, &route_drop_handler); + } + } + } + } + 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); + _cleanup_route_free_ Route *route_gw = NULL; + _cleanup_route_free_ Route *route = NULL; + + r = route_new_dynamic(&route_gw, RTPROT_UNSPEC); if (r >= 0) { route_gw->family = AF_INET; route_gw->dst_addr.in = gateway; @@ -903,29 +970,26 @@ static int dhcp_lease_lost(Link *link) { route_gw->scope = RT_SCOPE_LINK; route_drop(route_gw, link, &route_drop_handler); - link_ref(link); } - r = route_new_dynamic(&route); + r = route_new_dynamic(&route, RTPROT_UNSPEC); 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); + prefixlen = in_addr_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) { @@ -958,6 +1022,25 @@ static int dhcp_lease_lost(Link *link) { return 0; } +static int dhcp_lease_renew(sd_dhcp_client *client, Link *link) { + sd_dhcp_lease *lease; + int r; + + r = sd_dhcp_client_get_lease(client, &lease); + if (r < 0) { + log_warning_link(link, "DHCP error: no lease %s", + strerror(-r)); + return r; + } + + sd_dhcp_lease_unref(link->dhcp_lease); + link->dhcp_lease = lease; + + link_enter_set_addresses(link); + + return 0; +} + static int dhcp_lease_acquired(sd_dhcp_client *client, Link *link) { sd_dhcp_lease *lease; struct in_addr address; @@ -990,11 +1073,12 @@ static int dhcp_lease_acquired(sd_dhcp_client *client, Link *link) { return r; } - prefixlen = net_netmask_to_prefixlen(&netmask); + prefixlen = in_addr_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)); + log_warning_link(link, "DHCP error: could not get gateway: %s", + strerror(-r)); return r; } @@ -1069,9 +1153,6 @@ static void dhcp_handler(sd_dhcp_client *client, int event, void *userdata) { 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: @@ -1097,17 +1178,13 @@ static void dhcp_handler(sd_dhcp_client *client, int event, void *userdata) { } } - 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_RENEW: + r = dhcp_lease_renew(client, link); + if (r < 0) { + link_enter_failed(link); + return; } - break; case DHCP_EVENT_IP_ACQUIRE: r = dhcp_lease_acquired(client, link); @@ -1115,20 +1192,10 @@ static void dhcp_handler(sd_dhcp_client *client, int event, void *userdata) { 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)); + log_warning_link(link, "DHCP error: client failed: %s", strerror(-event)); else log_warning_link(link, "DHCP unknown event: %d", event); break; @@ -1137,41 +1204,6 @@ static void dhcp_handler(sd_dhcp_client *client, int event, void *userdata) { 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; @@ -1198,9 +1230,8 @@ static int ipv4ll_address_lost(Link *link) { address->scope = RT_SCOPE_LINK; address_drop(address, link, &address_drop_handler); - link_ref(link); - r = route_new_dynamic(&route); + r = route_new_dynamic(&route, RTPROT_UNSPEC); if (r < 0) { log_error_link(link, "Could not allocate route: %s", strerror(-r)); @@ -1212,24 +1243,11 @@ static int ipv4ll_address_lost(Link *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; @@ -1408,7 +1426,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"); @@ -1421,7 +1439,7 @@ static int link_acquire_conf(Link *link) { } } - if (link->network->dhcp6) { + if (IN_SET(link->network->dhcp, DHCP_SUPPORT_BOTH, DHCP_SUPPORT_V6)) { assert(link->icmp6_router_discovery); log_debug_link(link, "discovering IPv6 routers"); @@ -1557,15 +1575,13 @@ 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) { @@ -1579,8 +1595,6 @@ static int link_up_handler(sd_rtnl *rtnl, sd_rtnl_message *m, void *userdata) { NULL); } - link_unref(link); - return 1; } @@ -1619,7 +1633,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); @@ -1634,14 +1648,11 @@ 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); @@ -1651,36 +1662,30 @@ 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, *vxlan; +static int link_enter_join_netdev(Link *link) { + NetDev *netdev; Iterator i; int r; @@ -1694,33 +1699,29 @@ 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) && - hashmap_isempty(link->network->vxlans)) - 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'", IFNAMSIZ, link->ifname, link->network->bond->ifname, - NETDEV(link->network->bond), + 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", + "MESSAGE=%-*s: could not join netdev '%s': %s", IFNAMSIZ, link->ifname, link->network->bond->ifname, strerror(-r), - NETDEV(link->network->bond), + NETDEVIF(link->network->bond), NULL); link_enter_failed(link); return r; } - link_ref(link); link->enslaving ++; } @@ -1729,109 +1730,41 @@ static int link_enter_enslave(Link *link) { "MESSAGE=%-*s: enslaving by '%s'", IFNAMSIZ, link->ifname, link->network->bridge->ifname, - NETDEV(link->network->bridge), + 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", + "MESSAGE=%-*s: could not join netdev '%s': %s", IFNAMSIZ, link->ifname, link->network->bridge->ifname, strerror(-r), - NETDEV(link->network->bridge), - NULL); - link_enter_failed(link); - return r; - } - - link_ref(link); - link->enslaving ++; - } - - if (link->network->tunnel) { - log_struct_link(LOG_DEBUG, link, - "MESSAGE=%-*s: enslaving by '%s'", - IFNAMSIZ, - link->ifname, link->network->tunnel->ifname, - NETDEV(link->network->tunnel), - 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", - IFNAMSIZ, - link->ifname, link->network->tunnel->ifname, strerror(-r), - NETDEV(link->network->tunnel), + NETDEVIF(link->network->bridge), NULL); link_enter_failed(link); return r; } - link_ref(link); link->enslaving ++; } - HASHMAP_FOREACH(vlan, link->network->vlans, i) { + HASHMAP_FOREACH(netdev, link->network->stacked_netdevs, i) { log_struct_link(LOG_DEBUG, link, "MESSAGE=%-*s: enslaving by '%s'", IFNAMSIZ, - link->ifname, vlan->ifname, NETDEV(vlan), NULL); + link->ifname, netdev->ifname, NETDEVIF(netdev), NULL); - r = netdev_enslave(vlan, 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", + "MESSAGE=%-*s: could not join netdev '%s': %s", IFNAMSIZ, - link->ifname, vlan->ifname, strerror(-r), - NETDEV(vlan), NULL); + link->ifname, netdev->ifname, strerror(-r), + NETDEVIF(netdev), 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'", - IFNAMSIZ, - link->ifname, macvlan->ifname, NETDEV(macvlan), NULL); - - r = netdev_enslave(macvlan, link, &enslave_handler); - if (r < 0) { - log_struct_link(LOG_WARNING, link, - "MESSAGE=%-*s: could not enslave by '%s': %s", - IFNAMSIZ, - link->ifname, macvlan->ifname, strerror(-r), - NETDEV(macvlan), NULL); - link_enter_failed(link); - return r; - } - - link_ref(link); - link->enslaving ++; - } - - HASHMAP_FOREACH(vxlan, link->network->vxlans, i) { - log_struct_link(LOG_DEBUG, link, - "MESSAGE=%*s: enslaving by '%s'", - IFNAMSIZ, - link->ifname, vxlan->ifname, NETDEV(vxlan), NULL); - - r = netdev_enslave(vxlan, link, &enslave_handler); - if (r < 0) { - log_struct_link(LOG_WARNING, link, - "MESSAGE=%*s: could not enslave by '%s': %s", - IFNAMSIZ, - link->ifname, vxlan->ifname, strerror(-r), - NETDEV(vxlan), NULL); - link_enter_failed(link); - return r; - } - - link_ref(link); link->enslaving ++; } @@ -1877,7 +1810,7 @@ static int link_configure(Link *link) { return r; } - if (link->network->dhcp) { + if (IN_SET(link->network->dhcp, DHCP_SUPPORT_BOTH, DHCP_SUPPORT_V4)) { r = sd_dhcp_client_new(&link->dhcp_client); if (r < 0) return r; @@ -1898,8 +1831,46 @@ static int link_configure(Link *link) { if (r < 0) return r; + r = sd_dhcp_client_set_request_broadcast(link->dhcp_client, link->network->dhcp_broadcast); + if (r < 0) + return r; + + if (link->mtu) { + r = sd_dhcp_client_set_mtu(link->dhcp_client, link->mtu); + if (r < 0) + return r; + } + if (link->network->dhcp_mtu) { - r = sd_dhcp_client_set_request_option(link->dhcp_client, 26); + r = sd_dhcp_client_set_request_option(link->dhcp_client, DHCP_OPTION_INTERFACE_MTU); + if (r < 0) + return r; + } + + if (link->network->dhcp_routes) { + r = sd_dhcp_client_set_request_option(link->dhcp_client, DHCP_OPTION_STATIC_ROUTE); + if (r < 0) + return r; + r = sd_dhcp_client_set_request_option(link->dhcp_client, DHCP_OPTION_CLASSLESS_STATIC_ROUTE); + if (r < 0) + return r; + } + + if (link->network->dhcp_sendhost) { + _cleanup_free_ char *hostname = gethostname_malloc(); + if (!hostname) + return -ENOMEM; + + if (!is_localhost(hostname)) { + r = sd_dhcp_client_set_hostname(link->dhcp_client, hostname); + if (r < 0) + return r; + } + } + + if (link->network->dhcp_vendor_class_identifier) { + r = sd_dhcp_client_set_vendor_class_identifier(link->dhcp_client, + link->network->dhcp_vendor_class_identifier); if (r < 0) return r; } @@ -1915,7 +1886,7 @@ static int link_configure(Link *link) { return r; } - if (link->network->dhcp6) { + 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; @@ -1947,11 +1918,11 @@ static int link_configure(Link *link) { return r; } - return link_enter_enslave(link); + return link_enter_join_netdev(link); } static int link_initialized_and_synced(sd_rtnl *rtnl, sd_rtnl_message *m, void *userdata) { - Link *link = userdata; + _cleanup_link_unref_ Link *link = userdata; Network *network; int r; @@ -1960,14 +1931,14 @@ static int link_initialized_and_synced(sd_rtnl *rtnl, sd_rtnl_message *m, void * assert(link->manager); if (link->state != LINK_STATE_INITIALIZING) - return 0; + return 1; log_debug_link(link, "link state is up-to-date"); 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; @@ -1979,7 +1950,7 @@ static int link_initialized_and_synced(sd_rtnl *rtnl, sd_rtnl_message *m, void * if (r < 0) return r; - return 0; + return 1; } int link_initialized(Link *link, struct udev_device *device) { @@ -1994,6 +1965,9 @@ int link_initialized(Link *link, struct udev_device *device) { if (link->state != LINK_STATE_INITIALIZING) return 0; + if (link->udev_device) + return 0; + log_debug_link(link, "udev initialized link"); link->udev_device = udev_device_ref(device); @@ -2011,6 +1985,8 @@ int link_initialized(Link *link, struct udev_device *device) { if (r < 0) return r; + link_ref(link); + return 0; } @@ -2048,7 +2024,7 @@ int link_rtnl_process_address(sd_rtnl *rtnl, sd_rtnl_message *message, void *use 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)) { @@ -2112,7 +2088,10 @@ int link_rtnl_process_address(sd_rtnl *rtnl, sd_rtnl_message *message, void *use case RTM_NEWADDR: if (!address_dropped) log_debug_link(link, "added address: %s/%u", buf, - address->prefixlen); + address->prefixlen); + else + log_debug_link(link, "updated address: %s/%u", buf, + address->prefixlen); LIST_PREPEND(addresses, link->addresses, address); address = NULL; @@ -2123,10 +2102,12 @@ int link_rtnl_process_address(sd_rtnl *rtnl, sd_rtnl_message *message, void *use case RTM_DELADDR: if (address_dropped) { log_debug_link(link, "removed address: %s/%u", buf, - address->prefixlen); + address->prefixlen); link_save(link); - } + } else + log_warning_link(link, "removing non-existent address: %s/%u", + buf, address->prefixlen); break; default: @@ -2136,29 +2117,6 @@ int link_rtnl_process_address(sd_rtnl *rtnl, sd_rtnl_message *message, void *use return 1; } -static int link_get_address_handler(sd_rtnl *rtnl, sd_rtnl_message *m, void *userdata) { - Link *link = userdata; - int r; - - assert(rtnl); - assert(m); - assert(link); - - 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; -} - int link_add(Manager *m, sd_rtnl_message *message, Link **ret) { Link *link; _cleanup_rtnl_message_unref_ sd_rtnl_message *req = NULL; @@ -2177,7 +2135,7 @@ int link_add(Manager *m, sd_rtnl_message *message, Link **ret) { link = *ret; - log_debug_link(link, "link %"PRIu64" added", link->ifindex); + log_debug_link(link, "link %d added", link->ifindex); r = sd_rtnl_message_new_addr(m->rtnl, &req, RTM_GETADDR, link->ifindex, 0); if (r < 0) @@ -2187,12 +2145,14 @@ int link_add(Manager *m, sd_rtnl_message *message, Link **ret) { 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; } @@ -2206,6 +2166,9 @@ int link_add(Manager *m, sd_rtnl_message *message, Link **ret) { 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; @@ -2216,7 +2179,8 @@ int link_add(Manager *m, sd_rtnl_message *message, Link **ret) { 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); @@ -2239,11 +2203,23 @@ 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 @@ -2298,27 +2274,6 @@ int link_update(Link *link, sd_rtnl_message *m) { return link_update_flags(link, m); } -static void serialize_addresses(FILE *f, const char *key, Address *address) { - Address *ad; - - assert(f); - assert(key); - - if (!address) - return; - - fprintf(f, "%s=", key); - - LIST_FOREACH(addresses, ad, address) { - char buf[INET6_ADDRSTRLEN]; - - if (inet_ntop(ad->family, &ad->in_addr, buf, INET6_ADDRSTRLEN)) - fprintf(f, "%s%s", buf, (ad->addresses_next) ? " ": ""); - } - - fputs("\n", f); -} - static void link_update_operstate(Link *link) { assert(link); @@ -2385,13 +2340,53 @@ int link_save(Link *link) { 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) { - serialize_addresses(f, "DNS", link->network->dns); - serialize_addresses(f, "NTP", link->network->ntp); + 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) { @@ -2402,12 +2397,8 @@ int link_save(Link *link) { goto finish; fprintf(f, - "DHCP_LEASE=%s\n" - "DHCP_USE_DNS=%s\n" - "DHCP_USE_NTP=%s\n", - link->lease_file, - yes_no(link->network->dhcp_dns), - yes_no(link->network->dhcp_ntp)); + "DHCP_LEASE=%s\n", + link->lease_file); } else unlink(link->lease_file);