X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Fnetwork%2Fnetworkd-link.c;h=6e6fb8393e97ffca32d5b67418439e678c8c7bcd;hb=f3a740a5dae792fb6b2d411022ce8c29ced1c3f1;hp=6ce965b3851ea56ce412a4162919f3b83db267c3;hpb=5ea846cc5197682d07ee46398996a8c3ccfbcc38;p=elogind.git diff --git a/src/network/networkd-link.c b/src/network/networkd-link.c index 6ce965b38..6e6fb8393 100644 --- a/src/network/networkd-link.c +++ b/src/network/networkd-link.c @@ -75,12 +75,12 @@ static int link_new(Manager *manager, sd_rtnl_message *message, Link **ret) { if (!link->ifname) return -ENOMEM; - r = asprintf(&link->state_file, "/run/systemd/network/links/%"PRIu64, + r = asprintf(&link->state_file, "/run/systemd/netif/links/%"PRIu64, link->ifindex); if (r < 0) return -ENOMEM; - r = asprintf(&link->lease_file, "/run/systemd/network/leases/%"PRIu64, + r = asprintf(&link->lease_file, "/run/systemd/netif/leases/%"PRIu64, link->ifindex); if (r < 0) return -ENOMEM; @@ -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); @@ -257,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); @@ -290,7 +298,7 @@ static int link_enter_set_routes(Link *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, @@ -422,7 +430,8 @@ static int route_drop_handler(sd_rtnl *rtnl, sd_rtnl_message *m, void *userdata) r = sd_rtnl_message_get_errno(m); 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); @@ -453,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); @@ -484,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, @@ -599,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); @@ -625,7 +636,8 @@ 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 != -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); @@ -648,7 +660,7 @@ static int set_hostname_handler(sd_bus *bus, sd_bus_message *m, void *userdata, 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); @@ -827,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"); } } @@ -842,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); @@ -880,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, @@ -894,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, @@ -906,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; @@ -934,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); } } @@ -1129,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); @@ -1249,9 +1253,9 @@ static int link_update_flags(Link *link, sd_rtnl_message *m) { if (r < 0) /* if we got a message without operstate, take it to mean the state was unchanged */ - operstate = link->operstate; + operstate = link->kernel_operstate; - if ((link->flags == flags) && (link->operstate == operstate)) + if ((link->flags == flags) && (link->kernel_operstate == operstate)) return 0; if (link->flags != flags) { @@ -1295,13 +1299,13 @@ static int link_update_flags(Link *link, sd_rtnl_message *m) { unknown_flags_removed); } - carrier_gained = !link_has_carrier(link->flags, link->operstate) && + carrier_gained = !link_has_carrier(link->flags, link->kernel_operstate) && link_has_carrier(flags, operstate); - carrier_lost = link_has_carrier(link->flags, link->operstate) && + carrier_lost = link_has_carrier(link->flags, link->kernel_operstate) && !link_has_carrier(flags, operstate); link->flags = flags; - link->operstate = operstate; + link->kernel_operstate = operstate; link_save(link); @@ -1348,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); @@ -1434,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); @@ -1475,16 +1481,18 @@ static int link_enter_enslave(Link *link) { if (link->network->bond) { log_struct_link(LOG_DEBUG, link, - "MESSAGE=%s: enslaving by '%s'", - link->ifname, link->network->bond->name, + "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", - link->ifname, link->network->bond->name, strerror(-r), + "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); @@ -1497,16 +1505,18 @@ static int link_enter_enslave(Link *link) { 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); @@ -1519,16 +1529,18 @@ static int link_enter_enslave(Link *link) { if (link->network->tunnel) { log_struct_link(LOG_DEBUG, link, - "MESSAGE=%s: enslaving by '%s'", - link->ifname, link->network->tunnel->name, + "MESSAGE=%*s: enslaving by '%s'", + IFNAMSIZ, + link->ifname, link->network->tunnel->ifname, NETDEV(link->network->tunnel), NULL); 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->tunnel->name, strerror(-r), + "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); @@ -1541,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; @@ -1560,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; @@ -1647,7 +1663,7 @@ static int link_configure(Link *link) { } } - if (link_has_carrier(link->flags, link->operstate)) { + if (link_has_carrier(link->flags, link->kernel_operstate)) { r = link_acquire_conf(link); if (r < 0) return r; @@ -1670,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) { @@ -1695,7 +1711,9 @@ int link_rtnl_process_address(sd_rtnl *rtnl, sd_rtnl_message *message, void *use 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); @@ -1726,13 +1744,19 @@ int link_rtnl_process_address(sd_rtnl *rtnl, sd_rtnl_message *message, void *use r = sd_rtnl_message_addr_get_family(message, &address->family); if (r < 0 || !IN_SET(address->family, AF_INET, AF_INET6)) { - log_warning("rtnl: received address with invalid family, ignoring"); + 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("rtnl: recevied address with invalid prefixlen, ignoring"); + log_warning_link(link, "rtnl: received address with invalid prefixlen, ignoring"); + return 0; + } + + r = sd_rtnl_message_addr_get_scope(message, &address->scope); + if (r < 0) { + log_warning_link(link, "rtnl: received address with invalid scope, ignoring"); return 0; } @@ -1740,7 +1764,7 @@ int link_rtnl_process_address(sd_rtnl *rtnl, sd_rtnl_message *message, void *use case AF_INET: r = sd_rtnl_message_read_in_addr(message, IFA_LOCAL, &address->in_addr.in); if (r < 0) { - log_warning("rtnl: received address without valid address, ignoring"); + log_warning_link(link, "rtnl: received address without valid address, ignoring"); return 0; } @@ -1749,7 +1773,7 @@ int link_rtnl_process_address(sd_rtnl *rtnl, sd_rtnl_message *message, void *use case AF_INET6: r = sd_rtnl_message_read_in6_addr(message, IFA_ADDRESS, &address->in_addr.in6); if (r < 0) { - log_warning("rtnl: received address without valid address, ignoring"); + log_warning_link(link, "rtnl: received address without valid address, ignoring"); return 0; } @@ -1760,19 +1784,42 @@ int link_rtnl_process_address(sd_rtnl *rtnl, sd_rtnl_message *message, void *use } if (!inet_ntop(address->family, &address->in_addr, buf, INET6_ADDRSTRLEN)) { - log_warning("could not print address"); + 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: - log_info("added address: %s/%u to ifindex %d", buf, - address->prefixlen, ifindex); - break; + if (!address_dropped) + log_debug_link(link, "added address: %s/%u", buf, + address->prefixlen); + LIST_PREPEND(addresses, link->addresses, address); + address = NULL; + + link_save(link); + + break; case RTM_DELADDR: - log_info("removed address: %s/%u from ifindex %d", buf, - address->prefixlen, ifindex); + if (address_dropped) { + log_debug_link(link, "removed address: %s/%u", buf, + address->prefixlen); + + link_save(link); + } + break; default: assert_not_reached("Received invalid RTNL message type"); @@ -1822,7 +1869,7 @@ 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) @@ -1841,9 +1888,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); @@ -1927,10 +1976,60 @@ 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(ad->family, &ad->in_addr, buf, INET6_ADDRSTRLEN)) + fprintf(f, "%s%s", buf, (ad->addresses_next) ? " ": ""); + } + + fputs("\n", f); +} + +static void link_update_operstate(Link *link) { + + assert(link); + + if (link->kernel_operstate == IF_OPER_DORMANT) + link->operstate = LINK_OPERSTATE_DORMANT; + else if (link_has_carrier(link->flags, link->kernel_operstate)) { + Address *address; + uint8_t scope = RT_SCOPE_NOWHERE; + + /* if we have carrier, check what addresses we have */ + LIST_FOREACH(addresses, address, link->addresses) { + if (address->scope < scope) + scope = address->scope; + } + + if (scope < RT_SCOPE_SITE) + /* universally accessible addresses found */ + link->operstate = LINK_OPERSTATE_ROUTABLE; + else if (scope < RT_SCOPE_HOST) + /* only link or site local addresses found */ + link->operstate = LINK_OPERSTATE_DEGRADED; + else + /* no useful addresses found */ + link->operstate = LINK_OPERSTATE_CARRIER; + } else + link->operstate = LINK_OPERSTATE_UNKNOWN; +} + int link_save(Link *link) { _cleanup_free_ char *temp_path = NULL; _cleanup_fclose_ FILE *f = NULL; - const char *admin_state, *oper_state = "unknown"; + const char *admin_state, *oper_state; int r; assert(link); @@ -1938,6 +2037,8 @@ int link_save(Link *link) { assert(link->lease_file); assert(link->manager); + link_update_operstate(link); + r = manager_save(link->manager); if (r < 0) return r; @@ -1950,10 +2051,8 @@ int link_save(Link *link) { admin_state = link_state_to_string(link->state); assert(admin_state); - if (link->operstate == IF_OPER_DORMANT) - oper_state = "dormant"; - else if (link_has_carrier(link->flags, link->operstate)) - oper_state = "carrier"; + oper_state = link_operstate_to_string(link->operstate); + assert(oper_state); r = fopen_temporary(link->state_file, &f, &temp_path); if (r < 0) @@ -1968,12 +2067,23 @@ int link_save(Link *link) { "FLAGS=%u\n", admin_state, oper_state, link->flags); + if (link->network) { + serialize_addresses(f, "DNS", link->network->dns); + serialize_addresses(f, "NTP", link->network->ntp); + } + 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" + "DHCP_USE_NTP=%s\n", + link->lease_file, + yes_no(link->network->dhcp_dns), + yes_no(link->network->dhcp_ntp)); } else unlink(link->lease_file); @@ -1987,7 +2097,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; } @@ -2004,3 +2114,13 @@ static const char* const link_state_table[_LINK_STATE_MAX] = { }; DEFINE_STRING_TABLE_LOOKUP(link_state, LinkState); + +static const char* const link_operstate_table[_LINK_OPERSTATE_MAX] = { + [LINK_OPERSTATE_UNKNOWN] = "unknown", + [LINK_OPERSTATE_DORMANT] = "dormant", + [LINK_OPERSTATE_CARRIER] = "carrier", + [LINK_OPERSTATE_DEGRADED] = "degraded", + [LINK_OPERSTATE_ROUTABLE] = "routable", +}; + +DEFINE_STRING_TABLE_LOOKUP(link_operstate, LinkOperationalState);