X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Fnetwork%2Fnetworkd-link.c;h=5a7472ba24a09dcdb2337fbf4f8b2d37de0cb493;hb=091a364c802e34a58f3260c9cb5db9b75c62215c;hp=e3fb09494372baf0a311594299886e6634f1269d;hpb=b226d99b044222739dccfa9cf9f7a9d79576c407;p=elogind.git diff --git a/src/network/networkd-link.c b/src/network/networkd-link.c index e3fb09494..5a7472ba2 100644 --- a/src/network/networkd-link.c +++ b/src/network/networkd-link.c @@ -96,11 +96,18 @@ static int link_new(Manager *manager, sd_rtnl_message *message, Link **ret) { } static void link_free(Link *link) { + Address *address; + if (!link) return; assert(link->manager); + while ((address = link->addresses)) { + LIST_REMOVE(addresses, link->addresses, address); + address_free(address); + } + sd_dhcp_client_unref(link->dhcp_client); sd_dhcp_lease_unref(link->dhcp_lease); @@ -154,6 +161,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); @@ -213,7 +233,7 @@ static int link_stop_clients(Link *link) { static void link_enter_failed(Link *link) { assert(link); - if (link->state == LINK_STATE_FAILED) + if (IN_SET(link->state, LINK_STATE_FAILED, LINK_STATE_LINGER)) return; log_warning_link(link, "failed"); @@ -230,13 +250,13 @@ 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; } @@ -244,7 +264,8 @@ static int route_handler(sd_rtnl *rtnl, sd_rtnl_message *m, void *userdata) { r = sd_rtnl_message_get_errno(m); if (r < 0 && r != -EEXIST) log_struct_link(LOG_WARNING, link, - "MESSAGE=%s: could not set route: %s", + "MESSAGE=%*s: could not set route: %s", + IFNAMSIZ, link->ifname, strerror(-r), "ERRNO=%d", -r, NULL); @@ -272,12 +293,12 @@ 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"); - LIST_FOREACH(static_routes, rt, link->network->static_routes) { + LIST_FOREACH(routes, rt, link->network->static_routes) { r = route_configure(rt, link, &route_handler); if (r < 0) { log_warning_link(link, @@ -401,15 +422,16 @@ 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", + "MESSAGE=%*s: could not drop route: %s", + IFNAMSIZ, link->ifname, strerror(-r), "ERRNO=%d", -r, NULL); @@ -427,11 +449,12 @@ 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; } @@ -439,7 +462,8 @@ static int address_handler(sd_rtnl *rtnl, sd_rtnl_message *m, void *userdata) { r = sd_rtnl_message_get_errno(m); if (r < 0 && r != -EEXIST) log_struct_link(LOG_WARNING, link, - "MESSAGE=%s: could not set address: %s", + "MESSAGE=%*s: could not set address: %s", + IFNAMSIZ, link->ifname, strerror(-r), "ERRNO=%d", -r, NULL); @@ -470,7 +494,7 @@ static int link_enter_set_addresses(Link *link) { log_debug_link(link, "setting addresses"); - LIST_FOREACH(static_addresses, ad, link->network->static_addresses) { + LIST_FOREACH(addresses, ad, link->network->static_addresses) { r = address_configure(ad, link, &address_handler); if (r < 0) { log_warning_link(link, @@ -577,7 +601,7 @@ 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; } @@ -585,7 +609,8 @@ static int address_update_handler(sd_rtnl *rtnl, sd_rtnl_message *m, void *userd 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", + "MESSAGE=%*s: could not update address: %s", + IFNAMSIZ, link->ifname, strerror(-r), "ERRNO=%d", -r, NULL); @@ -603,15 +628,16 @@ 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", + "MESSAGE=%*s: could not drop address: %s", + IFNAMSIZ, link->ifname, strerror(-r), "ERRNO=%d", -r, NULL); @@ -627,9 +653,14 @@ static int set_hostname_handler(sd_bus *bus, sd_bus_message *m, void *userdata, 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)); + log_warning_link(link, "Could not set hostname: %s", strerror(-r)); link_unref(link); @@ -665,7 +696,7 @@ static int link_set_hostname(Link *link, const char *hostname) { if (r < 0) return r; - r = sd_bus_call_async(link->manager->bus, m, set_hostname_handler, link, 0, NULL); + r = sd_bus_call_async(link->manager->bus, NULL, m, set_hostname_handler, link, 0); if (r < 0) log_error_link(link, "Could not set transient hostname: %s", strerror(-r)); @@ -682,7 +713,7 @@ 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; } @@ -808,7 +839,7 @@ static int dhcp_lease_lost(Link *link) { if (r >= 0 && hostname) { r = link_set_hostname(link, ""); if (r < 0) - log_error("Failed to reset transient hostname"); + log_error_link(link, "Failed to reset transient hostname"); } } @@ -823,8 +854,6 @@ static int dhcp_lease_acquired(sd_dhcp_client *client, Link *link) { struct in_addr netmask; struct in_addr gateway; unsigned prefixlen; - struct in_addr *nameservers; - size_t nameservers_size; int r; assert(client); @@ -861,7 +890,8 @@ static int dhcp_lease_acquired(sd_dhcp_client *client, Link *link) { if (r >= 0) log_struct_link(LOG_INFO, link, - "MESSAGE=%s: DHCPv4 address %u.%u.%u.%u/%u via %u.%u.%u.%u", + "MESSAGE=%*s: DHCPv4 address %u.%u.%u.%u/%u via %u.%u.%u.%u", + IFNAMSIZ, link->ifname, ADDRESS_FMT_VAL(address), prefixlen, @@ -875,7 +905,8 @@ static int dhcp_lease_acquired(sd_dhcp_client *client, Link *link) { NULL); else log_struct_link(LOG_INFO, link, - "MESSAGE=%s: DHCPv4 address %u.%u.%u.%u/%u", + "MESSAGE=%*s: DHCPv4 address %u.%u.%u.%u/%u", + IFNAMSIZ, link->ifname, ADDRESS_FMT_VAL(address), prefixlen, @@ -887,15 +918,6 @@ static int dhcp_lease_acquired(sd_dhcp_client *client, Link *link) { link->dhcp_lease = lease; - if (link->network->dhcp_dns) { - r = sd_dhcp_lease_get_dns(lease, &nameservers, &nameservers_size); - if (r >= 0) { - r = manager_update_resolv_conf(link->manager); - if (r < 0) - log_error("Failed to update resolv.conf"); - } - } - if (link->network->dhcp_mtu) { uint16_t mtu; @@ -915,7 +937,7 @@ static int dhcp_lease_acquired(sd_dhcp_client *client, Link *link) { if (r >= 0) { r = link_set_hostname(link, hostname); if (r < 0) - log_error("Failed to set transient hostname " + log_error_link(link, "Failed to set transient hostname " "to '%s'", hostname); } } @@ -933,7 +955,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) { @@ -1110,7 +1132,8 @@ static int ipv4ll_address_claimed(sd_ipv4ll *ll, Link *link) { return r; log_struct_link(LOG_INFO, link, - "MESSAGE=%s: IPv4 link-local address %u.%u.%u.%u", + "MESSAGE=%*s: IPv4 link-local address %u.%u.%u.%u", + IFNAMSIZ, link->ifname, ADDRESS_FMT_VAL(address), NULL); @@ -1128,6 +1151,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: @@ -1204,8 +1230,13 @@ bool link_has_carrier(unsigned flags, uint8_t operstate) { return false; } +#define FLAG_STRING(string, flag, old, new) \ + (((old ^ new) & flag) \ + ? ((old & flag) ? (" -" string) : (" +" string)) \ + : "") + static int link_update_flags(Link *link, sd_rtnl_message *m) { - unsigned flags, flags_added, flags_removed, generic_flags; + unsigned flags, unknown_flags_added, unknown_flags_removed, unknown_flags; uint8_t operstate; bool carrier_gained = false, carrier_lost = false; int r; @@ -1227,70 +1258,46 @@ static int link_update_flags(Link *link, sd_rtnl_message *m) { 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 | IFF_RUNNING); - - 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, "unknown link flags gained: %#.5x (ignoring)", - flags_added & generic_flags); - - if (flags_removed & generic_flags) - log_debug_link(link, "unknown link flags lost: %#.5x (ignoring)", - flags_removed & generic_flags); + if (link->flags != flags) { + log_debug_link(link, "flags change:%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s", + FLAG_STRING("LOOPBACK", IFF_LOOPBACK, link->flags, flags), + FLAG_STRING("MASTER", IFF_MASTER, link->flags, flags), + FLAG_STRING("SLAVE", IFF_SLAVE, link->flags, flags), + FLAG_STRING("UP", IFF_UP, link->flags, flags), + FLAG_STRING("DORMANT", IFF_DORMANT, link->flags, flags), + FLAG_STRING("LOWER_UP", IFF_LOWER_UP, link->flags, flags), + FLAG_STRING("RUNNING", IFF_RUNNING, link->flags, flags), + FLAG_STRING("MULTICAST", IFF_MULTICAST, link->flags, flags), + FLAG_STRING("BROADCAST", IFF_BROADCAST, link->flags, flags), + FLAG_STRING("POINTOPOINT", IFF_POINTOPOINT, link->flags, flags), + FLAG_STRING("PROMISC", IFF_PROMISC, link->flags, flags), + FLAG_STRING("ALLMULTI", IFF_ALLMULTI, link->flags, flags), + FLAG_STRING("PORTSEL", IFF_PORTSEL, link->flags, flags), + FLAG_STRING("AUTOMEDIA", IFF_AUTOMEDIA, link->flags, flags), + FLAG_STRING("DYNAMIC", IFF_DYNAMIC, link->flags, flags), + FLAG_STRING("NOARP", IFF_NOARP, link->flags, flags), + FLAG_STRING("NOTRAILERS", IFF_NOTRAILERS, link->flags, flags), + FLAG_STRING("DEBUG", IFF_DEBUG, link->flags, flags), + FLAG_STRING("ECHO", IFF_ECHO, link->flags, flags)); + + unknown_flags = ~(IFF_LOOPBACK | IFF_MASTER | IFF_SLAVE | IFF_UP | + IFF_DORMANT | IFF_LOWER_UP | IFF_RUNNING | + IFF_MULTICAST | IFF_BROADCAST | IFF_POINTOPOINT | + IFF_PROMISC | IFF_ALLMULTI | IFF_PORTSEL | + IFF_AUTOMEDIA | IFF_DYNAMIC | IFF_NOARP | + IFF_NOTRAILERS | IFF_DEBUG | IFF_ECHO); + unknown_flags_added = ((link->flags ^ flags) & flags & unknown_flags); + unknown_flags_removed = ((link->flags ^ flags) & link->flags & unknown_flags); + + /* link flags are currently at most 18 bits, let's align to printing 20 */ + if (unknown_flags_added) + log_debug_link(link, "unknown link flags gained: %#.5x (ignoring)", + unknown_flags_added); + + if (unknown_flags_removed) + log_debug_link(link, "unknown link flags lost: %#.5x (ignoring)", + unknown_flags_removed); + } carrier_gained = !link_has_carrier(link->flags, link->operstate) && link_has_carrier(flags, operstate); @@ -1335,7 +1342,7 @@ 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; } @@ -1345,7 +1352,8 @@ static int link_up_handler(sd_rtnl *rtnl, sd_rtnl_message *m, void *userdata) { /* we warn but don't fail the link, as it may be brought up later */ log_struct_link(LOG_WARNING, link, - "MESSAGE=%s: could not bring up interface: %s", + "MESSAGE=%*s: could not bring up interface: %s", + IFNAMSIZ, link->ifname, strerror(-r), "ERRNO=%d", -r, NULL); @@ -1417,12 +1425,13 @@ 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; } @@ -1430,7 +1439,8 @@ static int enslave_handler(sd_rtnl *rtnl, sd_rtnl_message *m, void *userdata) { r = sd_rtnl_message_get_errno(m); if (r < 0) { log_struct_link(LOG_ERR, link, - "MESSAGE=%s: could not enslave: %s", + "MESSAGE=%*s: could not enslave: %s", + IFNAMSIZ, link->ifname, strerror(-r), "ERRNO=%d", -r, NULL); @@ -1462,23 +1472,51 @@ static int link_enter_enslave(Link *link) { link_save(link); - if (!link->network->bridge && !link->network->bond && + if (!link->network->bridge && + !link->network->bond && + !link->network->tunnel && hashmap_isempty(link->network->vlans) && hashmap_isempty(link->network->macvlans)) return link_enslaved(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), + NULL); + + 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", + IFNAMSIZ, + link->ifname, link->network->bond->ifname, strerror(-r), + NETDEV(link->network->bond), + NULL); + link_enter_failed(link); + return r; + } + + link_ref(link); + link->enslaving ++; + } + if (link->network->bridge) { log_struct_link(LOG_DEBUG, link, - "MESSAGE=%s: enslaving by '%s'", - link->ifname, link->network->bridge->name, + "MESSAGE=%*s: enslaving by '%s'", + IFNAMSIZ, + link->ifname, link->network->bridge->ifname, NETDEV(link->network->bridge), NULL); 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->bridge->name, strerror(-r), + "MESSAGE=%*s: could not enslave by '%s': %s", + IFNAMSIZ, + link->ifname, link->network->bridge->ifname, strerror(-r), NETDEV(link->network->bridge), NULL); link_enter_failed(link); @@ -1489,19 +1527,21 @@ static int link_enter_enslave(Link *link) { link->enslaving ++; } - if (link->network->bond) { + if (link->network->tunnel) { log_struct_link(LOG_DEBUG, link, - "MESSAGE=%s: enslaving by '%s'", - link->ifname, link->network->bond->name, - NETDEV(link->network->bond), + "MESSAGE=%*s: enslaving by '%s'", + IFNAMSIZ, + link->ifname, link->network->tunnel->ifname, + NETDEV(link->network->tunnel), NULL); - r = netdev_enslave(link->network->bond, link, &enslave_handler); + r = netdev_enslave(link->network->tunnel, link, &enslave_handler); if (r < 0) { log_struct_link(LOG_WARNING, link, - "MESSAGE=%s: could not enslave by '%s': %s", - link->ifname, link->network->bond->name, strerror(-r), - NETDEV(link->network->bond), + "MESSAGE=%*s: could not enslave by '%s': %s", + IFNAMSIZ, + link->ifname, link->network->tunnel->ifname, strerror(-r), + NETDEV(link->network->tunnel), NULL); link_enter_failed(link); return r; @@ -1513,14 +1553,16 @@ static int link_enter_enslave(Link *link) { HASHMAP_FOREACH(vlan, link->network->vlans, i) { log_struct_link(LOG_DEBUG, link, - "MESSAGE=%s: enslaving by '%s'", - link->ifname, vlan->name, NETDEV(vlan), NULL); + "MESSAGE=%*s: enslaving by '%s'", + IFNAMSIZ, + link->ifname, vlan->ifname, NETDEV(vlan), NULL); r = netdev_enslave(vlan, link, &enslave_handler); if (r < 0) { log_struct_link(LOG_WARNING, link, - "MESSAGE=%s: could not enslave by '%s': %s", - link->ifname, vlan->name, strerror(-r), + "MESSAGE=%*s: could not enslave by '%s': %s", + IFNAMSIZ, + link->ifname, vlan->ifname, strerror(-r), NETDEV(vlan), NULL); link_enter_failed(link); return r; @@ -1532,14 +1574,16 @@ static int link_enter_enslave(Link *link) { HASHMAP_FOREACH(macvlan, link->network->macvlans, i) { log_struct_link(LOG_DEBUG, link, - "MESSAGE=%s: enslaving by '%s'", - link->ifname, macvlan->name, NETDEV(macvlan), NULL); + "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", - link->ifname, macvlan->name, strerror(-r), + "MESSAGE=%*s: could not enslave by '%s': %s", + IFNAMSIZ, + link->ifname, macvlan->ifname, strerror(-r), NETDEV(macvlan), NULL); link_enter_failed(link); return r; @@ -1642,7 +1686,7 @@ int link_initialized(Link *link, struct udev_device *device) { if (device) link->udev_device = udev_device_ref(device); - log_debug_link(link, "link initialized"); + log_debug_link(link, "udev initialized link"); r = network_get(link->manager, device, link->ifname, &link->mac, &network); if (r == -ENOENT) { @@ -1662,13 +1706,149 @@ int link_initialized(Link *link, struct udev_device *device) { return 0; } +int link_rtnl_process_address(sd_rtnl *rtnl, sd_rtnl_message *message, void *userdata) { + Manager *m = userdata; + Link *link = NULL; + uint16_t type; + _cleanup_address_free_ Address *address = NULL; + Address *ad; + char buf[INET6_ADDRSTRLEN]; + bool address_dropped = false; + int r, ifindex; + + assert(rtnl); + assert(message); + assert(m); + + r = sd_rtnl_message_get_type(message, &type); + if (r < 0) { + log_warning("rtnl: could not get message type"); + return 0; + } + + r = sd_rtnl_message_addr_get_ifindex(message, &ifindex); + if (r < 0 || ifindex <= 0) { + log_warning("rtnl: received address message without valid ifindex, ignoring"); + return 0; + } else { + r = link_get(m, ifindex, &link); + if (r < 0 || !link) { + log_warning("rtnl: received address for a nonexistent link, ignoring"); + return 0; + } + } + + r = address_new_dynamic(&address); + if (r < 0) + return 0; + + r = sd_rtnl_message_addr_get_family(message, &address->family); + if (r < 0 || !IN_SET(address->family, AF_INET, AF_INET6)) { + log_warning_link(link, "rtnl: received address with invalid family, ignoring"); + return 0; + } + + r = sd_rtnl_message_addr_get_prefixlen(message, &address->prefixlen); + if (r < 0) { + log_warning_link(link, "rtnl: recevied address with invalid prefixlen, ignoring"); + return 0; + } + + switch (address->family) { + case AF_INET: + r = sd_rtnl_message_read_in_addr(message, IFA_LOCAL, &address->in_addr.in); + if (r < 0) { + log_warning_link(link, "rtnl: received address without valid address, ignoring"); + return 0; + } + + break; + + case AF_INET6: + r = sd_rtnl_message_read_in6_addr(message, IFA_ADDRESS, &address->in_addr.in6); + if (r < 0) { + log_warning_link(link, "rtnl: received address without valid address, ignoring"); + return 0; + } + + break; + + default: + assert_not_reached("invalid address family"); + } + + if (!inet_ntop(address->family, &address->in_addr, buf, INET6_ADDRSTRLEN)) { + log_warning_link(link, "could not print address"); + return 0; + } + + LIST_FOREACH(addresses, ad, link->addresses) { + if (address_equal(ad, address)) { + LIST_REMOVE(addresses, link->addresses, ad); + + address_free(ad); + + address_dropped = true; + + break; + } + } + + switch (type) { + case RTM_NEWADDR: + if (!address_dropped) + log_debug_link(link, "added address: %s/%u", buf, + address->prefixlen); + + LIST_PREPEND(addresses, link->addresses, address); + address = NULL; + + break; + case RTM_DELADDR: + if (address_dropped) + log_debug_link(link, "removed address: %s/%u", buf, + address->prefixlen); + + break; + default: + assert_not_reached("Received invalid RTNL message type"); + } + + 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; _cleanup_udev_device_unref_ struct udev_device *device = NULL; char ifindex_str[2 + DECIMAL_STR_MAX(int)]; int r; assert(m); + assert(m->rtnl); assert(message); assert(ret); @@ -1678,7 +1858,15 @@ int link_add(Manager *m, sd_rtnl_message *message, Link **ret) { link = *ret; - log_debug_link(link, "link added"); + log_debug_link(link, "link %"PRIu64" added", link->ifindex); + + r = sd_rtnl_message_new_addr(m->rtnl, &req, RTM_GETADDR, link->ifindex, 0); + if (r < 0) + return r; + + r = sd_rtnl_call_async(m->rtnl, req, link_get_address_handler, link, 0, NULL); + if (r < 0) + return r; if (detect_container(NULL) <= 0) { /* not in a container, udev will be around */ @@ -1689,9 +1877,11 @@ int link_add(Manager *m, sd_rtnl_message *message, Link **ret) { return -errno; } - if (udev_device_get_is_initialized(device) <= 0) + if (udev_device_get_is_initialized(device) <= 0) { /* not yet ready */ + log_debug_link(link, "udev initializing link..."); return 0; + } } r = link_initialized(link, device); @@ -1710,6 +1900,12 @@ int link_update(Link *link, sd_rtnl_message *m) { assert(link->ifname); assert(m); + if (link->state == LINK_STATE_LINGER) { + link_ref(link); + log_info_link(link, "link readded"); + link->state = LINK_STATE_ENSLAVING; + } + 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); @@ -1769,6 +1965,27 @@ 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(address->family, &address->in_addr, buf, INET6_ADDRSTRLEN)) + fprintf(f, "%s%s", buf, (ad->addresses_next) ? " ": ""); + } + + fputs("\n", f); +} + int link_save(Link *link) { _cleanup_free_ char *temp_path = NULL; _cleanup_fclose_ FILE *f = NULL; @@ -1784,6 +2001,11 @@ int link_save(Link *link) { 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); @@ -1805,12 +2027,18 @@ int link_save(Link *link) { "FLAGS=%u\n", admin_state, oper_state, link->flags); + if (link->network) + serialize_addresses(f, "DNS", link->network->dns); + if (link->dhcp_lease) { r = dhcp_lease_save(link->dhcp_lease, link->lease_file); if (r < 0) goto finish; - fprintf(f, "DHCP_LEASE=%s\n", link->lease_file); + fprintf(f, + "DHCP_LEASE=%s\n" + "DHCP_USE_DNS=%s\n", + link->lease_file, yes_no(link->network->dhcp_dns)); } else unlink(link->lease_file); @@ -1824,7 +2052,7 @@ int link_save(Link *link) { finish: if (r < 0) - log_error("Failed to save link data to %s: %s", link->state_file, strerror(-r)); + log_error_link(link, "Failed to save link data to %s: %s", link->state_file, strerror(-r)); return r; } @@ -1837,6 +2065,7 @@ static const char* const link_state_table[_LINK_STATE_MAX] = { [LINK_STATE_CONFIGURED] = "configured", [LINK_STATE_UNMANAGED] = "unmanaged", [LINK_STATE_FAILED] = "failed", + [LINK_STATE_LINGER] = "linger", }; DEFINE_STRING_TABLE_LOOKUP(link_state, LinkState);