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=04b2265610703fbb69e8cfddb9fc911b9f33174e;hpb=75adc2189bb3b4f993e50f5160c9dff3efaec0b1;p=elogind.git diff --git a/src/network/networkd-link.c b/src/network/networkd-link.c index 04b226561..f1f04a3de 100644 --- a/src/network/networkd-link.c +++ b/src/network/networkd-link.c @@ -37,7 +37,7 @@ 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_free_ Link *link = NULL; + _cleanup_link_unref_ Link *link = NULL; uint16_t type; char *ifname; int r, ifindex; @@ -67,6 +67,7 @@ static int link_new(Manager *manager, sd_rtnl_message *message, Link **ret) { if (!link) return -ENOMEM; + link->n_ref = 1; link->manager = manager; link->state = LINK_STATE_INITIALIZING; link->ifindex = ifindex; @@ -79,6 +80,11 @@ static int link_new(Manager *manager, sd_rtnl_message *message, Link **ret) { if (r < 0) return -ENOMEM; + 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; @@ -89,7 +95,7 @@ static int link_new(Manager *manager, sd_rtnl_message *message, Link **ret) { return 0; } -void link_free(Link *link) { +static void link_free(Link *link) { if (!link) return; @@ -98,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); @@ -110,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; @@ -129,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); @@ -188,7 +226,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"); @@ -205,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) @@ -229,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; } @@ -243,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"); @@ -257,6 +299,7 @@ static int link_enter_set_routes(Link *link) { return r; } + link_ref(link); link->route_messages ++; } @@ -291,6 +334,7 @@ static int link_enter_set_routes(Link *link) { return r; } + link_ref(link); link->route_messages ++; } } @@ -336,6 +380,7 @@ static int link_enter_set_routes(Link *link) { return r; } + link_ref(link); link->route_messages ++; route->family = AF_INET; @@ -349,6 +394,7 @@ static int link_enter_set_routes(Link *link) { return r; } + link_ref(link); link->route_messages ++; } } @@ -368,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; } @@ -390,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) @@ -410,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; } @@ -438,6 +493,7 @@ static int link_enter_set_addresses(Link *link) { return r; } + link_ref(link); link->addr_messages ++; } @@ -473,6 +529,7 @@ static int link_enter_set_addresses(Link *link) { return r; } + link_ref(link); link->addr_messages ++; } } @@ -519,6 +576,7 @@ static int link_enter_set_addresses(Link *link) { return r; } + link_ref(link); link->addr_messages ++; } @@ -533,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) @@ -544,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; } @@ -555,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", @@ -606,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; } @@ -621,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) @@ -632,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; } @@ -665,6 +749,8 @@ static int link_set_mtu(Link *link, uint32_t mtu) { return r; } + link_unref(link); + return 0; } @@ -695,6 +781,7 @@ static int dhcp_lease_lost(Link *link) { route_gw->scope = RT_SCOPE_LINK; route_drop(route_gw, link, &route_drop_handler); + link_ref(link); } r = route_new_dynamic(&route); @@ -703,6 +790,7 @@ static int dhcp_lease_lost(Link *link) { route->in_addr.in = gateway; route_drop(route, link, &route_drop_handler); + link_ref(link); } } @@ -715,6 +803,7 @@ static int dhcp_lease_lost(Link *link) { address->prefixlen = prefixlen; address_drop(address, link, &address_drop_handler); + link_ref(link); } if (link->network->dhcp_mtu) { @@ -736,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"); } @@ -843,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); @@ -863,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) { @@ -963,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; @@ -995,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) { @@ -1008,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; @@ -1055,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: @@ -1117,7 +1212,7 @@ static int link_acquire_conf(Link *link) { return 0; } -static bool link_has_carrier(unsigned flags, uint8_t operstate) { +bool link_has_carrier(unsigned flags, uint8_t operstate) { /* see Documentation/networking/operstates.txt in the kernel sources */ if (operstate == IF_OPER_UP) @@ -1262,8 +1357,10 @@ 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) { @@ -1276,6 +1373,8 @@ static int link_up_handler(sd_rtnl *rtnl, sd_rtnl_message *m, void *userdata) { NULL); } + link_unref(link); + return 1; } @@ -1309,6 +1408,8 @@ static int link_up(Link *link) { return r; } + link_ref(link); + return 0; } @@ -1338,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) { @@ -1354,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; } @@ -1362,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; } @@ -1383,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 ++; } @@ -1440,6 +1549,7 @@ static int link_enter_enslave(Link *link) { return r; } + link_ref(link); link->enslaving ++; } @@ -1458,6 +1568,7 @@ static int link_enter_enslave(Link *link) { return r; } + link_ref(link); link->enslaving ++; } @@ -1622,6 +1733,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); @@ -1682,13 +1799,24 @@ int link_update(Link *link, sd_rtnl_message *m) { } int link_save(Link *link) { - _cleanup_free_ char *temp_path = NULL, *lease_file = NULL; + _cleanup_free_ char *temp_path = NULL; _cleanup_fclose_ FILE *f = NULL; const char *admin_state, *oper_state = "unknown"; int r; assert(link); assert(link->state_file); + assert(link->lease_file); + assert(link->manager); + + 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); @@ -1698,11 +1826,6 @@ int link_save(Link *link) { 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) goto finish; @@ -1717,13 +1840,13 @@ int link_save(Link *link) { admin_state, oper_state, link->flags); if (link->dhcp_lease) { - 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(lease_file); + unlink(link->lease_file); fflush(f); @@ -1735,7 +1858,7 @@ 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; } @@ -1748,6 +1871,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);