X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Fnetwork%2Fnetworkd-link.c;h=ab3158356a703c24f5be05bbd0bac73e83527b60;hb=bbf7c04821a71fec67eaf0e7a34d17afc5913c13;hp=9f632e4f1e797ea41cc7748209707c051ec3ee96;hpb=124fa2c601c6fbbc3751b744c6f68bd522e0c588;p=elogind.git diff --git a/src/network/networkd-link.c b/src/network/networkd-link.c index 9f632e4f1..ab3158356 100644 --- a/src/network/networkd-link.c +++ b/src/network/networkd-link.c @@ -30,6 +30,7 @@ #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); @@ -144,7 +145,7 @@ static int link_enter_configured(Link *link) { static void link_enter_unmanaged(Link *link) { assert(link); - log_info_link(link, "unmanaged"); + log_debug_link(link, "unmanaged"); link->state = LINK_STATE_UNMANAGED; @@ -300,55 +301,60 @@ 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->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->route_messages ++; } + } - link->route_messages ++; + if (link->route_messages == 0) { + link_enter_configured(link); } return 0; @@ -679,29 +685,31 @@ 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; + 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); - } + route_drop(route_gw, link, &route_drop_handler); + } - 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); + } } + 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; @@ -776,25 +784,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; @@ -1098,49 +1117,53 @@ static int link_acquire_conf(Link *link) { 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); - 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; + } + + 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) + 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_DORMANT | IFF_DEBUG | IFF_MULTICAST | IFF_BROADCAST | IFF_PROMISC | - IFF_NOARP | IFF_MASTER | IFF_SLAVE); - - /* consider link to have carrier when LOWER_UP and !DORMANT - - TODO: use proper operstates once we start supporting 802.1X - - see Documentation/networking/operstates.txt in the kernel sources - */ - carrier_gained = (((flags_added & IFF_LOWER_UP) && !(flags & IFF_DORMANT)) || - ((flags_removed & IFF_DORMANT) && (flags & IFF_LOWER_UP))); - carrier_lost = ((link->flags & IFF_LOWER_UP) && !(link->flags & IFF_DORMANT)) && - ((flags_removed & IFF_LOWER_UP) || (flags_added & IFF_DORMANT)); - - link->flags = flags; - - if (!link->network) - /* not currently managing this link - we track state changes, but don't log them - they will be logged if and when a network is - applied */ - return 0; + IFF_NOARP | IFF_MASTER | IFF_SLAVE | IFF_RUNNING); if (flags_added & IFF_UP) - log_info_link(link, "link is up"); + log_debug_link(link, "link is up"); else if (flags_removed & IFF_UP) - log_info_link(link, "link is down"); + log_debug_link(link, "link is down"); if (flags_added & IFF_LOWER_UP) log_debug_link(link, "link is lower up"); @@ -1196,13 +1219,26 @@ static int link_update_flags(Link *link, unsigned flags) { log_debug_link(link, "unknown link flags lost: %#.5x (ignoring)", flags_removed & generic_flags); + 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); + + link->flags = flags; + link->operstate = operstate; + + 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; } @@ -1210,22 +1246,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; } } @@ -1242,14 +1266,16 @@ static int link_up_handler(sd_rtnl *rtnl, sd_rtnl_message *m, void *userdata) { 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); + } + return 1; } @@ -1446,6 +1472,7 @@ static int link_configure(Link *link) { if (link->network->ipv4ll) { uint8_t seed[8]; + r = sd_ipv4ll_new(&link->ipv4ll); if (r < 0) return r; @@ -1504,12 +1531,17 @@ static int link_configure(Link *link) { } } + 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; - unsigned flags; int r; assert(link); @@ -1539,13 +1571,6 @@ int link_initialized(Link *link, struct udev_device *device) { if (r < 0) return r; - /* re-trigger all state updates */ - flags = link->flags; - link->flags = 0; - r = link_update_flags(link, flags); - if (r < 0) - return r; - return 0; } @@ -1565,7 +1590,7 @@ int link_add(Manager *m, sd_rtnl_message *message, Link **ret) { link = *ret; - log_info_link(link, "link added"); + log_debug_link(link, "link added"); if (detect_container(NULL) <= 0) { /* not in a container, udev will be around */ @@ -1589,7 +1614,6 @@ int link_add(Manager *m, sd_rtnl_message *message, Link **ret) { } int link_update(Link *link, sd_rtnl_message *m) { - unsigned flags; struct ether_addr mac; char *ifname; int r; @@ -1598,9 +1622,6 @@ int link_update(Link *link, sd_rtnl_message *m) { assert(link->ifname); assert(m); - if (link->state == LINK_STATE_FAILED || link->state == LINK_STATE_UNMANAGED) - return 0; - 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); @@ -1657,26 +1678,35 @@ 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_free_ char *temp_path = NULL, *lease_file = 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->manager); + + r = manager_save(link->manager); + if (r < 0) + return r; + + admin_state = link_state_to_string(link->state); + assert(admin_state); - state = link_state_to_string(link->state); - assert(state); + if (link->operstate == IF_OPER_DORMANT) + oper_state = "dormant"; + else if (link_has_carrier(link->flags, link->operstate)) + oper_state = "carrier"; + + r = asprintf(&lease_file, "/run/systemd/network/leases/%"PRIu64, + link->ifindex); + if (r < 0) + return -ENOMEM; r = fopen_temporary(link->state_file, &f, &temp_path); if (r < 0) @@ -1686,22 +1716,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); if (r < 0) goto finish; fprintf(f, "DHCP_LEASE=%s\n", lease_file); - } + } else + unlink(lease_file); fflush(f); @@ -1713,13 +1740,13 @@ 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] = "configuring", + [LINK_STATE_INITIALIZING] = "initializing", [LINK_STATE_ENSLAVING] = "configuring", [LINK_STATE_SETTING_ADDRESSES] = "configuring", [LINK_STATE_SETTING_ROUTES] = "configuring",