X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=src%2Fnetwork%2Fnetworkd-link.c;h=aa23bfbc995900bce786fa951528184d5f93c696;hp=17e7047bd5b62a5862e9bda376a49b666434b763;hb=216816c6bcabd70342593637a55300749a567f5c;hpb=54abf461d6b10dc270c4bb2aeac65f240ff1c5cd diff --git a/src/network/networkd-link.c b/src/network/networkd-link.c index 17e7047bd..aa23bfbc9 100644 --- a/src/network/networkd-link.c +++ b/src/network/networkd-link.c @@ -26,6 +26,7 @@ #include "libudev-private.h" #include "util.h" #include "bus-util.h" +#include "net-util.h" int link_new(Manager *manager, struct udev_device *device, Link **ret) { _cleanup_link_free_ Link *link = NULL; @@ -74,14 +75,8 @@ void link_free(Link *link) { assert(link->manager); - if (link->dhcp) - sd_dhcp_client_free(link->dhcp); - - route_free(link->dhcp_route); - link->dhcp_route = NULL; - - address_free(link->dhcp_address); - link->dhcp_address = NULL; + sd_dhcp_client_free(link->dhcp_client); + sd_dhcp_lease_unref(link->dhcp_lease); hashmap_remove(link->manager->links, &link->ifindex); @@ -90,36 +85,39 @@ void link_free(Link *link) { free(link); } +int link_get(Manager *m, int ifindex, Link **ret) { + Link *link; + uint64_t ifindex_64; + + assert(m); + assert(m->links); + assert(ifindex); + assert(ret); + + ifindex_64 = ifindex; + link = hashmap_get(m->links, &ifindex_64); + if (!link) + return -ENODEV; + + *ret = link; + + return 0; +} + int link_add(Manager *m, struct udev_device *device, Link **ret) { Link *link; Network *network; int r; - uint64_t ifindex; - NetdevKind kind; assert(m); assert(device); - ifindex = udev_device_get_ifindex(device); - link = hashmap_get(m->links, &ifindex); - if (link) { - *ret = link; - return -EEXIST; - } - r = link_new(m, device, &link); if (r < 0) return r; *ret = link; - kind = netdev_kind_from_string(udev_device_get_devtype(device)); - if (kind != _NETDEV_KIND_INVALID) { - r = netdev_set_link(m, kind, link); - if (r < 0 && r != -ENOENT) - return r; - } - r = network_get(m, device, &network); if (r < 0) return r == -ENOENT ? 0 : r; @@ -166,7 +164,11 @@ 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_warning_link(link, "could not set route: %s", strerror(-r)); + log_struct_link(LOG_WARNING, link, + "MESSAGE=%s: could not set route: %s", + link->ifname, strerror(-r), + "ERRNO=%d", -r, + NULL); /* we might have received an old reply after moving back to SETTING_ADDRESSES, * ignore it */ @@ -179,7 +181,7 @@ static int route_handler(sd_rtnl *rtnl, sd_rtnl_message *m, void *userdata) { } static int link_enter_set_routes(Link *link) { - Route *route; + Route *rt; int r; assert(link); @@ -188,13 +190,13 @@ static int link_enter_set_routes(Link *link) { link->state = LINK_STATE_SETTING_ROUTES; - if (!link->network->static_routes && !link->dhcp_route) + if (!link->network->static_routes && !link->dhcp_lease) return link_enter_configured(link); log_debug_link(link, "setting routes"); - LIST_FOREACH(static_routes, route, link->network->static_routes) { - r = route_configure(route, link, &route_handler); + LIST_FOREACH(static_routes, rt, link->network->static_routes) { + r = route_configure(rt, link, &route_handler); if (r < 0) { log_warning_link(link, "could not set routes: %s", strerror(-r)); @@ -205,8 +207,28 @@ static int link_enter_set_routes(Link *link) { link->route_messages ++; } - if (link->dhcp_route) { - r = route_configure(link->dhcp_route, link, &route_handler); + if (link->dhcp_lease) { + _cleanup_route_free_ Route *route = NULL; + 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)); + return r; + } + + r = route_new_dynamic(&route); + if (r < 0) { + log_error_link(link, "Could not allocate route: %s", + strerror(-r)); + return r; + } + + 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)); @@ -237,7 +259,7 @@ 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_ERR, link, + log_struct_link(LOG_WARNING, link, "MESSAGE=%s: could not set address: %s", link->ifname, strerror(-r), "ERRNO=%d", -r, @@ -252,7 +274,7 @@ static int address_handler(sd_rtnl *rtnl, sd_rtnl_message *m, void *userdata) { } static int link_enter_set_addresses(Link *link) { - Address *address; + Address *ad; int r; assert(link); @@ -261,13 +283,13 @@ static int link_enter_set_addresses(Link *link) { link->state = LINK_STATE_SETTING_ADDRESSES; - if (!link->network->static_addresses && !link->dhcp_address) + if (!link->network->static_addresses && !link->dhcp_lease) return link_enter_set_routes(link); log_debug_link(link, "setting addresses"); - LIST_FOREACH(static_addresses, address, link->network->static_addresses) { - r = address_configure(address, link, &address_handler); + LIST_FOREACH(static_addresses, ad, link->network->static_addresses) { + r = address_configure(ad, link, &address_handler); if (r < 0) { log_warning_link(link, "could not set addresses: %s", strerror(-r)); @@ -278,8 +300,41 @@ static int link_enter_set_addresses(Link *link) { link->addr_messages ++; } - if (link->dhcp_address) { - r = address_configure(link->dhcp_address, link, &address_handler); + if (link->dhcp_lease) { + _cleanup_address_free_ Address *address = NULL; + struct in_addr addr; + struct in_addr netmask; + unsigned prefixlen; + + r = sd_dhcp_lease_get_address(link->dhcp_lease, &addr); + if (r < 0) { + log_warning_link(link, "DHCP error: no address: %s", + strerror(-r)); + return r; + } + + r = sd_dhcp_lease_get_netmask(link->dhcp_lease, &netmask); + if (r < 0) { + log_warning_link(link, "DHCP error: no netmask: %s", + strerror(-r)); + return r; + } + + prefixlen = net_netmask_to_prefixlen(&netmask); + + r = address_new_dynamic(&address); + if (r < 0) { + log_error_link(link, "Could not allocate address: %s", + strerror(-r)); + return r; + } + + address->family = AF_INET; + address->in_addr.in = addr; + address->prefixlen = prefixlen; + address->broadcast.s_addr = addr.s_addr | ~netmask.s_addr; + + r = address_configure(address, link, &address_handler); if (r < 0) { log_warning_link(link, "could not set addresses: %s", strerror(-r)); @@ -305,8 +360,12 @@ static int address_drop_handler(sd_rtnl *rtnl, sd_rtnl_message *m, void *userdat return 1; r = sd_rtnl_message_get_errno(m); - if (r < 0 && r != -EEXIST) - log_warning_link(link, "could not drop address: %s", strerror(-r)); + if (r < 0 && r != -ENOENT) + log_struct_link(LOG_WARNING, link, + "MESSAGE=%s: could not drop address: %s", + link->ifname, strerror(-r), + "ERRNO=%d", -r, + NULL); return 1; } @@ -367,14 +426,18 @@ static int set_mtu_handler(sd_rtnl *rtnl, sd_rtnl_message *m, void *userdata) { return 1; r = sd_rtnl_message_get_errno(m); - if (r < 0 && r != -EEXIST) - log_warning_link(link, "Could not set MTU: %s", strerror(-r)); + if (r < 0) + log_struct_link(LOG_WARNING, link, + "MESSAGE=%s: could not set MTU: %s", + link->ifname, strerror(-r), + "ERRNO=%d", -r, + NULL); return 1; } static int link_set_mtu(Link *link, uint32_t mtu) { - _cleanup_sd_rtnl_message_unref_ sd_rtnl_message *req = NULL; + _cleanup_rtnl_message_unref_ sd_rtnl_message *req = NULL; int r; assert(link); @@ -383,7 +446,8 @@ static int link_set_mtu(Link *link, uint32_t mtu) { log_debug_link(link, "setting MTU: %" PRIu32, mtu); - r = sd_rtnl_message_link_new(RTM_SETLINK, link->ifindex, &req); + r = sd_rtnl_message_new_link(link->manager->rtnl, RTM_SETLINK, + link->ifindex, &req); if (r < 0) { log_error_link(link, "Could not allocate RTM_SETLINK message"); return r; @@ -405,174 +469,210 @@ static int link_set_mtu(Link *link, uint32_t mtu) { return 0; } -static void dhcp_handler(sd_dhcp_client *client, int event, void *userdata) { - Link *link = userdata; - struct in_addr address; +static int dhcp_lease_lost(Link *link) { + _cleanup_address_free_ Address *address = NULL; + struct in_addr addr; struct in_addr netmask; - struct in_addr gateway; - int prefixlen; + unsigned prefixlen; int r; assert(link); - assert(link->network); - assert(link->manager); - - if (link->state == LINK_STATE_FAILED) - return; - - if (event < 0) { - log_warning_link(link, "DHCP error: %s", strerror(-event)); - link_enter_failed(link); - return; - } + assert(link->dhcp_lease); - if (event == DHCP_EVENT_NO_LEASE) - log_debug_link(link, "IP address in use."); + 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); + prefixlen = net_netmask_to_prefixlen(&netmask); - if (event == DHCP_EVENT_IP_CHANGE || event == DHCP_EVENT_EXPIRED || - event == DHCP_EVENT_STOP) { - if (link->dhcp_address) { - address_drop(link->dhcp_address, link, address_drop_handler); + address->family = AF_INET; + address->in_addr.in = addr; + address->prefixlen = prefixlen; - address_free(link->dhcp_address); - link->dhcp_address = NULL; - } - - if (link->dhcp_route) { - route_free(link->dhcp_route); - link->dhcp_route = NULL; - } + address_drop(address, link, address_drop_handler); + } - if (link->network->dhcp_mtu) { - uint16_t mtu; + if (link->network->dhcp_mtu) { + uint16_t mtu; - r = sd_dhcp_client_get_mtu(client, &mtu); - if (r >= 0 && link->original_mtu != mtu) { - r = link_set_mtu(link, link->original_mtu); - if (r < 0) { - log_warning_link(link, "DHCP error: could not reset MTU"); - link_enter_failed(link); - return; - } + r = sd_dhcp_lease_get_mtu(link->dhcp_lease, &mtu); + if (r >= 0 && link->original_mtu != mtu) { + r = link_set_mtu(link, link->original_mtu); + if (r < 0) { + log_warning_link(link, "DHCP error: could not reset MTU"); + link_enter_failed(link); + return r; } } + } + + if (link->network->dhcp_hostname) { + const char *hostname = NULL; - if (link->network->dhcp_hostname) { + r = sd_dhcp_lease_get_hostname(link->dhcp_lease, &hostname); + if (r >= 0 && hostname) { r = set_hostname(link->manager->bus, ""); if (r < 0) log_error("Failed to reset transient hostname"); } } - r = sd_dhcp_client_get_address(client, &address); + link->dhcp_lease = sd_dhcp_lease_unref(link->dhcp_lease); + + return 0; +} + +static int dhcp_lease_acquired(sd_dhcp_client *client, Link *link) { + sd_dhcp_lease *lease; + struct in_addr address; + struct in_addr netmask; + struct in_addr gateway; + unsigned prefixlen; + struct in_addr *nameservers; + size_t nameservers_size; + int r; + + assert(client); + assert(link); + + r = sd_dhcp_client_get_lease(client, &lease); if (r < 0) { - log_warning_link(link, "DHCP error: no address"); - link_enter_failed(link); - return; + log_warning_link(link, "DHCP error: no lease: %s", + strerror(-r)); + return r; } - r = sd_dhcp_client_get_netmask(client, &netmask); + r = sd_dhcp_lease_get_address(lease, &address); if (r < 0) { - log_warning_link(link, "DHCP error: no netmask"); - link_enter_failed(link); - return; + log_warning_link(link, "DHCP error: no address: %s", + strerror(-r)); + return r; } - prefixlen = sd_dhcp_client_prefixlen(&netmask); - if (prefixlen < 0) { - log_warning_link(link, "DHCP error: no prefixlen"); - link_enter_failed(link); - return; + r = sd_dhcp_lease_get_netmask(lease, &netmask); + if (r < 0) { + log_warning_link(link, "DHCP error: no netmask: %s", + strerror(-r)); + return r; } - r = sd_dhcp_client_get_router(client, &gateway); + 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"); - link_enter_failed(link); - return; + log_warning_link(link, "DHCP error: no router: %s", + strerror(-r)); + return r; } - if (event == DHCP_EVENT_IP_CHANGE || event == DHCP_EVENT_IP_ACQUIRE) { - _cleanup_address_free_ Address *addr = NULL; - _cleanup_route_free_ Route *rt = NULL; - struct in_addr *nameservers; - size_t nameservers_size; - - 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); + 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); + + 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"); + } + } - r = address_new_dynamic(&addr); - if (r < 0) { - log_error_link(link, "Could not allocate address"); - link_enter_failed(link); - return; + if (link->network->dhcp_mtu) { + uint16_t mtu; + + r = sd_dhcp_lease_get_mtu(lease, &mtu); + if (r >= 0) { + r = link_set_mtu(link, mtu); + if (r < 0) + log_error_link(link, "Failed to set MTU " + "to %" PRIu16, mtu); } + } - addr->family = AF_INET; - addr->in_addr.in = address; - addr->prefixlen = prefixlen; - addr->netmask = netmask; + if (link->network->dhcp_hostname) { + const char *hostname; - r = route_new_dynamic(&rt); - if (r < 0) { - log_error_link(link, "Could not allocate route"); - link_enter_failed(link); - return; + r = sd_dhcp_lease_get_hostname(lease, &hostname); + if (r >= 0) { + r = set_hostname(link->manager->bus, hostname); + if (r < 0) + log_error("Failed to set transient hostname " + "to '%s'", hostname); } + } - rt->family = AF_INET; - rt->in_addr.in = gateway; + link_enter_set_addresses(link); - link->dhcp_address = addr; - link->dhcp_route = rt; - addr = NULL; - rt = NULL; + return 0; +} - if (link->network->dhcp_dns) { - r = sd_dhcp_client_get_dns(client, &nameservers, &nameservers_size); - if (r >= 0) { - r = manager_update_resolv_conf(link->manager); - if (r < 0) - log_error("Failed to update resolv.conf"); - } - } +static void dhcp_handler(sd_dhcp_client *client, int event, void *userdata) { + Link *link = userdata; + int r; - if (link->network->dhcp_mtu) { - uint16_t mtu; - - r = sd_dhcp_client_get_mtu(client, &mtu); - if (r >= 0) { - r = link_set_mtu(link, mtu); - if (r < 0) - log_error_link(link, "Failed to set MTU " - "to %" PRIu16, mtu); + assert(link); + assert(link->network); + assert(link->manager); + + if (link->state == LINK_STATE_FAILED) + return; + + switch (event) { + case DHCP_EVENT_NO_LEASE: + log_debug_link(link, "IP address in use."); + break; + case DHCP_EVENT_EXPIRED: + case DHCP_EVENT_STOP: + case DHCP_EVENT_IP_CHANGE: + if (link->network->dhcp_critical) { + log_error_link(link, "DHCPv4 connection considered system critical, " + "ignoring request to reconfigure it."); + return; } - } - if (link->network->dhcp_hostname) { - const char *hostname; + if (link->dhcp_lease) { + r = dhcp_lease_lost(link); + if (r < 0) { + link_enter_failed(link); + return; + } + } - r = sd_dhcp_client_get_hostname(client, &hostname); - if (r >= 0) { - r = set_hostname(link->manager->bus, hostname); - if (r < 0) - log_error("Failed to set transient hostname " - "to '%s'", hostname); + if (event == DHCP_EVENT_IP_CHANGE) { + r = dhcp_lease_acquired(client, link); + if (r < 0) { + link_enter_failed(link); + return; + } } - } - link_enter_set_addresses(link); + break; + case DHCP_EVENT_IP_ACQUIRE: + r = dhcp_lease_acquired(client, link); + if (r < 0) { + link_enter_failed(link); + return; + } + break; + default: + if (event < 0) + log_warning_link(link, "DHCP error: %s", strerror(-event)); + else + log_warning_link(link, "DHCP unknown event: %d", event); + break; } return; @@ -587,29 +687,29 @@ static int link_acquire_conf(Link *link) { assert(link->manager); assert(link->manager->event); - if (!link->dhcp) { - r = sd_dhcp_client_new(&link->dhcp); + if (!link->dhcp_client) { + r = sd_dhcp_client_new(&link->dhcp_client); if (r < 0) return r; - r = sd_dhcp_client_attach_event(link->dhcp, NULL, 0); + r = sd_dhcp_client_attach_event(link->dhcp_client, NULL, 0); if (r < 0) return r; - r = sd_dhcp_client_set_index(link->dhcp, link->ifindex); + r = sd_dhcp_client_set_index(link->dhcp_client, link->ifindex); if (r < 0) return r; - r = sd_dhcp_client_set_mac(link->dhcp, &link->mac); + r = sd_dhcp_client_set_mac(link->dhcp_client, &link->mac); if (r < 0) return r; - r = sd_dhcp_client_set_callback(link->dhcp, dhcp_handler, link); + r = sd_dhcp_client_set_callback(link->dhcp_client, dhcp_handler, link); if (r < 0) return r; if (link->network->dhcp_mtu) { - r = sd_dhcp_client_set_request_option(link->dhcp, 26); + r = sd_dhcp_client_set_request_option(link->dhcp_client, 26); if (r < 0) return r; } @@ -617,7 +717,7 @@ static int link_acquire_conf(Link *link) { log_debug_link(link, "acquiring DHCPv4 lease"); - r = sd_dhcp_client_start(link->dhcp); + r = sd_dhcp_client_start(link->dhcp_client); if (r < 0) return r; @@ -658,7 +758,7 @@ static int link_update_flags(Link *link, unsigned flags) { log_info_link(link, "carrier off"); if (link->network->dhcp) { - r = sd_dhcp_client_stop(link->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); @@ -687,9 +787,13 @@ static int link_up_handler(sd_rtnl *rtnl, sd_rtnl_message *m, void *userdata) { r = sd_rtnl_message_get_errno(m); if (r < 0) { - log_warning_link(link, - "could not bring up interface: %s", strerror(-r)); + log_struct_link(LOG_ERR, link, + "MESSAGE=%s: could not bring up interface: %s", + link->ifname, strerror(-r), + "ERRNO=%d", -r, + NULL); link_enter_failed(link); + return 1; } link_update_flags(link, link->flags | IFF_UP); @@ -698,7 +802,7 @@ static int link_up_handler(sd_rtnl *rtnl, sd_rtnl_message *m, void *userdata) { } static int link_up(Link *link) { - _cleanup_sd_rtnl_message_unref_ sd_rtnl_message *req = NULL; + _cleanup_rtnl_message_unref_ sd_rtnl_message *req = NULL; int r; assert(link); @@ -707,7 +811,8 @@ static int link_up(Link *link) { log_debug_link(link, "bringing link up"); - r = sd_rtnl_message_link_new(RTM_SETLINK, link->ifindex, &req); + r = sd_rtnl_message_new_link(link->manager->rtnl, RTM_SETLINK, + link->ifindex, &req); if (r < 0) { log_error_link(link, "Could not allocate RTM_SETLINK message"); return r; @@ -763,8 +868,11 @@ static int enslave_handler(sd_rtnl *rtnl, sd_rtnl_message *m, void *userdata) { r = sd_rtnl_message_get_errno(m); if (r < 0) { - log_error_link(link, "could not enslave: %s", - strerror(-r)); + log_struct_link(LOG_ERR, link, + "MESSAGE=%s: could not enslave: %s", + link->ifname, strerror(-r), + "ERRNO=%d", -r, + NULL); link_enter_failed(link); return 1; } @@ -778,6 +886,8 @@ static int enslave_handler(sd_rtnl *rtnl, sd_rtnl_message *m, void *userdata) { } static int link_enter_enslave(Link *link) { + NetDev *vlan; + Iterator i; int r; assert(link); @@ -786,13 +896,14 @@ static int link_enter_enslave(Link *link) { link->state = LINK_STATE_ENSLAVING; - if (!link->network->bridge && !link->network->bond && !link->network->vlan) + if (!link->network->bridge && !link->network->bond && + hashmap_isempty(link->network->vlans)) return link_enslaved(link); if (link->network->bridge) { log_struct_link(LOG_DEBUG, link, "MESSAGE=%s: enslaving by '%s'", - link->network->bridge->name, + link->ifname, link->network->bridge->name, NETDEV(link->network->bridge), NULL); @@ -800,7 +911,7 @@ static int link_enter_enslave(Link *link) { if (r < 0) { log_struct_link(LOG_WARNING, link, "MESSAGE=%s: could not enslave by '%s': %s", - link->network->bridge->name, strerror(-r), + link->ifname, link->network->bridge->name, strerror(-r), NETDEV(link->network->bridge), NULL); link_enter_failed(link); @@ -810,20 +921,17 @@ static int link_enter_enslave(Link *link) { link->enslaving ++; } - if (link->network->vlan) { + HASHMAP_FOREACH(vlan, link->network->vlans, i) { log_struct_link(LOG_DEBUG, link, "MESSAGE=%s: enslaving by '%s'", - link->network->vlan->name, - NETDEV(link->network->vlan), - NULL); + link->ifname, vlan->name, NETDEV(vlan), NULL); - r = netdev_enslave(link->network->vlan, link, &enslave_handler); + 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->network->vlan->name, strerror(-r), - NETDEV(link->network->vlan), - NULL); + link->ifname, vlan->name, strerror(-r), + NETDEV(vlan), NULL); link_enter_failed(link); return r; } @@ -834,7 +942,8 @@ static int link_enter_enslave(Link *link) { return 0; } -static int link_get_handler(sd_rtnl *rtnl, sd_rtnl_message *m, void *userdata) { +static int link_getlink_handler(sd_rtnl *rtnl, sd_rtnl_message *m, + void *userdata) { Link *link = userdata; int r; @@ -845,8 +954,13 @@ static int link_get_handler(sd_rtnl *rtnl, sd_rtnl_message *m, void *userdata) { r = sd_rtnl_message_get_errno(m); if (r < 0) { - log_warning_link(link, "could not get state: %s", strerror(-r)); + 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; } log_debug_link(link, "got link state"); @@ -856,8 +970,8 @@ static int link_get_handler(sd_rtnl *rtnl, sd_rtnl_message *m, void *userdata) { return 1; } -static int link_get(Link *link) { - _cleanup_sd_rtnl_message_unref_ sd_rtnl_message *req = NULL; +static int link_getlink(Link *link) { + _cleanup_rtnl_message_unref_ sd_rtnl_message *req = NULL; int r; assert(link); @@ -866,13 +980,15 @@ static int link_get(Link *link) { log_debug_link(link, "requesting link status"); - r = sd_rtnl_message_link_new(RTM_GETLINK, link->ifindex, &req); + r = sd_rtnl_message_new_link(link->manager->rtnl, RTM_GETLINK, + link->ifindex, &req); 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_get_handler, link, 0, NULL); + 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)); @@ -889,7 +1005,7 @@ int link_configure(Link *link) { assert(link->network); assert(link->state == _LINK_STATE_INVALID); - r = link_get(link); + r = link_getlink(link); if (r < 0) { link_enter_failed(link); return r;