X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;ds=sidebyside;f=src%2Fnetwork%2Fnetworkd-link.c;h=444af8f6db18b64bbc36ac3da1c31bb23bc5d817;hb=1346b1f0388f4100bb3c2a2bb23bc881769c020c;hp=bc8ca21c82afd97ec12f27c06a753a9ee8da1562;hpb=aa3437a573ed2a2b2a03c9649fe11d27b40a772b;p=elogind.git diff --git a/src/network/networkd-link.c b/src/network/networkd-link.c index bc8ca21c8..444af8f6d 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; @@ -134,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; @@ -144,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; } @@ -165,13 +166,12 @@ 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_warning_link(link, "could not set route: %s", strerror(-r)); /* 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); } @@ -191,12 +191,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; } @@ -207,7 +208,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; } @@ -235,11 +237,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_ERR, 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); } @@ -259,12 +264,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; } @@ -275,7 +281,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; } @@ -299,12 +306,101 @@ static int address_drop_handler(sd_rtnl *rtnl, sd_rtnl_message *m, void *userdat r = sd_rtnl_message_get_errno(m); if (r < 0 && r != -EEXIST) - log_warning("%s: could not drop address: %s", - link->ifname, strerror(-r)); + log_warning_link(link, "could not drop address: %s", strerror(-r)); 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(bus); + assert(hostname); + + log_debug("Setting transient hostname: '%s'", hostname); + + 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 && r != -EEXIST) + log_warning_link(link, "Could not set MTU: %s", strerror(-r)); + + 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; @@ -314,18 +410,20 @@ 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) { @@ -340,32 +438,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; } @@ -373,12 +491,25 @@ 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; + + 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; } @@ -390,7 +521,7 @@ static void dhcp_handler(sd_dhcp_client *client, int event, void *userdata) { 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; } @@ -403,6 +534,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); + 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); } @@ -434,8 +598,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; @@ -453,34 +625,33 @@ static int link_update_flags(Link *link, unsigned flags) { return 0; if (link->flags == flags) { - log_debug("%s: link status unchanged: %#x", link->ifname, flags); + log_debug_link(link, "link status unchanged: %#.8x", flags); return 0; } - if ((link->flags & IFF_UP) != (flags & IFF_UP)) { - if (flags & IFF_UP) - log_info("%s: power on", link->ifname); - else - log_info("%s: power off", link->ifname); - } + if ((link->flags & IFF_UP) != (flags & IFF_UP)) + log_info_link(link, + "power %s", flags & IFF_UP ? "on": "off"); if ((link->flags & IFF_LOWER_UP) != (flags & IFF_LOWER_UP)) { if (flags & IFF_LOWER_UP) { - log_info("%s: carrier on", link->ifname); + 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 { - log_info("%s: carrier off", link->ifname); + 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; } @@ -488,7 +659,8 @@ static int link_update_flags(Link *link, unsigned flags) { } } - log_debug("%s: link status updated: %#x -> %#x", link->ifname, link->flags, flags); + log_debug_link(link, + "link status updated: %#.8x -> %#.8x", link->flags, flags); link->flags = flags; @@ -506,8 +678,8 @@ 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_warning_link(link, + "could not bring up interface: %s", strerror(-r)); link_enter_failed(link); } @@ -524,23 +696,24 @@ 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); 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; } @@ -579,13 +752,20 @@ static int bridge_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 join bridge '%s': %s", - link->ifname, link->network->bridge->name, strerror(-r)); + log_struct_link(LOG_ERR, link, + "MESSAGE=%s: could not join bridge '%s': %s", + link->ifname, link->network->bridge->name, strerror(-r), + BRIDGE(link->network->bridge), + NULL); link_enter_failed(link); return 1; - } else - log_debug("%s: joined bridge '%s'", - link->ifname, link->network->bridge->name); + } + + log_struct_link(LOG_DEBUG, link, + "MESSAGE=%s: joined bridge '%s'", + link->network->bridge->name, + BRIDGE(link->network->bridge), + NULL); link_bridge_joined(link); @@ -604,12 +784,20 @@ static int link_enter_join_bridge(Link *link) { if (!link->network->bridge) return link_bridge_joined(link); - log_debug("%s: joining bridge", link->ifname); + log_struct_link(LOG_DEBUG, link, + "MESSAGE=%s: joining bridge '%s'", + link->network->bridge->name, + BRIDGE(link->network->bridge), + NULL); + log_debug_link(link, "joining bridge"); 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); + log_struct_link(LOG_WARNING, link, + "MESSAGE=%s: could not join bridge '%s': %s", + link->network->bridge->name, strerror(-r), + BRIDGE(link->network->bridge), + NULL); link_enter_failed(link); return r; } @@ -628,12 +816,11 @@ 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_warning_link(link, "could not get state: %s", strerror(-r)); link_enter_failed(link); } - log_debug("%s: got link state", link->ifname); + log_debug_link(link, "got link state"); link_update(link, m); @@ -648,17 +835,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; } @@ -683,6 +871,8 @@ int link_configure(Link *link) { int link_update(Link *link, sd_rtnl_message *m) { unsigned flags; + void *data; + uint16_t type; int r; assert(link); @@ -693,9 +883,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); }