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=dec33e88eec71832bd0f8c899d43fb2087efc7d3;hp=b004936e53ddf21026b652dbe6bc72dd19344ebd;hb=eb0ea358b688a6f83ff305c6b825c61f12b6dcb8;hpb=ff254138525758cc4b0ff749b7bd6b90d00b4204 diff --git a/src/network/networkd-link.c b/src/network/networkd-link.c index b004936e5..dec33e88e 100644 --- a/src/network/networkd-link.c +++ b/src/network/networkd-link.c @@ -25,6 +25,7 @@ #include "networkd.h" #include "libudev-private.h" #include "util.h" +#include "bus-util.h" int link_new(Manager *manager, struct udev_device *device, Link **ret) { _cleanup_link_free_ Link *link = NULL; @@ -89,32 +90,34 @@ void link_free(Link *link) { free(link); } -int link_add(Manager *m, struct udev_device *device) { +int link_add(Manager *m, struct udev_device *device, Link **ret) { Link *link; Network *network; int r; uint64_t ifindex; - const char *devtype; + NetdevKind kind; assert(m); assert(device); ifindex = udev_device_get_ifindex(device); link = hashmap_get(m->links, &ifindex); - if (link) - return 0; + if (link) { + *ret = link; + return -EEXIST; + } r = link_new(m, device, &link); - if (r < 0) { - log_error("Could not create link: %s", strerror(-r)); + if (r < 0) return r; - } - devtype = udev_device_get_devtype(device); - if (streq_ptr(devtype, "bridge")) { - r = bridge_set_link(m, link); - if (r < 0) - return r == -ENOENT ? 0 : 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); @@ -132,7 +135,7 @@ static int link_enter_configured(Link *link) { assert(link); assert(link->state == LINK_STATE_SETTING_ROUTES); - log_info("%s: link configured", link->ifname); + log_info_link(link, "link configured"); link->state = LINK_STATE_CONFIGURED; @@ -142,7 +145,7 @@ static int link_enter_configured(Link *link) { static void link_enter_failed(Link *link) { assert(link); - log_warning("%s: failed", link->ifname); + log_warning_link(link, "failed"); link->state = LINK_STATE_FAILED; } @@ -163,13 +166,16 @@ 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("%s: could not set route: %s", - link->ifname, 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 */ if (link->route_messages == 0 && link->state == LINK_STATE_SETTING_ROUTES) { - log_debug("%s: routes set", link->ifname); + log_debug_link(link, "routes set"); link_enter_configured(link); } @@ -189,12 +195,13 @@ static int link_enter_set_routes(Link *link) { if (!link->network->static_routes && !link->dhcp_route) return link_enter_configured(link); - log_debug("%s: setting routes", link->ifname); + log_debug_link(link, "setting routes"); LIST_FOREACH(static_routes, route, link->network->static_routes) { r = route_configure(route, link, &route_handler); if (r < 0) { - log_warning("%s: could not set routes", link->ifname); + log_warning_link(link, + "could not set routes: %s", strerror(-r)); link_enter_failed(link); return r; } @@ -205,7 +212,8 @@ static int link_enter_set_routes(Link *link) { if (link->dhcp_route) { r = route_configure(link->dhcp_route, link, &route_handler); if (r < 0) { - log_warning("%s: could not set routes", link->ifname); + log_warning_link(link, + "could not set routes: %s", strerror(-r)); link_enter_failed(link); return r; } @@ -233,11 +241,14 @@ 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_warning("%s: could not set address: %s", - link->ifname, strerror(-r)); + log_struct_link(LOG_WARNING, link, + "MESSAGE=%s: could not set address: %s", + link->ifname, strerror(-r), + "ERRNO=%d", -r, + NULL); if (link->addr_messages == 0) { - log_debug("%s: addresses set", link->ifname); + log_debug_link(link, "addresses set"); link_enter_set_routes(link); } @@ -257,12 +268,13 @@ static int link_enter_set_addresses(Link *link) { if (!link->network->static_addresses && !link->dhcp_address) return link_enter_set_routes(link); - log_debug("%s: setting addresses", link->ifname); + log_debug_link(link, "setting addresses"); LIST_FOREACH(static_addresses, address, link->network->static_addresses) { r = address_configure(address, link, &address_handler); if (r < 0) { - log_warning("%s: could not set addresses", link->ifname); + log_warning_link(link, + "could not set addresses: %s", strerror(-r)); link_enter_failed(link); return r; } @@ -273,7 +285,8 @@ static int link_enter_set_addresses(Link *link) { if (link->dhcp_address) { r = address_configure(link->dhcp_address, link, &address_handler); if (r < 0) { - log_warning("%s: could not set addresses", link->ifname); + log_warning_link(link, + "could not set addresses: %s", strerror(-r)); link_enter_failed(link); return r; } @@ -296,13 +309,114 @@ 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("%s: could not drop address: %s", - link->ifname, 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; +} + +static int set_hostname_handler(sd_bus *bus, sd_bus_message *m, void *userdata, sd_bus_error *ret_error) { + int r; + + r = sd_bus_message_get_errno(m); + if (r < 0) + log_warning("Could not set hostname: %s", strerror(-r)); + + return 1; +} + +static int set_hostname(sd_bus *bus, const char *hostname) { + _cleanup_bus_message_unref_ sd_bus_message *m = NULL; + int r = 0; + + assert(hostname); + + log_debug("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."); + return 0; + } + + r = sd_bus_message_new_method_call( + bus, + "org.freedesktop.hostname1", + "/org/freedesktop/hostname1", + "org.freedesktop.hostname1", + "SetHostname", + &m); + if (r < 0) + return r; + + r = sd_bus_message_append(m, "sb", hostname, false); + if (r < 0) + return r; + + r = sd_bus_call_async(bus, m, set_hostname_handler, NULL, 0, NULL); + if (r < 0) + log_error("Could not set transient hostname: %s", strerror(-r)); + + return r; +} + +static int set_mtu_handler(sd_rtnl *rtnl, sd_rtnl_message *m, void *userdata) { + Link *link = userdata; + int r; + + assert(m); + 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_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; + int r; + + assert(link); + assert(link->manager); + assert(link->manager->rtnl); + + log_debug_link(link, "setting MTU: %" PRIu32, mtu); + + r = sd_rtnl_message_link_new(RTM_SETLINK, link->ifindex, &req); + if (r < 0) { + log_error_link(link, "Could not allocate RTM_SETLINK message"); + return r; + } + + r = sd_rtnl_message_append_u32(req, IFLA_MTU, mtu); + if (r < 0) { + log_error_link(link, "Could not append MTU: %s", strerror(-r)); + return r; + } + + r = sd_rtnl_call_async(link->manager->rtnl, req, set_mtu_handler, link, 0, NULL); + if (r < 0) { + log_error_link(link, + "Could not send rtnetlink message: %s", strerror(-r)); + return r; + } + + return 0; +} + static void dhcp_handler(sd_dhcp_client *client, int event, void *userdata) { Link *link = userdata; struct in_addr address; @@ -312,21 +426,29 @@ static void dhcp_handler(sd_dhcp_client *client, int event, void *userdata) { int r; assert(link); + assert(link->network); + assert(link->manager); if (link->state == LINK_STATE_FAILED) return; if (event < 0) { - log_warning("%s: DHCP error: %s", link->ifname, strerror(-event)); + log_warning_link(link, "DHCP error: %s", strerror(-event)); link_enter_failed(link); return; } if (event == DHCP_EVENT_NO_LEASE) - log_debug("%s: IP address in use.", link->ifname); + log_debug_link(link, "IP address in use."); if (event == DHCP_EVENT_IP_CHANGE || event == DHCP_EVENT_EXPIRED || event == DHCP_EVENT_STOP) { + if (link->network->dhcp_critical) { + log_warning_link(link, "DHCPv4 connection considered system critical, " + "ignoring request to reconfigure it down."); + return; + } + if (link->dhcp_address) { address_drop(link->dhcp_address, link, address_drop_handler); @@ -338,32 +460,52 @@ static void dhcp_handler(sd_dhcp_client *client, int event, void *userdata) { route_free(link->dhcp_route); link->dhcp_route = NULL; } + + 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; + } + } + } + + if (link->network->dhcp_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); if (r < 0) { - log_warning("%s: DHCP error: no address", link->ifname); + log_warning_link(link, "DHCP error: no address"); link_enter_failed(link); return; } r = sd_dhcp_client_get_netmask(client, &netmask); if (r < 0) { - log_warning("%s: DHCP error: no netmask", link->ifname); + log_warning_link(link, "DHCP error: no netmask"); link_enter_failed(link); return; } prefixlen = sd_dhcp_client_prefixlen(&netmask); if (prefixlen < 0) { - log_warning("%s: DHCP error: no prefixlen", link->ifname); + log_warning_link(link, "DHCP error: no prefixlen"); link_enter_failed(link); return; } r = sd_dhcp_client_get_router(client, &gateway); if (r < 0) { - log_warning("%s: DHCP error: no router", link->ifname); + log_warning_link(link, "DHCP error: no router"); link_enter_failed(link); return; } @@ -371,12 +513,26 @@ static void dhcp_handler(sd_dhcp_client *client, int event, void *userdata) { if (event == DHCP_EVENT_IP_CHANGE || event == DHCP_EVENT_IP_ACQUIRE) { _cleanup_address_free_ Address *addr = NULL; _cleanup_route_free_ Route *rt = NULL; - - log_info("%s: received config over DHCPv4", link->ifname); + 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); r = address_new_dynamic(&addr); if (r < 0) { - log_error("Could not allocate address"); + log_error_link(link, "Could not allocate address"); link_enter_failed(link); return; } @@ -384,11 +540,11 @@ static void dhcp_handler(sd_dhcp_client *client, int event, void *userdata) { addr->family = AF_INET; addr->in_addr.in = address; addr->prefixlen = prefixlen; - addr->netmask = netmask; + addr->broadcast.s_addr = address.s_addr | ~netmask.s_addr; r = route_new_dynamic(&rt); if (r < 0) { - log_error("Could not allocate route"); + log_error_link(link, "Could not allocate route"); link_enter_failed(link); return; } @@ -401,6 +557,39 @@ static void dhcp_handler(sd_dhcp_client *client, int event, void *userdata) { addr = NULL; rt = NULL; + 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"); + } + } + + 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); + } + } + + if (link->network->dhcp_hostname) { + const char *hostname; + + 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); + } + } + link_enter_set_addresses(link); } @@ -417,9 +606,13 @@ static int link_acquire_conf(Link *link) { assert(link->manager->event); if (!link->dhcp) { - link->dhcp = sd_dhcp_client_new(link->manager->event); - if (!link->dhcp) - return -ENOMEM; + r = sd_dhcp_client_new(&link->dhcp); + if (r < 0) + return r; + + r = sd_dhcp_client_attach_event(link->dhcp, NULL, 0); + if (r < 0) + return r; r = sd_dhcp_client_set_index(link->dhcp, link->ifindex); if (r < 0) @@ -432,8 +625,16 @@ static int link_acquire_conf(Link *link) { r = sd_dhcp_client_set_callback(link->dhcp, dhcp_handler, link); if (r < 0) return r; + + if (link->network->dhcp_mtu) { + r = sd_dhcp_client_set_request_option(link->dhcp, 26); + if (r < 0) + return r; + } } + log_debug_link(link, "acquiring DHCPv4 lease"); + r = sd_dhcp_client_start(link->dhcp); if (r < 0) return r; @@ -450,33 +651,44 @@ static int link_update_flags(Link *link, unsigned flags) { if (link->state == LINK_STATE_FAILED) return 0; - if (link->flags & IFF_UP && !(flags & IFF_UP)) - log_info("%s: interface is down", link->ifname); - else if (!(link->flags & IFF_UP) && flags & IFF_UP) - log_info("%s: interface is up", link->ifname); - - if (link->flags & IFF_LOWER_UP && !(flags & IFF_LOWER_UP)) { - log_info("%s: disconnected", link->ifname); + if (link->flags == flags) { + log_debug_link(link, "link status unchanged: %#.8x", flags); + return 0; + } - if (link->network->dhcp) { - r = sd_dhcp_client_stop(link->dhcp); - if (r < 0) { - link_enter_failed(link); - return r; + if ((link->flags & IFF_UP) != (flags & IFF_UP)) + log_info_link(link, + "link is %s", flags & IFF_UP ? "up": "down"); + + if ((link->flags & IFF_LOWER_UP) != (flags & IFF_LOWER_UP)) { + if (flags & IFF_LOWER_UP) { + log_info_link(link, "carrier on"); + + if (link->network->dhcp) { + r = link_acquire_conf(link); + if (r < 0) { + log_warning_link(link, "Could not acquire DHCPv4 lease: %s", strerror(-r)); + link_enter_failed(link); + return r; + } } - } - } else if (!(link->flags & IFF_LOWER_UP) && flags & IFF_LOWER_UP) { - log_info("%s: connected", link->ifname); - - if (link->network->dhcp) { - r = link_acquire_conf(link); - if (r < 0) { - link_enter_failed(link); - return r; + } else { + log_info_link(link, "carrier off"); + + if (link->network->dhcp) { + r = sd_dhcp_client_stop(link->dhcp); + if (r < 0) { + log_warning_link(link, "Could not stop DHCPv4 client: %s", strerror(-r)); + link_enter_failed(link); + return r; + } } } } + log_debug_link(link, + "link status updated: %#.8x -> %#.8x", link->flags, flags); + link->flags = flags; return 0; @@ -493,9 +705,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("%s: could not bring up interface: %s", - link->ifname, 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); @@ -511,34 +727,35 @@ static int link_up(Link *link) { assert(link->manager); assert(link->manager->rtnl); - log_debug("%s: bringing up link", link->ifname); + log_debug_link(link, "bringing link up"); r = sd_rtnl_message_link_new(RTM_SETLINK, link->ifindex, &req); if (r < 0) { - log_error("Could not allocate RTM_SETLINK message"); + log_error_link(link, "Could not allocate RTM_SETLINK message"); return r; } - r = sd_rtnl_message_link_set_flags(req, IFF_UP); + r = sd_rtnl_message_link_set_flags(req, IFF_UP, IFF_UP); if (r < 0) { - log_error("Could not set link flags"); + log_error_link(link, "Could not set link flags: %s", strerror(-r)); return r; } r = sd_rtnl_call_async(link->manager->rtnl, req, link_up_handler, link, 0, NULL); if (r < 0) { - log_error("Could not send rtnetlink message: %s", strerror(-r)); + log_error_link(link, + "Could not send rtnetlink message: %s", strerror(-r)); return r; } return 0; } -static int link_bridge_joined(Link *link) { +static int link_enslaved(Link *link) { int r; assert(link); - assert(link->state == LINK_STATE_JOINING_BRIDGE); + assert(link->state == LINK_STATE_ENSLAVING); assert(link->network); r = link_up(link); @@ -553,52 +770,90 @@ static int link_bridge_joined(Link *link) { return 0; } -static int bridge_handler(sd_rtnl *rtnl, sd_rtnl_message *m, void *userdata) { +static int enslave_handler(sd_rtnl *rtnl, sd_rtnl_message *m, void *userdata) { Link *link = userdata; int r; assert(link); - assert(link->state == LINK_STATE_JOINING_BRIDGE || link->state == LINK_STATE_FAILED); + assert(link->state == LINK_STATE_ENSLAVING || link->state == LINK_STATE_FAILED); assert(link->network); + link->enslaving --; + if (link->state == LINK_STATE_FAILED) return 1; r = sd_rtnl_message_get_errno(m); if (r < 0) { - log_warning("%s: could not join bridge '%s': %s", - link->ifname, link->network->bridge->name, 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; - } else - log_debug("%s: joined bridge '%s'", - link->ifname, link->network->bridge->name); + } - link_bridge_joined(link); + log_debug_link(link, "enslaved"); + + if (link->enslaving == 0) + link_enslaved(link); return 1; } -static int link_enter_join_bridge(Link *link) { +static int link_enter_enslave(Link *link) { int r; assert(link); assert(link->network); assert(link->state == _LINK_STATE_INVALID); - link->state = LINK_STATE_JOINING_BRIDGE; + link->state = LINK_STATE_ENSLAVING; - if (!link->network->bridge) - return link_bridge_joined(link); + if (!link->network->bridge && !link->network->bond && !link->network->vlan) + return link_enslaved(link); - log_debug("%s: joining bridge", link->ifname); + if (link->network->bridge) { + log_struct_link(LOG_DEBUG, link, + "MESSAGE=%s: enslaving by '%s'", + link->ifname, link->network->bridge->name, + NETDEV(link->network->bridge), + NULL); - r = bridge_join(link->network->bridge, link, &bridge_handler); - if (r < 0) { - log_warning("%s: could not join bridge '%s'", link->ifname, - link->network->bridge->name); - link_enter_failed(link); - return r; + 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), + NETDEV(link->network->bridge), + NULL); + link_enter_failed(link); + return r; + } + + link->enslaving ++; + } + + if (link->network->vlan) { + log_struct_link(LOG_DEBUG, link, + "MESSAGE=%s: enslaving by '%s'", + link->ifname, link->network->vlan->name, + NETDEV(link->network->vlan), + NULL); + + r = netdev_enslave(link->network->vlan, link, &enslave_handler); + if (r < 0) { + log_struct_link(LOG_WARNING, link, + "MESSAGE=%s: could not enslave by '%s': %s", + link->ifname, link->network->vlan->name, + strerror(-r), NETDEV(link->network->vlan), + NULL); + link_enter_failed(link); + return r; + } + + link->enslaving ++; } return 0; @@ -615,12 +870,16 @@ 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("%s: could not get state: %s", - link->ifname, 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("%s: got link state", link->ifname); + log_debug_link(link, "got link state"); link_update(link, m); @@ -635,17 +894,18 @@ static int link_get(Link *link) { assert(link->manager); assert(link->manager->rtnl); - log_debug("%s: requesting link status", link->ifname); + log_debug_link(link, "requesting link status"); r = sd_rtnl_message_link_new(RTM_GETLINK, link->ifindex, &req); if (r < 0) { - log_error("Could not allocate RTM_GETLINK message"); + 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); if (r < 0) { - log_error("Could not send rtnetlink message: %s", strerror(-r)); + log_error_link(link, + "Could not send rtnetlink message: %s", strerror(-r)); return r; } @@ -665,11 +925,13 @@ int link_configure(Link *link) { return r; } - return link_enter_join_bridge(link); + return link_enter_enslave(link); } int link_update(Link *link, sd_rtnl_message *m) { unsigned flags; + void *data; + uint16_t type; int r; assert(link); @@ -680,9 +942,18 @@ int link_update(Link *link, sd_rtnl_message *m) { r = sd_rtnl_message_link_get_flags(m, &flags); if (r < 0) { - log_warning("%s: could not get link flags", link->ifname); + log_warning_link(link, "Could not get link flags"); return r; } + while (sd_rtnl_message_read(m, &type, &data) > 0) { + if (type == IFLA_MTU && link->network->dhcp && + link->network->dhcp_mtu && !link->original_mtu) { + link->original_mtu = *(uint16_t *) data; + log_debug_link(link, "saved original MTU: %" PRIu16, + link->original_mtu); + } + } + return link_update_flags(link, flags); }