X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Fnetwork%2Fnetworkd-link.c;h=f1f04a3de0c35ddba9c42277e91b855953f0b961;hb=4d473d5dded03d3b682dc389d610bb6b2db6e5f7;hp=927dbb196001bae83286b677439fab5b0231967e;hpb=e9189a1f56e5dd418d13dfcf3a7f5a701884858e;p=elogind.git diff --git a/src/network/networkd-link.c b/src/network/networkd-link.c index 927dbb196..f1f04a3de 100644 --- a/src/network/networkd-link.c +++ b/src/network/networkd-link.c @@ -24,57 +24,78 @@ #include "networkd.h" #include "libudev-private.h" +#include "udev-util.h" #include "util.h" +#include "virt.h" #include "bus-util.h" #include "network-internal.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); -int link_new(Manager *manager, struct udev_device *device, Link **ret) { - _cleanup_link_free_ Link *link = NULL; - const char *ifname; - int r; +static int link_new(Manager *manager, sd_rtnl_message *message, Link **ret) { + _cleanup_link_unref_ Link *link = NULL; + uint16_t type; + char *ifname; + int r, ifindex; assert(manager); assert(manager->links); - assert(device); + assert(message); assert(ret); + r = sd_rtnl_message_get_type(message, &type); + if (r < 0) + return r; + else if (type != RTM_NEWLINK) + return -EINVAL; + + r = sd_rtnl_message_link_get_ifindex(message, &ifindex); + if (r < 0) + return r; + else if (ifindex <= 0) + return -EINVAL; + + r = sd_rtnl_message_read_string(message, IFLA_IFNAME, &ifname); + if (r < 0) + return r; + link = new0(Link, 1); if (!link) return -ENOMEM; + link->n_ref = 1; link->manager = manager; - link->state = _LINK_STATE_INVALID; - - link->ifindex = udev_device_get_ifindex(device); - if (link->ifindex <= 0) - return -EINVAL; + link->state = LINK_STATE_INITIALIZING; + link->ifindex = ifindex; + link->ifname = strdup(ifname); + if (!link->ifname) + return -ENOMEM; r = asprintf(&link->state_file, "/run/systemd/network/links/%"PRIu64, link->ifindex); if (r < 0) return -ENOMEM; - ifname = udev_device_get_sysname(device); - link->ifname = strdup(ifname); + r = asprintf(&link->lease_file, "/run/systemd/network/leases/%"PRIu64, + link->ifindex); + if (r < 0) + return -ENOMEM; r = hashmap_put(manager->links, &link->ifindex, link); if (r < 0) return r; - link->udev_device = udev_device_ref(device); - *ret = link; link = NULL; return 0; } -void link_free(Link *link) { +static void link_free(Link *link) { if (!link) return; @@ -83,11 +104,16 @@ void link_free(Link *link) { sd_dhcp_client_unref(link->dhcp_client); sd_dhcp_lease_unref(link->dhcp_lease); + unlink(link->lease_file); + free(link->lease_file); + sd_ipv4ll_unref(link->ipv4ll); hashmap_remove(link->manager->links, &link->ifindex); free(link->ifname); + + unlink(link->state_file); free(link->state_file); udev_device_unref(link->udev_device); @@ -95,6 +121,20 @@ void link_free(Link *link) { free(link); } +Link *link_unref(Link *link) { + if (link && (-- link->n_ref <= 0)) + link_free(link); + + return NULL; +} + +Link *link_ref(Link *link) { + if (link) + assert_se(++ link->n_ref >= 2); + + return link; +} + int link_get(Manager *m, int ifindex, Link **ret) { Link *link; uint64_t ifindex_64; @@ -114,6 +154,19 @@ int link_get(Manager *m, int ifindex, Link **ret) { return 0; } +void link_drop(Link *link) { + if (!link || link->state == LINK_STATE_LINGER) + return; + + link->state = LINK_STATE_LINGER; + + log_debug_link(link, "link removed"); + + link_unref(link); + + return; +} + static int link_enter_configured(Link *link) { assert(link); assert(link->state == LINK_STATE_SETTING_ROUTES); @@ -127,13 +180,61 @@ static int link_enter_configured(Link *link) { return 0; } +static void link_enter_unmanaged(Link *link) { + assert(link); + + log_debug_link(link, "unmanaged"); + + link->state = LINK_STATE_UNMANAGED; + + link_save(link); +} + +static int link_stop_clients(Link *link) { + int r = 0, k; + + assert(link); + assert(link->manager); + assert(link->manager->event); + + if (!link->network) + return 0; + + if (link->network->dhcp) { + assert(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)); + r = k; + } + } + + if (link->network->ipv4ll) { + assert(link->ipv4ll); + + k = sd_ipv4ll_stop(link->ipv4ll); + if (k < 0) { + log_warning_link(link, "Could not stop IPv4 link-local: %s", strerror(-r)); + r = k; + } + } + + return r; +} + static void link_enter_failed(Link *link) { assert(link); + if (IN_SET(link->state, LINK_STATE_FAILED, LINK_STATE_LINGER)) + return; + log_warning_link(link, "failed"); link->state = LINK_STATE_FAILED; + link_stop_clients(link); + link_save(link); } @@ -142,14 +243,16 @@ static int route_handler(sd_rtnl *rtnl, sd_rtnl_message *m, void *userdata) { int r; assert(link->route_messages > 0); - assert(link->state == LINK_STATE_SETTING_ADDRESSES || - link->state == LINK_STATE_SETTING_ROUTES || - link->state == LINK_STATE_FAILED); + assert(IN_SET(link->state, LINK_STATE_SETTING_ADDRESSES, + LINK_STATE_SETTING_ROUTES, LINK_STATE_FAILED, + LINK_STATE_LINGER)); link->route_messages --; - if (link->state == LINK_STATE_FAILED) + if (IN_SET(LINK_STATE_FAILED, LINK_STATE_LINGER)) { + link_unref(link); return 1; + } r = sd_rtnl_message_get_errno(m); if (r < 0 && r != -EEXIST) @@ -166,6 +269,8 @@ static int route_handler(sd_rtnl *rtnl, sd_rtnl_message *m, void *userdata) { link_enter_configured(link); } + link_unref(link); + return 1; } @@ -180,7 +285,7 @@ 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)) + (!link->ipv4ll || ipv4ll_is_bound(link->ipv4ll) == false)) return link_enter_configured(link); log_debug_link(link, "setting routes"); @@ -194,6 +299,7 @@ static int link_enter_set_routes(Link *link) { return r; } + link_ref(link); link->route_messages ++; } @@ -228,6 +334,7 @@ static int link_enter_set_routes(Link *link) { return r; } + link_ref(link); link->route_messages ++; } } @@ -238,55 +345,62 @@ static int link_enter_set_routes(Link *link) { struct in_addr gateway; r = sd_dhcp_lease_get_router(link->dhcp_lease, &gateway); - if (r < 0) { - log_warning_link(link, "DHCP error: no router: %s", - strerror(-r)); + if (r < 0 && r != -ENOENT) { + log_warning_link(link, "DHCP error: %s", strerror(-r)); return r; } - r = route_new_dynamic(&route); - if (r < 0) { - log_error_link(link, "Could not allocate route: %s", - strerror(-r)); - return r; - } + if (r >= 0) { + r = route_new_dynamic(&route); + if (r < 0) { + log_error_link(link, "Could not allocate route: %s", + strerror(-r)); + return r; + } - r = route_new_dynamic(&route_gw); - if (r < 0) { - log_error_link(link, "Could not allocate route: %s", - strerror(-r)); - return r; - } + r = route_new_dynamic(&route_gw); + if (r < 0) { + log_error_link(link, "Could not allocate route: %s", + strerror(-r)); + return r; + } - /* 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; + /* 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; - 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; - } + 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; + } - link->route_messages ++; + link_ref(link); + link->route_messages ++; - route->family = AF_INET; - route->in_addr.in = gateway; + route->family = AF_INET; + route->in_addr.in = gateway; - 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 = 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_ref(link); + link->route_messages ++; } + } - link->route_messages ++; + if (link->route_messages == 0) { + link_enter_configured(link); } return 0; @@ -300,17 +414,21 @@ static int route_drop_handler(sd_rtnl *rtnl, sd_rtnl_message *m, void *userdata) assert(link); assert(link->ifname); - if (link->state == LINK_STATE_FAILED) + 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) + if (r < 0 && r != -ESRCH) log_struct_link(LOG_WARNING, link, "MESSAGE=%s: could not drop route: %s", link->ifname, strerror(-r), "ERRNO=%d", -r, NULL); + link_unref(link); + return 0; } @@ -322,12 +440,15 @@ static int address_handler(sd_rtnl *rtnl, sd_rtnl_message *m, void *userdata) { assert(link); assert(link->ifname); assert(link->addr_messages > 0); - assert(link->state == LINK_STATE_SETTING_ADDRESSES || link->state == LINK_STATE_FAILED); + assert(IN_SET(link->state, LINK_STATE_SETTING_ADDRESSES, + LINK_STATE_FAILED, LINK_STATE_LINGER)); link->addr_messages --; - if (link->state == LINK_STATE_FAILED) + 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 != -EEXIST) @@ -342,6 +463,8 @@ static int address_handler(sd_rtnl *rtnl, sd_rtnl_message *m, void *userdata) { link_enter_set_routes(link); } + link_unref(link); + return 1; } @@ -370,6 +493,7 @@ static int link_enter_set_addresses(Link *link) { return r; } + link_ref(link); link->addr_messages ++; } @@ -405,6 +529,7 @@ static int link_enter_set_addresses(Link *link) { return r; } + link_ref(link); link->addr_messages ++; } } @@ -451,6 +576,7 @@ static int link_enter_set_addresses(Link *link) { return r; } + link_ref(link); link->addr_messages ++; } @@ -465,8 +591,10 @@ static int address_update_handler(sd_rtnl *rtnl, sd_rtnl_message *m, void *userd assert(link); assert(link->ifname); - if (link->state == LINK_STATE_FAILED) + 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) @@ -476,6 +604,8 @@ static int address_update_handler(sd_rtnl *rtnl, sd_rtnl_message *m, void *userd "ERRNO=%d", -r, NULL); + link_unref(link); + return 0; } @@ -487,45 +617,61 @@ static int address_drop_handler(sd_rtnl *rtnl, sd_rtnl_message *m, void *userdat assert(link); assert(link->ifname); - if (link->state == LINK_STATE_FAILED) + 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) + if (r < 0 && r != -EADDRNOTAVAIL) log_struct_link(LOG_WARNING, link, "MESSAGE=%s: could not drop address: %s", link->ifname, strerror(-r), "ERRNO=%d", -r, NULL); + link_unref(link); + return 0; } static int set_hostname_handler(sd_bus *bus, sd_bus_message *m, void *userdata, sd_bus_error *ret_error) { + Link *link = userdata; int r; + assert(link); + + if (IN_SET(link->state, LINK_STATE_FAILED, LINK_STATE_LINGER)) { + link_unref(link); + return 1; + } + r = sd_bus_message_get_errno(m); if (r < 0) log_warning("Could not set hostname: %s", strerror(-r)); + link_unref(link); + return 1; } -static int set_hostname(sd_bus *bus, const char *hostname) { +static int link_set_hostname(Link *link, const char *hostname) { _cleanup_bus_message_unref_ sd_bus_message *m = NULL; int r = 0; + assert(link); + assert(link->manager); assert(hostname); - log_debug("Setting transient hostname: '%s'", hostname); + log_debug_link(link, "Setting transient hostname: '%s'", hostname); - if (!bus) { /* TODO: replace by assert when we can rely on kdbus */ - log_info("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; } r = sd_bus_message_new_method_call( - bus, + link->manager->bus, &m, "org.freedesktop.hostname1", "/org/freedesktop/hostname1", @@ -538,9 +684,11 @@ static int set_hostname(sd_bus *bus, const char *hostname) { if (r < 0) return r; - r = sd_bus_call_async(bus, m, set_hostname_handler, NULL, 0, NULL); + r = sd_bus_call_async(link->manager->bus, m, set_hostname_handler, link, 0, NULL); if (r < 0) - log_error("Could not set transient hostname: %s", strerror(-r)); + log_error_link(link, "Could not set transient hostname: %s", strerror(-r)); + + link_ref(link); return r; } @@ -553,8 +701,10 @@ static int set_mtu_handler(sd_rtnl *rtnl, sd_rtnl_message *m, void *userdata) { assert(link); assert(link->ifname); - if (link->state == LINK_STATE_FAILED) + 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) @@ -564,6 +714,8 @@ static int set_mtu_handler(sd_rtnl *rtnl, sd_rtnl_message *m, void *userdata) { "ERRNO=%d", -r, NULL); + link_unref(link); + return 1; } @@ -597,6 +749,8 @@ static int link_set_mtu(Link *link, uint32_t mtu) { return r; } + link_unref(link); + return 0; } @@ -617,34 +771,39 @@ static int dhcp_lease_lost(Link *link) { r = address_new_dynamic(&address); if (r >= 0) { - sd_dhcp_lease_get_address(link->dhcp_lease, &addr); - sd_dhcp_lease_get_netmask(link->dhcp_lease, &netmask); - sd_dhcp_lease_get_router(link->dhcp_lease, &gateway); - prefixlen = net_netmask_to_prefixlen(&netmask); - - r = route_new_dynamic(&route_gw); + r = sd_dhcp_lease_get_router(link->dhcp_lease, &gateway); 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); - } + 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; + r = route_new_dynamic(&route); + if (r >= 0) { + route->family = AF_INET; + route->in_addr.in = gateway; - route_drop(route, link, &route_drop_handler); + 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) { @@ -666,7 +825,7 @@ static int dhcp_lease_lost(Link *link) { r = sd_dhcp_lease_get_hostname(link->dhcp_lease, &hostname); if (r >= 0 && hostname) { - r = set_hostname(link->manager->bus, ""); + r = link_set_hostname(link, ""); if (r < 0) log_error("Failed to reset transient hostname"); } @@ -714,25 +873,36 @@ static int dhcp_lease_acquired(sd_dhcp_client *client, Link *link) { prefixlen = net_netmask_to_prefixlen(&netmask); r = sd_dhcp_lease_get_router(lease, &gateway); - if (r < 0) { - log_warning_link(link, "DHCP error: no router: %s", - strerror(-r)); + if (r < 0 && r != -ENOENT) { + log_warning_link(link, "DHCP error: %s", strerror(-r)); return r; } - 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); + 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; @@ -762,7 +932,7 @@ static int dhcp_lease_acquired(sd_dhcp_client *client, Link *link) { r = sd_dhcp_lease_get_hostname(lease, &hostname); if (r >= 0) { - r = set_hostname(link->manager->bus, hostname); + r = link_set_hostname(link, hostname); if (r < 0) log_error("Failed to set transient hostname " "to '%s'", hostname); @@ -782,7 +952,7 @@ static void dhcp_handler(sd_dhcp_client *client, int event, void *userdata) { assert(link->network); assert(link->manager); - if (link->state == LINK_STATE_FAILED) + if (IN_SET(link->state, LINK_STATE_FAILED, LINK_STATE_LINGER)) return; switch (event) { @@ -882,6 +1052,7 @@ static int ipv4ll_address_update(Link *link, bool deprecate) { 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; @@ -914,6 +1085,7 @@ 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); if (r < 0) { @@ -927,6 +1099,7 @@ static int ipv4ll_address_lost(Link *link) { route->metrics = 99; route_drop(route, link, &route_drop_handler); + link_ref(link); } return 0; @@ -974,6 +1147,9 @@ static void ipv4ll_handler(sd_ipv4ll *ll, int event, void *userdata){ assert(link->network); assert(link->manager); + if (IN_SET(link->state, LINK_STATE_FAILED, LINK_STATE_LINGER)) + return; + switch(event) { case IPV4LL_EVENT_STOP: case IPV4LL_EVENT_CONFLICT: @@ -1013,8 +1189,11 @@ static int link_acquire_conf(Link *link) { log_debug_link(link, "acquiring IPv4 link-local address"); r = sd_ipv4ll_start(link->ipv4ll); - if (r < 0) + if (r < 0) { + log_warning_link(link, "could not acquire IPv4 " + "link-local address"); return r; + } } if (link->network->dhcp) { @@ -1023,73 +1202,138 @@ static int link_acquire_conf(Link *link) { log_debug_link(link, "acquiring DHCPv4 lease"); r = sd_dhcp_client_start(link->dhcp_client); - if (r < 0) + if (r < 0) { + log_warning_link(link, "could not acquire DHCPv4 " + "lease"); return r; + } } return 0; } -static int link_update_flags(Link *link, unsigned flags) { - unsigned flags_added, flags_removed, generic_flags; - bool carrier_gained, carrier_lost; +bool link_has_carrier(unsigned flags, uint8_t operstate) { + /* see Documentation/networking/operstates.txt in the kernel sources */ + + if (operstate == IF_OPER_UP) + return true; + + if (operstate == IF_OPER_UNKNOWN) + /* operstate may not be implemented, so fall back to flags */ + if ((flags & IFF_LOWER_UP) && !(flags & IFF_DORMANT)) + return true; + + return false; +} + +static int link_update_flags(Link *link, sd_rtnl_message *m) { + unsigned flags, flags_added, flags_removed, generic_flags; + uint8_t operstate; + bool carrier_gained = false, carrier_lost = false; int r; assert(link); - assert(link->network); - if (link->state == LINK_STATE_FAILED) - return 0; + r = sd_rtnl_message_link_get_flags(m, &flags); + if (r < 0) { + log_warning_link(link, "Could not get link flags"); + return r; + } - if (link->flags == flags) + r = sd_rtnl_message_read_u8(m, IFLA_OPERSTATE, &operstate); + if (r < 0) + /* if we got a message without operstate, take it to mean + the state was unchanged */ + operstate = link->operstate; + + if ((link->flags == flags) && (link->operstate == operstate)) return 0; flags_added = (link->flags ^ flags) & flags; flags_removed = (link->flags ^ flags) & link->flags; - generic_flags = ~(IFF_UP | IFF_LOWER_UP | IFF_RUNNING); - - /* consider link to have carrier when both RUNNING and LOWER_UP, as RUNNING - may mean that the oper state is unknown, in which case we should fall back to - simply trust LOWER_UP, even thought that is less reliable - */ - carrier_gained = ((flags_added & IFF_LOWER_UP) && (flags & IFF_RUNNING)) || - ((flags_added & IFF_RUNNING) && (flags & IFF_LOWER_UP)); - carrier_lost = ((link->flags & (IFF_RUNNING | IFF_LOWER_UP)) == - (IFF_RUNNING | IFF_LOWER_UP)) && - (flags_removed & (IFF_LOWER_UP | IFF_RUNNING)); + generic_flags = ~(IFF_UP | IFF_LOWER_UP | IFF_DORMANT | IFF_DEBUG | + IFF_MULTICAST | IFF_BROADCAST | IFF_PROMISC | + IFF_NOARP | IFF_MASTER | IFF_SLAVE | IFF_RUNNING); - link->flags = flags; + if (flags_added & IFF_UP) + log_debug_link(link, "link is up"); + else if (flags_removed & IFF_UP) + log_debug_link(link, "link is down"); + if (flags_added & IFF_LOWER_UP) + log_debug_link(link, "link is lower up"); + else if (flags_removed & IFF_LOWER_UP) + log_debug_link(link, "link is lower down"); + + if (flags_added & IFF_DORMANT) + log_debug_link(link, "link is dormant"); + else if (flags_removed & IFF_DORMANT) + log_debug_link(link, "link is not dormant"); + + if (flags_added & IFF_DEBUG) + log_debug_link(link, "debugging enabled in the kernel"); + else if (flags_removed & IFF_DEBUG) + log_debug_link(link, "debugging disabled in the kernel"); + + if (flags_added & IFF_MULTICAST) + log_debug_link(link, "multicast enabled"); + else if (flags_removed & IFF_MULTICAST) + log_debug_link(link, "multicast disabled"); + + if (flags_added & IFF_BROADCAST) + log_debug_link(link, "broadcast enabled"); + else if (flags_removed & IFF_BROADCAST) + log_debug_link(link, "broadcast disabled"); + + if (flags_added & IFF_PROMISC) + log_debug_link(link, "promiscuous mode enabled"); + else if (flags_removed & IFF_PROMISC) + log_debug_link(link, "promiscuous mode disabled"); + + if (flags_added & IFF_NOARP) + log_debug_link(link, "ARP protocol disabled"); + else if (flags_removed & IFF_NOARP) + log_debug_link(link, "ARP protocol enabled"); + + if (flags_added & IFF_MASTER) + log_debug_link(link, "link is master"); + else if (flags_removed & IFF_MASTER) + log_debug_link(link, "link is no longer master"); + + if (flags_added & IFF_SLAVE) + log_debug_link(link, "link is slave"); + else if (flags_removed & IFF_SLAVE) + log_debug_link(link, "link is no longer slave"); + + /* link flags are currently at most 18 bits, let's default to printing 20 */ if (flags_added & generic_flags) - log_debug_link(link, "link flags gained: %#.8x", + log_debug_link(link, "unknown link flags gained: %#.5x (ignoring)", flags_added & generic_flags); if (flags_removed & generic_flags) - log_debug_link(link, "link flags lost: %#.8x", - flags_removed & generic_flags); + log_debug_link(link, "unknown link flags lost: %#.5x (ignoring)", + flags_removed & generic_flags); - if (flags_added & IFF_UP) - log_info_link(link, "link is up"); - else if (flags_removed & IFF_UP) - log_info_link(link, "link is down"); + carrier_gained = !link_has_carrier(link->flags, link->operstate) && + link_has_carrier(flags, operstate); + carrier_lost = link_has_carrier(link->flags, link->operstate) && + !link_has_carrier(flags, operstate); - if (flags_added & IFF_LOWER_UP) - log_info_link(link, "link is lower up"); - else if (flags_removed & IFF_LOWER_UP) - log_info_link(link, "link is lower down"); + link->flags = flags; + link->operstate = operstate; - if (flags_added & IFF_RUNNING) - log_info_link(link, "link is running"); - else if (flags_removed & IFF_RUNNING) - log_info_link(link, "link is not running"); + link_save(link); + + if (link->state == LINK_STATE_FAILED || + link->state == LINK_STATE_UNMANAGED) + return 0; if (carrier_gained) { log_info_link(link, "gained carrier"); - if (link->network->dhcp || link->network->ipv4ll) { + if (link->network) { r = link_acquire_conf(link); if (r < 0) { - log_warning_link(link, "Could not acquire configuration: %s", strerror(-r)); link_enter_failed(link); return r; } @@ -1097,22 +1341,10 @@ static int link_update_flags(Link *link, unsigned flags) { } else if (carrier_lost) { log_info_link(link, "lost carrier"); - if (link->network->dhcp) { - r = sd_dhcp_client_stop(link->dhcp_client); - if (r < 0) { - log_warning_link(link, "Could not stop DHCPv4 client: %s", strerror(-r)); - link_enter_failed(link); - return r; - } - } - - if (link->network->ipv4ll) { - r = sd_ipv4ll_stop(link->ipv4ll); - if (r < 0) { - log_warning_link(link, "Could not stop IPv4 link-local: %s", strerror(-r)); - link_enter_failed(link); - return r; - } + r = link_stop_clients(link); + if (r < 0) { + link_enter_failed(link); + return r; } } @@ -1125,18 +1357,24 @@ static int link_up_handler(sd_rtnl *rtnl, sd_rtnl_message *m, void *userdata) { assert(link); - if (link->state == LINK_STATE_FAILED) + 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) - link_update_flags(link, link->flags | IFF_UP); - else + 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", link->ifname, strerror(-r), "ERRNO=%d", -r, NULL); + } + + link_unref(link); + return 1; } @@ -1170,6 +1408,8 @@ static int link_up(Link *link) { return r; } + link_ref(link); + return 0; } @@ -1180,10 +1420,12 @@ static int link_enslaved(Link *link) { assert(link->state == LINK_STATE_ENSLAVING); assert(link->network); - r = link_up(link); - if (r < 0) { - link_enter_failed(link); - return r; + if (!(link->flags & IFF_UP)) { + r = link_up(link); + if (r < 0) { + link_enter_failed(link); + return r; + } } if (!link->network->dhcp && !link->network->ipv4ll) @@ -1197,13 +1439,16 @@ static int enslave_handler(sd_rtnl *rtnl, sd_rtnl_message *m, void *userdata) { int r; assert(link); - assert(link->state == LINK_STATE_ENSLAVING || link->state == LINK_STATE_FAILED); + assert(IN_SET(link->state, LINK_STATE_ENSLAVING, LINK_STATE_FAILED, + LINK_STATE_LINGER)); assert(link->network); link->enslaving --; - if (link->state == LINK_STATE_FAILED) + 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) { @@ -1213,6 +1458,7 @@ static int enslave_handler(sd_rtnl *rtnl, sd_rtnl_message *m, void *userdata) { "ERRNO=%d", -r, NULL); link_enter_failed(link); + link_unref(link); return 1; } @@ -1221,6 +1467,8 @@ static int enslave_handler(sd_rtnl *rtnl, sd_rtnl_message *m, void *userdata) { if (link->enslaving == 0) link_enslaved(link); + link_unref(link); + return 1; } @@ -1231,7 +1479,7 @@ static int link_enter_enslave(Link *link) { assert(link); assert(link->network); - assert(link->state == _LINK_STATE_INVALID); + assert(link->state == LINK_STATE_INITIALIZING); link->state = LINK_STATE_ENSLAVING; @@ -1242,45 +1490,47 @@ static int link_enter_enslave(Link *link) { hashmap_isempty(link->network->macvlans)) return link_enslaved(link); - if (link->network->bridge) { + if (link->network->bond) { log_struct_link(LOG_DEBUG, link, "MESSAGE=%s: enslaving by '%s'", - link->ifname, link->network->bridge->name, - NETDEV(link->network->bridge), + link->ifname, link->network->bond->name, + NETDEV(link->network->bond), NULL); - r = netdev_enslave(link->network->bridge, link, &enslave_handler); + r = netdev_enslave(link->network->bond, link, &enslave_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), + link->ifname, link->network->bond->name, strerror(-r), + NETDEV(link->network->bond), NULL); link_enter_failed(link); return r; } + link_ref(link); link->enslaving ++; } - if (link->network->bond) { + if (link->network->bridge) { log_struct_link(LOG_DEBUG, link, "MESSAGE=%s: enslaving by '%s'", - link->ifname, link->network->bond->name, - NETDEV(link->network->bond), + link->ifname, link->network->bridge->name, + NETDEV(link->network->bridge), NULL); - r = netdev_enslave(link->network->bond, link, &enslave_handler); + r = netdev_enslave(link->network->bridge, link, &enslave_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), + link->ifname, link->network->bridge->name, strerror(-r), + NETDEV(link->network->bridge), NULL); link_enter_failed(link); return r; } + link_ref(link); link->enslaving ++; } @@ -1299,6 +1549,7 @@ static int link_enter_enslave(Link *link) { return r; } + link_ref(link); link->enslaving ++; } @@ -1317,119 +1568,43 @@ static int link_enter_enslave(Link *link) { return r; } + link_ref(link); link->enslaving ++; } return 0; } -static int link_getlink_handler(sd_rtnl *rtnl, sd_rtnl_message *m, - void *userdata) { - Link *link = userdata; - int r; - - assert(link); - assert(link->ifname); - - if (link->state == LINK_STATE_FAILED) - return 1; - - r = sd_rtnl_message_get_errno(m); - if (r < 0) { - log_struct_link(LOG_ERR, link, - "MESSAGE=%s: could not get state: %s", - link->ifname, strerror(-r), - "ERRNO=%d", -r, - NULL); - link_enter_failed(link); - return 1; - } - - link_update(link, m); - - return 1; -} - -static int link_getlink(Link *link) { - _cleanup_rtnl_message_unref_ sd_rtnl_message *req = NULL; - int r; - - assert(link); - assert(link->manager); - assert(link->manager->rtnl); - - log_debug_link(link, "requesting link status"); - - r = sd_rtnl_message_new_link(link->manager->rtnl, &req, - RTM_GETLINK, link->ifindex); - if (r < 0) { - log_error_link(link, "Could not allocate RTM_GETLINK message"); - return r; - } - - r = sd_rtnl_call_async(link->manager->rtnl, req, link_getlink_handler, - link, 0, NULL); - if (r < 0) { - log_error_link(link, - "Could not send rtnetlink message: %s", strerror(-r)); - return r; - } - - return 0; -} - static int link_configure(Link *link) { int r; assert(link); - assert(link->state == _LINK_STATE_INVALID); - - r = link_getlink(link); - if (r < 0) - return r; - - return link_enter_enslave(link); -} - -int link_add(Manager *m, struct udev_device *device, Link **ret) { - Link *link = NULL; - Network *network; - int r; - - assert(m); - assert(device); - - r = link_new(m, device, &link); - if (r < 0) - return r; - - *ret = link; - - r = network_get(m, device, &network); - if (r < 0) - return r == -ENOENT ? 0 : r; - - r = network_apply(m, network, link); - if (r < 0) - return r; + assert(link->state == LINK_STATE_INITIALIZING); if (link->network->ipv4ll) { uint8_t seed[8]; + r = sd_ipv4ll_new(&link->ipv4ll); if (r < 0) return r; - 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; + 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); if (r < 0) return r; + r = sd_ipv4ll_set_mac(link->ipv4ll, &link->mac); + if (r < 0) + return r; + r = sd_ipv4ll_set_index(link->ipv4ll, link->ifindex); if (r < 0) return r; @@ -1448,6 +1623,10 @@ int link_add(Manager *m, struct udev_device *device, Link **ret) { if (r < 0) return r; + r = sd_dhcp_client_set_mac(link->dhcp_client, &link->mac); + if (r < 0) + return r; + r = sd_dhcp_client_set_index(link->dhcp_client, link->ifindex); if (r < 0) return r; @@ -1463,6 +1642,42 @@ int link_add(Manager *m, struct udev_device *device, Link **ret) { } } + if (link_has_carrier(link->flags, link->operstate)) { + r = link_acquire_conf(link); + if (r < 0) + return r; + } + + return link_enter_enslave(link); +} + +int link_initialized(Link *link, struct udev_device *device) { + Network *network; + int r; + + assert(link); + assert(link->ifname); + assert(link->manager); + + if (link->state != LINK_STATE_INITIALIZING) + return 0; + + if (device) + link->udev_device = udev_device_ref(device); + + log_debug_link(link, "link initialized"); + + r = network_get(link->manager, device, link->ifname, &link->mac, &network); + if (r == -ENOENT) { + link_enter_unmanaged(link); + return 0; + } else if (r < 0) + return r; + + r = network_apply(link->manager, network, link); + if (r < 0) + return r; + r = link_configure(link); if (r < 0) return r; @@ -1470,20 +1685,71 @@ int link_add(Manager *m, struct udev_device *device, Link **ret) { return 0; } +int link_add(Manager *m, sd_rtnl_message *message, Link **ret) { + Link *link; + _cleanup_udev_device_unref_ struct udev_device *device = NULL; + char ifindex_str[2 + DECIMAL_STR_MAX(int)]; + int r; + + assert(m); + assert(message); + assert(ret); + + r = link_new(m, message, ret); + if (r < 0) + return r; + + link = *ret; + + log_debug_link(link, "link added"); + + if (detect_container(NULL) <= 0) { + /* not in a container, udev will be around */ + sprintf(ifindex_str, "n%"PRIu64, link->ifindex); + device = udev_device_new_from_device_id(m->udev, ifindex_str); + if (!device) { + log_warning_link(link, "could not find udev device"); + return -errno; + } + + if (udev_device_get_is_initialized(device) <= 0) + /* not yet ready */ + return 0; + } + + r = link_initialized(link, device); + if (r < 0) + return r; + + return 0; +} + int link_update(Link *link, sd_rtnl_message *m) { - unsigned flags; struct ether_addr mac; + char *ifname; int r; assert(link); - assert(link->network); + assert(link->ifname); assert(m); - if (link->state == LINK_STATE_FAILED) - return 0; + if (link->state == LINK_STATE_LINGER) { + link_ref(link); + log_info_link(link, "link readded"); + link->state = LINK_STATE_ENSLAVING; + } - if (link->network->dhcp && link->network->dhcp_mtu && - !link->original_mtu) { + r = sd_rtnl_message_read_string(m, IFLA_IFNAME, &ifname); + if (r >= 0 && !streq(ifname, link->ifname)) { + log_info_link(link, "renamed to %s", ifname); + + free(link->ifname); + link->ifname = strdup(ifname); + if (!link->ifname) + return -ENOMEM; + } + + if (!link->original_mtu) { r = sd_rtnl_message_read_u16(m, IFLA_MTU, &link->original_mtu); if (r >= 0) log_debug_link(link, "saved original MTU: %" @@ -1529,26 +1795,36 @@ int link_update(Link *link, sd_rtnl_message *m) { } } - r = sd_rtnl_message_link_get_flags(m, &flags); - if (r < 0) { - log_warning_link(link, "Could not get link flags"); - return r; - } - - return link_update_flags(link, flags); + return link_update_flags(link, m); } int link_save(Link *link) { _cleanup_free_ char *temp_path = NULL; _cleanup_fclose_ FILE *f = NULL; - const char *state; + const char *admin_state, *oper_state = "unknown"; int r; assert(link); assert(link->state_file); + assert(link->lease_file); + assert(link->manager); - state = link_state_to_string(link->state); - assert(state); + r = manager_save(link->manager); + if (r < 0) + return r; + + if (link->state == LINK_STATE_LINGER) { + unlink(link->state_file); + return 0; + } + + 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"; r = fopen_temporary(link->state_file, &f, &temp_path); if (r < 0) @@ -1558,22 +1834,19 @@ int link_save(Link *link) { fprintf(f, "# This is private data. Do not parse.\n" - "STATE=%s\n", state); + "ADMIN_STATE=%s\n" + "OPER_STATE=%s\n" + "FLAGS=%u\n", + admin_state, oper_state, link->flags); if (link->dhcp_lease) { - _cleanup_free_ char *lease_file = NULL; - - r = asprintf(&lease_file, "/run/systemd/network/leases/%"PRIu64, - link->ifindex); - if (r < 0) - return -ENOMEM; - - r = dhcp_lease_save(link->dhcp_lease, lease_file); + r = dhcp_lease_save(link->dhcp_lease, link->lease_file); if (r < 0) goto finish; - fprintf(f, "DHCP_LEASE=%s\n", lease_file); - } + fprintf(f, "DHCP_LEASE=%s\n", link->lease_file); + } else + unlink(link->lease_file); fflush(f); @@ -1585,17 +1858,20 @@ int link_save(Link *link) { finish: if (r < 0) - log_error("Failed to save link data %s: %s", link->state_file, strerror(-r)); + log_error("Failed to save link data to %s: %s", link->state_file, strerror(-r)); return r; } static const char* const link_state_table[_LINK_STATE_MAX] = { + [LINK_STATE_INITIALIZING] = "initializing", [LINK_STATE_ENSLAVING] = "configuring", [LINK_STATE_SETTING_ADDRESSES] = "configuring", [LINK_STATE_SETTING_ROUTES] = "configuring", [LINK_STATE_CONFIGURED] = "configured", + [LINK_STATE_UNMANAGED] = "unmanaged", [LINK_STATE_FAILED] = "failed", + [LINK_STATE_LINGER] = "linger", }; DEFINE_STRING_TABLE_LOOKUP(link_state, LinkState);