X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Fnetwork%2Fnetworkd-link.c;h=653beae1d990f58ebe0f874c98e7f381530675e2;hb=2139694e823935d3ac1479aa7c9a78ee3ffdc759;hp=14cc8715ce844224ae2cd30b3c865504e5a4bdcf;hpb=9765ce69e15fd294db9553777b621515fa57f2c6;p=elogind.git diff --git a/src/network/networkd-link.c b/src/network/networkd-link.c index 14cc8715c..653beae1d 100644 --- a/src/network/networkd-link.c +++ b/src/network/networkd-link.c @@ -24,41 +24,60 @@ #include "networkd.h" #include "libudev-private.h" +#include "udev-util.h" #include "util.h" +#include "virt.h" #include "bus-util.h" -#include "net-util.h" +#include "network-internal.h" #include "dhcp-lease-internal.h" -int link_new(Manager *manager, struct udev_device *device, Link **ret) { +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; - const char *ifname; - int r; + uint16_t type; + char *ifname; + int r, ifindex; assert(manager); assert(manager->links); - assert(device); + assert(message); assert(ret); + r = sd_rtnl_message_get_type(message, &type); + if (r < 0) + return r; + else if (type != RTM_NEWLINK) + return -EINVAL; + + r = sd_rtnl_message_link_get_ifindex(message, &ifindex); + if (r < 0) + return r; + else if (ifindex <= 0) + return -EINVAL; + + r = sd_rtnl_message_read_string(message, IFLA_IFNAME, &ifname); + if (r < 0) + return r; + link = new0(Link, 1); if (!link) return -ENOMEM; link->manager = manager; - link->state = _LINK_STATE_INVALID; - - link->ifindex = udev_device_get_ifindex(device); - if (link->ifindex <= 0) - return -EINVAL; + link->state = LINK_STATE_INITIALIZING; + link->ifindex = ifindex; + link->ifname = strdup(ifname); + if (!link->ifname) + return -ENOMEM; r = asprintf(&link->state_file, "/run/systemd/network/links/%"PRIu64, link->ifindex); if (r < 0) return -ENOMEM; - ifname = udev_device_get_sysname(device); - link->ifname = strdup(ifname); - r = hashmap_put(manager->links, &link->ifindex, link); if (r < 0) return r; @@ -75,16 +94,18 @@ void link_free(Link *link) { assert(link->manager); - sd_dhcp_client_free(link->dhcp_client); + sd_dhcp_client_unref(link->dhcp_client); sd_dhcp_lease_unref(link->dhcp_lease); - sd_ipv4ll_free(link->ipv4ll); + sd_ipv4ll_unref(link->ipv4ll); hashmap_remove(link->manager->links, &link->ifindex); free(link->ifname); free(link->state_file); + udev_device_unref(link->udev_device); + free(link); } @@ -120,13 +141,61 @@ static int link_enter_configured(Link *link) { return 0; } +static void link_enter_unmanaged(Link *link) { + assert(link); + + log_info_link(link, "unmanaged"); + + link->state = LINK_STATE_UNMANAGED; + + link_save(link); +} + +static int link_stop_clients(Link *link) { + int r = 0, k; + + assert(link); + assert(link->manager); + assert(link->manager->event); + + if (!link->network) + return 0; + + if (link->network->dhcp) { + assert(link->dhcp_client); + + k = sd_dhcp_client_stop(link->dhcp_client); + if (k < 0) { + log_warning_link(link, "Could not stop DHCPv4 client: %s", strerror(-r)); + r = k; + } + } + + if (link->network->ipv4ll) { + assert(link->ipv4ll); + + k = sd_ipv4ll_stop(link->ipv4ll); + if (k < 0) { + log_warning_link(link, "Could not stop IPv4 link-local: %s", strerror(-r)); + r = k; + } + } + + return r; +} + static void link_enter_failed(Link *link) { assert(link); + if (link->state == LINK_STATE_FAILED) + return; + log_warning_link(link, "failed"); link->state = LINK_STATE_FAILED; + link_stop_clients(link); + link_save(link); } @@ -164,7 +233,6 @@ static int route_handler(sd_rtnl *rtnl, sd_rtnl_message *m, void *userdata) { static int link_enter_set_routes(Link *link) { Route *rt; - struct in_addr a; int r; assert(link); @@ -174,7 +242,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 || sd_ipv4ll_get_address(link->ipv4ll, &a) < 0)) + (!link->ipv4ll || ipv4ll_is_bound(link->ipv4ll) == false)) return link_enter_configured(link); log_debug_link(link, "setting routes"); @@ -341,7 +409,6 @@ static int address_handler(sd_rtnl *rtnl, sd_rtnl_message *m, void *userdata) { static int link_enter_set_addresses(Link *link) { Address *ad; - struct in_addr a; int r; assert(link); @@ -351,7 +418,7 @@ static int link_enter_set_addresses(Link *link) { link->state = LINK_STATE_SETTING_ADDRESSES; if (!link->network->static_addresses && !link->dhcp_lease && - (!link->ipv4ll || sd_ipv4ll_get_address(link->ipv4ll, &a) < 0)) + (!link->ipv4ll || ipv4ll_is_bound(link->ipv4ll) == false)) return link_enter_set_routes(link); log_debug_link(link, "setting addresses"); @@ -452,6 +519,28 @@ static int link_enter_set_addresses(Link *link) { return 0; } +static int address_update_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 != -ENOENT) + log_struct_link(LOG_WARNING, link, + "MESSAGE=%s: could not update address: %s", + link->ifname, strerror(-r), + "ERRNO=%d", -r, + NULL); + + return 0; +} + static int address_drop_handler(sd_rtnl *rtnl, sd_rtnl_message *m, void *userdata) { Link *link = userdata; int r; @@ -575,8 +664,11 @@ static int link_set_mtu(Link *link, uint32_t mtu) { static int dhcp_lease_lost(Link *link) { _cleanup_address_free_ Address *address = NULL; + _cleanup_route_free_ Route *route_gw = NULL; + _cleanup_route_free_ Route *route = NULL; struct in_addr addr; struct in_addr netmask; + struct in_addr gateway; unsigned prefixlen; int r; @@ -589,8 +681,27 @@ static int dhcp_lease_lost(Link *link) { if (r >= 0) { sd_dhcp_lease_get_address(link->dhcp_lease, &addr); sd_dhcp_lease_get_netmask(link->dhcp_lease, &netmask); + sd_dhcp_lease_get_router(link->dhcp_lease, &gateway); prefixlen = net_netmask_to_prefixlen(&netmask); + r = route_new_dynamic(&route_gw); + if (r >= 0) { + route_gw->family = AF_INET; + route_gw->dst_addr.in = gateway; + route_gw->dst_prefixlen = 32; + route_gw->scope = RT_SCOPE_LINK; + + route_drop(route_gw, link, &route_drop_handler); + } + + r = route_new_dynamic(&route); + if (r >= 0) { + route->family = AF_INET; + route->in_addr.in = gateway; + + route_drop(route, link, &route_drop_handler); + } + address->family = AF_INET; address->in_addr.in = addr; address->prefixlen = prefixlen; @@ -727,7 +838,7 @@ static int dhcp_lease_acquired(sd_dhcp_client *client, Link *link) { static void dhcp_handler(sd_dhcp_client *client, int event, void *userdata) { Link *link = userdata; - int r; + int r = 0; assert(link); assert(link->network); @@ -766,7 +877,10 @@ static void dhcp_handler(sd_dhcp_client *client, int event, void *userdata) { } if (event == DHCP_EVENT_EXPIRED && link->network->ipv4ll) { - r = sd_ipv4ll_start (link->ipv4ll); + if (!sd_ipv4ll_is_running(link->ipv4ll)) + r = sd_ipv4ll_start(link->ipv4ll); + else if (ipv4ll_is_bound(link->ipv4ll)) + r = ipv4ll_address_update(link, false); if (r < 0) { link_enter_failed(link); return; @@ -781,7 +895,10 @@ static void dhcp_handler(sd_dhcp_client *client, int event, void *userdata) { return; } if (link->ipv4ll) { - r = sd_ipv4ll_stop(link->ipv4ll); + if (ipv4ll_is_bound(link->ipv4ll)) + r = ipv4ll_address_update(link, true); + else + r = sd_ipv4ll_stop(link->ipv4ll); if (r < 0) { link_enter_failed(link); return; @@ -799,11 +916,44 @@ static void dhcp_handler(sd_dhcp_client *client, int event, void *userdata) { return; } -static int ipv4ll_address_lost(sd_ipv4ll *ll, Link *link) { +static int ipv4ll_address_update(Link *link, bool deprecate) { + int r; + struct in_addr addr; + + assert(link); + + r = sd_ipv4ll_get_address(link->ipv4ll, &addr); + if (r >= 0) { + _cleanup_address_free_ Address *address = NULL; + + log_debug_link(link, "IPv4 link-local %s %u.%u.%u.%u", + deprecate ? "deprecate" : "approve", + ADDRESS_FMT_VAL(addr)); + + 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 = 16; + address->scope = RT_SCOPE_LINK; + address->cinfo.ifa_prefered = deprecate ? 0 : CACHE_INFO_INFINITY_LIFE_TIME; + address->broadcast.s_addr = address->in_addr.in.s_addr | htonl(0xfffffffflu >> address->prefixlen); + + address_update(address, link, &address_update_handler); + } + + return 0; + +} + +static int ipv4ll_address_lost(Link *link) { int r; struct in_addr addr; - assert(ll); assert(link); r = sd_ipv4ll_get_address(link->ipv4ll, &addr); @@ -844,6 +994,18 @@ static int ipv4ll_address_lost(sd_ipv4ll *ll, Link *link) { return 0; } +static bool ipv4ll_is_bound(sd_ipv4ll *ll) { + int r; + struct in_addr addr; + + assert(ll); + + r = sd_ipv4ll_get_address(ll, &addr); + if (r < 0) + return false; + return true; +} + static int ipv4ll_address_claimed(sd_ipv4ll *ll, Link *link) { struct in_addr address; int r; @@ -877,7 +1039,7 @@ static void ipv4ll_handler(sd_ipv4ll *ll, int event, void *userdata){ switch(event) { case IPV4LL_EVENT_STOP: case IPV4LL_EVENT_CONFLICT: - r = ipv4ll_address_lost(ll, link); + r = ipv4ll_address_lost(link); if (r < 0) { link_enter_failed(link); return; @@ -931,10 +1093,11 @@ static int link_acquire_conf(Link *link) { } static int link_update_flags(Link *link, unsigned flags) { + unsigned flags_added, flags_removed, generic_flags; + bool carrier_gained, carrier_lost; int r; assert(link); - assert(link->network); if (link->state == LINK_STATE_FAILED) return 0; @@ -942,50 +1105,124 @@ static int link_update_flags(Link *link, unsigned flags) { if (link->flags == flags) return 0; - log_debug_link(link, "link status updated: %#.8x -> %#.8x", - link->flags, flags); + flags_added = (link->flags ^ flags) & flags; + flags_removed = (link->flags ^ flags) & link->flags; + generic_flags = ~(IFF_UP | IFF_LOWER_UP | IFF_DORMANT | IFF_DEBUG | + IFF_MULTICAST | IFF_BROADCAST | IFF_PROMISC | + IFF_NOARP | IFF_MASTER | IFF_SLAVE); - if ((link->flags & IFF_UP) != (flags & IFF_UP)) - log_info_link(link, - "link is %s", flags & IFF_UP ? "up": "down"); + /* consider link to have carrier when LOWER_UP and !DORMANT - if ((link->flags & IFF_LOWER_UP) != (flags & IFF_LOWER_UP)) { - if (flags & IFF_LOWER_UP) { - log_info_link(link, "carrier on"); + TODO: use proper operstates once we start supporting 802.1X - if (link->network->dhcp || link->network->ipv4ll) { - r = link_acquire_conf(link); - if (r < 0) { - log_warning_link(link, "Could not acquire configuration: %s", strerror(-r)); - link_enter_failed(link); - return r; - } + see Documentation/networking/operstates.txt in the kernel sources + */ + carrier_gained = (((flags_added & IFF_LOWER_UP) && !(flags & IFF_DORMANT)) || + ((flags_removed & IFF_DORMANT) && (flags & IFF_LOWER_UP))); + carrier_lost = ((link->flags & IFF_LOWER_UP) && !(link->flags & IFF_DORMANT)) && + ((flags_removed & IFF_LOWER_UP) || (flags_added & IFF_DORMANT)); + + link->flags = flags; + + if (!link->network) + /* not currently managing this link + we track state changes, but don't log them + they will be logged if and when a network is + applied */ + return 0; + + if (flags_added & IFF_UP) + log_info_link(link, "link is up"); + else if (flags_removed & IFF_UP) + log_info_link(link, "link is down"); + + if (flags_added & IFF_LOWER_UP) + log_debug_link(link, "link is lower up"); + else if (flags_removed & IFF_LOWER_UP) + log_debug_link(link, "link is lower down"); + + if (flags_added & IFF_DORMANT) + log_debug_link(link, "link is dormant"); + else if (flags_removed & IFF_DORMANT) + log_debug_link(link, "link is not dormant"); + + if (flags_added & IFF_DEBUG) + log_debug_link(link, "debugging enabled in the kernel"); + else if (flags_removed & IFF_DEBUG) + log_debug_link(link, "debugging disabled in the kernel"); + + if (flags_added & IFF_MULTICAST) + log_debug_link(link, "multicast enabled"); + else if (flags_removed & IFF_MULTICAST) + log_debug_link(link, "multicast disabled"); + + if (flags_added & IFF_BROADCAST) + log_debug_link(link, "broadcast enabled"); + else if (flags_removed & IFF_BROADCAST) + log_debug_link(link, "broadcast disabled"); + + if (flags_added & IFF_PROMISC) + log_debug_link(link, "promiscuous mode enabled"); + else if (flags_removed & IFF_PROMISC) + log_debug_link(link, "promiscuous mode disabled"); + + if (flags_added & IFF_NOARP) + log_debug_link(link, "ARP protocol disabled"); + else if (flags_removed & IFF_NOARP) + log_debug_link(link, "ARP protocol enabled"); + + if (flags_added & IFF_MASTER) + log_debug_link(link, "link is master"); + else if (flags_removed & IFF_MASTER) + log_debug_link(link, "link is no longer master"); + + if (flags_added & IFF_SLAVE) + log_debug_link(link, "link is slave"); + else if (flags_removed & IFF_SLAVE) + log_debug_link(link, "link is no longer slave"); + + /* link flags are currently at most 18 bits, let's default to printing 20 */ + if (flags_added & generic_flags) + log_debug_link(link, "unknown link flags gained: %#.5x (ignoring)", + flags_added & generic_flags); + + if (flags_removed & generic_flags) + log_debug_link(link, "unknown link flags lost: %#.5x (ignoring)", + flags_removed & generic_flags); + + if (carrier_gained) { + log_info_link(link, "gained carrier"); + + if (link->network->dhcp || link->network->ipv4ll) { + r = link_acquire_conf(link); + if (r < 0) { + log_warning_link(link, "Could not acquire configuration: %s", strerror(-r)); + link_enter_failed(link); + return r; } - } else { - log_info_link(link, "carrier off"); + } + } else if (carrier_lost) { + log_info_link(link, "lost carrier"); - if (link->network->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); - return r; - } + if (link->network->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); + return r; } + } - if (link->network->ipv4ll) { - r = sd_ipv4ll_stop(link->ipv4ll); - if (r < 0) { - log_warning_link(link, "Could not stop IPv4 link-local: %s", strerror(-r)); - link_enter_failed(link); - return r; - } + if (link->network->ipv4ll) { + r = sd_ipv4ll_stop(link->ipv4ll); + if (r < 0) { + log_warning_link(link, "Could not stop IPv4 link-local: %s", strerror(-r)); + link_enter_failed(link); + return r; } } } - link->flags = flags; - return 0; } @@ -1050,10 +1287,12 @@ static int link_enslaved(Link *link) { assert(link->state == LINK_STATE_ENSLAVING); assert(link->network); - r = link_up(link); - if (r < 0) { - link_enter_failed(link); - return r; + if (!(link->flags & IFF_UP)) { + r = link_up(link); + if (r < 0) { + link_enter_failed(link); + return r; + } } if (!link->network->dhcp && !link->network->ipv4ll) @@ -1101,7 +1340,7 @@ static int link_enter_enslave(Link *link) { assert(link); assert(link->network); - assert(link->state == _LINK_STATE_INVALID); + assert(link->state == LINK_STATE_INITIALIZING); link->state = LINK_STATE_ENSLAVING; @@ -1193,104 +1432,35 @@ static int link_enter_enslave(Link *link) { return 0; } -static int link_getlink_handler(sd_rtnl *rtnl, sd_rtnl_message *m, - void *userdata) { - Link *link = userdata; - int r; - - assert(link); - - if (link->state == LINK_STATE_FAILED) - return 1; - - r = sd_rtnl_message_get_errno(m); - if (r < 0) { - 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; - } - - link_update(link, m); - - return 1; -} - -static int link_getlink(Link *link) { - _cleanup_rtnl_message_unref_ sd_rtnl_message *req = NULL; - int r; - - assert(link); - assert(link->manager); - assert(link->manager->rtnl); - - log_debug_link(link, "requesting link status"); - - r = sd_rtnl_message_new_link(link->manager->rtnl, &req, - RTM_GETLINK, link->ifindex); - 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_getlink_handler, - link, 0, NULL); - if (r < 0) { - log_error_link(link, - "Could not send rtnetlink message: %s", strerror(-r)); - return r; - } - - return 0; -} - static int link_configure(Link *link) { int r; assert(link); - assert(link->state == _LINK_STATE_INVALID); - - r = link_getlink(link); - if (r < 0) - return r; - - return link_enter_enslave(link); -} - -int link_add(Manager *m, struct udev_device *device, Link **ret) { - Link *link = NULL; - Network *network; - int r; - - assert(m); - assert(device); - - r = link_new(m, device, &link); - if (r < 0) - return r; - - *ret = link; - - r = network_get(m, device, &network); - if (r < 0) - return r == -ENOENT ? 0 : r; - - r = network_apply(m, network, link); - if (r < 0) - return r; + assert(link->state == LINK_STATE_INITIALIZING); if (link->network->ipv4ll) { + uint8_t seed[8]; r = sd_ipv4ll_new(&link->ipv4ll); if (r < 0) return r; + if (link->udev_device) { + r = net_get_unique_predictable_data(link->udev_device, seed); + if (r >= 0) { + r = sd_ipv4ll_set_address_seed(link->ipv4ll, seed); + if (r < 0) + return r; + } + } + r = sd_ipv4ll_attach_event(link->ipv4ll, NULL, 0); if (r < 0) return r; + r = sd_ipv4ll_set_mac(link->ipv4ll, &link->mac); + if (r < 0) + return r; + r = sd_ipv4ll_set_index(link->ipv4ll, link->ifindex); if (r < 0) return r; @@ -1309,6 +1479,10 @@ int link_add(Manager *m, struct udev_device *device, Link **ret) { if (r < 0) return r; + r = sd_dhcp_client_set_mac(link->dhcp_client, &link->mac); + if (r < 0) + return r; + r = sd_dhcp_client_set_index(link->dhcp_client, link->ifindex); if (r < 0) return r; @@ -1324,64 +1498,155 @@ int link_add(Manager *m, struct udev_device *device, Link **ret) { } } + return link_enter_enslave(link); +} + +int link_initialized(Link *link, struct udev_device *device) { + Network *network; + unsigned flags; + int r; + + assert(link); + assert(link->ifname); + assert(link->manager); + + if (link->state != LINK_STATE_INITIALIZING) + return 0; + + if (device) + link->udev_device = udev_device_ref(device); + + log_debug_link(link, "link initialized"); + + r = network_get(link->manager, device, link->ifname, &link->mac, &network); + if (r == -ENOENT) { + link_enter_unmanaged(link); + return 0; + } else if (r < 0) + return r; + + r = network_apply(link->manager, network, link); + if (r < 0) + return r; + r = link_configure(link); if (r < 0) return r; + /* re-trigger all state updates */ + flags = link->flags; + link->flags = 0; + r = link_update_flags(link, flags); + if (r < 0) + return r; + + return 0; +} + +int link_add(Manager *m, sd_rtnl_message *message, Link **ret) { + Link *link; + _cleanup_udev_device_unref_ struct udev_device *device = NULL; + char ifindex_str[2 + DECIMAL_STR_MAX(int)]; + int r; + + assert(m); + assert(message); + assert(ret); + + r = link_new(m, message, ret); + if (r < 0) + return r; + + link = *ret; + + log_info_link(link, "link added"); + + if (detect_container(NULL) <= 0) { + /* not in a container, udev will be around */ + sprintf(ifindex_str, "n%"PRIu64, link->ifindex); + device = udev_device_new_from_device_id(m->udev, ifindex_str); + if (!device) { + log_warning_link(link, "could not find udev device"); + return -errno; + } + + if (udev_device_get_is_initialized(device) <= 0) + /* not yet ready */ + return 0; + } + + r = link_initialized(link, device); + if (r < 0) + return r; + return 0; } int link_update(Link *link, sd_rtnl_message *m) { unsigned flags; struct ether_addr mac; + char *ifname; int r; assert(link); - assert(link->network); + assert(link->ifname); assert(m); - if (link->state == LINK_STATE_FAILED) + if (link->state == LINK_STATE_FAILED || link->state == LINK_STATE_UNMANAGED) return 0; - if (link->network->dhcp && link->network->dhcp_mtu && - !link->original_mtu) { + 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); + + free(link->ifname); + link->ifname = strdup(ifname); + if (!link->ifname) + return -ENOMEM; + } + + if (!link->original_mtu) { r = sd_rtnl_message_read_u16(m, IFLA_MTU, &link->original_mtu); if (r >= 0) log_debug_link(link, "saved original MTU: %" PRIu16, link->original_mtu); } + /* The kernel may broadcast NEWLINK messages without the MAC address + set, simply ignore them. */ r = sd_rtnl_message_read_ether_addr(m, IFLA_ADDRESS, &mac); - if (r >= 0 && memcmp(&link->mac.ether_addr_octet, &mac.ether_addr_octet, ETH_ALEN)) { + if (r >= 0) { + if (memcmp(link->mac.ether_addr_octet, mac.ether_addr_octet, ETH_ALEN)) { - memcpy(&link->mac.ether_addr_octet, &mac.ether_addr_octet, ETH_ALEN); + memcpy(link->mac.ether_addr_octet, mac.ether_addr_octet, ETH_ALEN); - log_debug_link(link, "MAC address: " - "%02hhx:%02hhx:%02hhx:%02hhx:%02hhx:%02hhx", - mac.ether_addr_octet[0], - mac.ether_addr_octet[1], - mac.ether_addr_octet[2], - mac.ether_addr_octet[3], - mac.ether_addr_octet[4], - mac.ether_addr_octet[5]); + log_debug_link(link, "MAC address: " + "%02hhx:%02hhx:%02hhx:%02hhx:%02hhx:%02hhx", + mac.ether_addr_octet[0], + mac.ether_addr_octet[1], + mac.ether_addr_octet[2], + mac.ether_addr_octet[3], + mac.ether_addr_octet[4], + mac.ether_addr_octet[5]); - if (link->ipv4ll) { - r = sd_ipv4ll_set_mac(link->ipv4ll, &link->mac); - if (r < 0) { - log_warning_link(link, "Could not update MAC " - "address in IPv4LL client: %s", - strerror(-r)); - return r; + if (link->ipv4ll) { + r = sd_ipv4ll_set_mac(link->ipv4ll, &link->mac); + if (r < 0) { + log_warning_link(link, "Could not update MAC " + "address in IPv4LL client: %s", + strerror(-r)); + return r; + } } - } - if (link->dhcp_client) { - r = sd_dhcp_client_set_mac(link->dhcp_client, &link->mac); - if (r < 0) { - log_warning_link(link, "Could not update MAC " - "address in DHCP client: %s", - strerror(-r)); - return r; + if (link->dhcp_client) { + r = sd_dhcp_client_set_mac(link->dhcp_client, &link->mac); + if (r < 0) { + log_warning_link(link, "Could not update MAC " + "address in DHCP client: %s", + strerror(-r)); + return r; + } } } } @@ -1398,11 +1663,15 @@ int link_update(Link *link, sd_rtnl_message *m) { int link_save(Link *link) { _cleanup_free_ char *temp_path = NULL; _cleanup_fclose_ FILE *f = NULL; + const char *state; int r; assert(link); assert(link->state_file); + state = link_state_to_string(link->state); + assert(state); + r = fopen_temporary(link->state_file, &f, &temp_path); if (r < 0) goto finish; @@ -1411,11 +1680,10 @@ int link_save(Link *link) { fprintf(f, "# This is private data. Do not parse.\n" - "STATE=%s\n", - link_state_to_string(link->state)); + "STATE=%s\n", state); if (link->dhcp_lease) { - char *lease_file; + _cleanup_free_ char *lease_file = NULL; r = asprintf(&lease_file, "/run/systemd/network/leases/%"PRIu64, link->ifindex); @@ -1445,10 +1713,12 @@ finish: } static const char* const link_state_table[_LINK_STATE_MAX] = { + [LINK_STATE_INITIALIZING] = "configuring", [LINK_STATE_ENSLAVING] = "configuring", [LINK_STATE_SETTING_ADDRESSES] = "configuring", [LINK_STATE_SETTING_ROUTES] = "configuring", [LINK_STATE_CONFIGURED] = "configured", + [LINK_STATE_UNMANAGED] = "unmanaged", [LINK_STATE_FAILED] = "failed", };