X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Fnetwork%2Fnetworkd-link.c;h=d633399890d29f3b576c09a18b64ff7cf32bc7ec;hb=02dd6e189a6d2b7f3884ad4cdb3d8c85e009c565;hp=ac9f4737efa405491ce33d54c2f62a209f26498c;hpb=2d2349cc3ed43153344807892332c9fa626c8d8a;p=elogind.git diff --git a/src/network/networkd-link.c b/src/network/networkd-link.c index ac9f4737e..d63339989 100644 --- a/src/network/networkd-link.c +++ b/src/network/networkd-link.c @@ -36,9 +36,6 @@ #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; @@ -46,7 +43,6 @@ static int link_new(Manager *manager, sd_rtnl_message *message, Link **ret) { int r, ifindex; assert(manager); - assert(manager->links); assert(message); assert(ret); @@ -82,17 +78,19 @@ static int link_new(Manager *manager, sd_rtnl_message *message, Link **ret) { 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/%"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; @@ -129,7 +127,7 @@ static void link_free(Link *link) { sd_icmp6_nd_unref(link->icmp6_router_discovery); if (link->manager) - hashmap_remove(link->manager->links, &link->ifindex); + hashmap_remove(link->manager->links, INT_TO_PTR(link->ifindex)); free(link->ifname); @@ -157,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; @@ -207,9 +202,7 @@ static int link_stop_clients(Link *link) { if (!link->network) return 0; - if (IN_SET(link->network->dhcp, DHCP_SUPPORT_BOTH, DHCP_SUPPORT_V6)) { - 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)); @@ -217,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)); @@ -227,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)); @@ -237,8 +226,7 @@ static int link_stop_clients(Link *link) { } } - if (IN_SET(link->network->dhcp, DHCP_SUPPORT_BOTH, DHCP_SUPPORT_V6)) { - assert(link->icmp6_router_discovery); + if(link->icmp6_router_discovery) { if (link->dhcp6_client) { k = sd_dhcp6_client_stop(link->dhcp6_client); @@ -285,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; @@ -441,6 +429,20 @@ static int link_set_dhcp_routes(Link *link) { 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; @@ -451,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"); @@ -469,31 +472,29 @@ static int link_enter_set_routes(Link *link) { link->route_messages ++; } - if (link->ipv4ll && !link->dhcp_lease) { + if (ipv4ll_is_bound(link->ipv4ll)) { _cleanup_route_free_ Route *route = NULL; - if (r != -ENOENT) { - r = route_new_dynamic(&route, RTPROT_STATIC); - 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 = IPV4LL_ROUTE_METRIC; + r = route_new_dynamic(&route, RTPROT_STATIC); + if (r < 0) { + log_error_link(link, "Could not allocate route: %s", + strerror(-r)); + 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; - } + route->family = AF_INET; + route->scope = RT_SCOPE_LINK; + route->metrics = IPV4LL_ROUTE_METRIC; - 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) { @@ -664,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"); @@ -682,7 +684,7 @@ static int link_enter_set_addresses(Link *link) { link->addr_messages ++; } - if (link->ipv4ll && !link->dhcp_lease) { + if (link->ipv4ll) { _cleanup_address_free_ Address *ll_addr = NULL; struct in_addr addr; @@ -780,29 +782,6 @@ static int link_enter_set_addresses(Link *link) { return 0; } -static int address_update_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)) - 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); - - return 1; -} - static int address_drop_handler(sd_rtnl *rtnl, sd_rtnl_message *m, void *userdata) { _cleanup_link_unref_ Link *link = userdata; int r; @@ -837,7 +816,9 @@ static int set_hostname_handler(sd_bus *bus, sd_bus_message *m, void *userdata, r = sd_bus_message_get_errno(m); if (r < 0) - log_warning_link(link, "Could not set hostname: %s", strerror(-r)); + r = -r; + if (r > 0) + log_warning_link(link, "Could not set hostname: %s", strerror(r)); return 1; } @@ -1197,17 +1178,6 @@ 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); @@ -1222,16 +1192,6 @@ 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) @@ -1244,40 +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); - } - - return 0; - -} - static int ipv4ll_address_lost(Link *link) { int r; struct in_addr addr; @@ -1322,18 +1248,6 @@ static int ipv4ll_address_lost(Link *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; @@ -1726,8 +1640,6 @@ static int link_joined(Link *link) { assert(link->state == LINK_STATE_ENSLAVING); assert(link->network); - log_debug_link(link, "joined netdev"); - if (!(link->flags & IFF_UP)) { r = link_up(link); if (r < 0) { @@ -1763,7 +1675,8 @@ static int netdev_join_handler(sd_rtnl *rtnl, sd_rtnl_message *m, void *userdata NULL); link_enter_failed(link); return 1; - } + } else + log_debug_link(link, "joined netdev"); if (link->enslaving <= 0) link_joined(link); @@ -1772,7 +1685,7 @@ static int netdev_join_handler(sd_rtnl *rtnl, sd_rtnl_message *m, void *userdata } static int link_enter_join_netdev(Link *link) { - NetDev *vlan, *macvlan, *vxlan; + NetDev *netdev; Iterator i; int r; @@ -1786,10 +1699,7 @@ static int link_enter_join_netdev(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)) + hashmap_isempty(link->network->stacked_netdevs)) return link_joined(link); if (link->network->bond) { @@ -1838,82 +1748,19 @@ static int link_enter_join_netdev(Link *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, - NETDEVIF(link->network->tunnel), - NULL); - - r = netdev_join(link->network->tunnel, link, &netdev_join_handler); - if (r < 0) { - log_struct_link(LOG_WARNING, link, - "MESSAGE=%-*s: could not join netdev '%s': %s", - IFNAMSIZ, - link->ifname, link->network->tunnel->ifname, strerror(-r), - NETDEVIF(link->network->tunnel), - NULL); - link_enter_failed(link); - return r; - } - - link->enslaving ++; - } - - HASHMAP_FOREACH(vlan, link->network->vlans, i) { - log_struct_link(LOG_DEBUG, link, - "MESSAGE=%-*s: enslaving by '%s'", - IFNAMSIZ, - link->ifname, vlan->ifname, NETDEVIF(vlan), NULL); - - r = netdev_join(vlan, link, &netdev_join_handler); - if (r < 0) { - log_struct_link(LOG_WARNING, link, - "MESSAGE=%-*s: could not join netdev '%s': %s", - IFNAMSIZ, - link->ifname, vlan->ifname, strerror(-r), - NETDEVIF(vlan), NULL); - link_enter_failed(link); - return r; - } - - link->enslaving ++; - } - - HASHMAP_FOREACH(macvlan, link->network->macvlans, i) { + HASHMAP_FOREACH(netdev, link->network->stacked_netdevs, i) { log_struct_link(LOG_DEBUG, link, "MESSAGE=%-*s: enslaving by '%s'", IFNAMSIZ, - link->ifname, macvlan->ifname, NETDEVIF(macvlan), NULL); + link->ifname, netdev->ifname, NETDEVIF(netdev), NULL); - r = netdev_join(macvlan, link, &netdev_join_handler); + r = netdev_join(netdev, link, &netdev_join_handler); if (r < 0) { log_struct_link(LOG_WARNING, link, "MESSAGE=%-*s: could not join netdev '%s': %s", IFNAMSIZ, - link->ifname, macvlan->ifname, strerror(-r), - NETDEVIF(macvlan), NULL); - link_enter_failed(link); - return r; - } - - 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, NETDEVIF(vxlan), NULL); - - r = netdev_join(vxlan, link, &netdev_join_handler); - if (r < 0) { - log_struct_link(LOG_WARNING, link, - "MESSAGE=%*s: could not join netdev '%s': %s", - IFNAMSIZ, - link->ifname, vxlan->ifname, strerror(-r), - NETDEVIF(vxlan), NULL); + link->ifname, netdev->ifname, strerror(-r), + NETDEVIF(netdev), NULL); link_enter_failed(link); return r; } @@ -1989,7 +1836,7 @@ static int link_configure(Link *link) { 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; } @@ -2282,7 +2129,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) @@ -2296,7 +2143,7 @@ int link_add(Manager *m, sd_rtnl_message *message, Link **ret) { 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");