X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=src%2Fnetwork%2Fnetworkd-link.c;h=927dbb196001bae83286b677439fab5b0231967e;hp=e2d61ae490f4024b986e13858018f0428ff53a19;hb=e9189a1f56e5dd418d13dfcf3a7f5a701884858e;hpb=151b9b9662a90455262ce575a8a8ae74bf4ff336 diff --git a/src/network/networkd-link.c b/src/network/networkd-link.c index e2d61ae49..927dbb196 100644 --- a/src/network/networkd-link.c +++ b/src/network/networkd-link.c @@ -26,15 +26,20 @@ #include "libudev-private.h" #include "util.h" #include "bus-util.h" -#include "net-util.h" +#include "network-internal.h" + +#include "dhcp-lease-internal.h" + +static int ipv4ll_address_update(Link *link, bool deprecate); +static bool ipv4ll_is_bound(sd_ipv4ll *ll); int link_new(Manager *manager, struct udev_device *device, Link **ret) { _cleanup_link_free_ Link *link = NULL; - const char *mac; - struct ether_addr *mac_addr; const char *ifname; int r; + assert(manager); + assert(manager->links); assert(device); assert(ret); @@ -49,12 +54,10 @@ int link_new(Manager *manager, struct udev_device *device, Link **ret) { if (link->ifindex <= 0) return -EINVAL; - mac = udev_device_get_sysattr_value(device, "address"); - if (mac) { - mac_addr = ether_aton(mac); - if (mac_addr) - memcpy(&link->mac, mac_addr, sizeof(struct ether_addr)); - } + 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); @@ -63,6 +66,8 @@ int link_new(Manager *manager, struct udev_device *device, Link **ret) { if (r < 0) return r; + link->udev_device = udev_device_ref(device); + *ret = link; link = NULL; @@ -75,12 +80,17 @@ 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_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); } @@ -104,31 +114,6 @@ int link_get(Manager *m, int ifindex, Link **ret) { return 0; } -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; - - return 0; -} - static int link_enter_configured(Link *link) { assert(link); assert(link->state == LINK_STATE_SETTING_ROUTES); @@ -137,6 +122,8 @@ static int link_enter_configured(Link *link) { link->state = LINK_STATE_CONFIGURED; + link_save(link); + return 0; } @@ -146,6 +133,8 @@ static void link_enter_failed(Link *link) { log_warning_link(link, "failed"); link->state = LINK_STATE_FAILED; + + link_save(link); } static int route_handler(sd_rtnl *rtnl, sd_rtnl_message *m, void *userdata) { @@ -190,7 +179,8 @@ static int link_enter_set_routes(Link *link) { link->state = LINK_STATE_SETTING_ROUTES; - if (!link->network->static_routes && !link->dhcp_lease) + if (!link->network->static_routes && !link->dhcp_lease && + (!link->ipv4ll || ipv4ll_is_bound(link->ipv4ll) == false)) return link_enter_configured(link); log_debug_link(link, "setting routes"); @@ -207,8 +197,44 @@ static int link_enter_set_routes(Link *link) { link->route_messages ++; } + if (link->ipv4ll && !link->dhcp_lease) { + _cleanup_route_free_ Route *route = NULL; + struct in_addr addr; + + r = sd_ipv4ll_get_address(link->ipv4ll, &addr); + if (r < 0 && r != -ENOENT) { + log_warning_link(link, "IPV4LL error: no address: %s", + strerror(-r)); + return r; + } + + if (r != -ENOENT) { + 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->scope = RT_SCOPE_LINK; + route->metrics = 99; + + r = route_configure(route, link, &route_handler); + if (r < 0) { + log_warning_link(link, + "could not set routes: %s", strerror(-r)); + link_enter_failed(link); + return r; + } + + link->route_messages ++; + } + } + if (link->dhcp_lease) { _cleanup_route_free_ Route *route = NULL; + _cleanup_route_free_ Route *route_gw = NULL; struct in_addr gateway; r = sd_dhcp_lease_get_router(link->dhcp_lease, &gateway); @@ -225,6 +251,30 @@ static int link_enter_set_routes(Link *link) { return r; } + r = route_new_dynamic(&route_gw); + if (r < 0) { + log_error_link(link, "Could not allocate route: %s", + strerror(-r)); + return r; + } + + /* The dhcp netmask may mask out the gateway. Add an explicit + * route for the gw host so that we can route no matter the + * netmask or existing kernel route tables. */ + route_gw->family = AF_INET; + route_gw->dst_addr.in = gateway; + route_gw->dst_prefixlen = 32; + route_gw->scope = RT_SCOPE_LINK; + + r = route_configure(route_gw, link, &route_handler); + if (r < 0) { + log_warning_link(link, + "could not set host route: %s", strerror(-r)); + return r; + } + + link->route_messages ++; + route->family = AF_INET; route->in_addr.in = gateway; @@ -242,6 +292,28 @@ static int link_enter_set_routes(Link *link) { return 0; } +static int route_drop_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 drop route: %s", + link->ifname, strerror(-r), + "ERRNO=%d", -r, + NULL); + + return 0; +} + static int address_handler(sd_rtnl *rtnl, sd_rtnl_message *m, void *userdata) { Link *link = userdata; int r; @@ -283,7 +355,8 @@ static int link_enter_set_addresses(Link *link) { link->state = LINK_STATE_SETTING_ADDRESSES; - if (!link->network->static_addresses && !link->dhcp_lease) + if (!link->network->static_addresses && !link->dhcp_lease && + (!link->ipv4ll || ipv4ll_is_bound(link->ipv4ll) == false)) return link_enter_set_routes(link); log_debug_link(link, "setting addresses"); @@ -300,6 +373,42 @@ static int link_enter_set_addresses(Link *link) { link->addr_messages ++; } + if (link->ipv4ll && !link->dhcp_lease) { + _cleanup_address_free_ Address *ll_addr = NULL; + struct in_addr addr; + + r = sd_ipv4ll_get_address(link->ipv4ll, &addr); + if (r < 0 && r != -ENOENT) { + log_warning_link(link, "IPV4LL error: no address: %s", + strerror(-r)); + return r; + } + + if (r != -ENOENT) { + r = address_new_dynamic(&ll_addr); + if (r < 0) { + log_error_link(link, "Could not allocate address: %s", strerror(-r)); + return r; + } + + ll_addr->family = AF_INET; + ll_addr->in_addr.in = addr; + ll_addr->prefixlen = 16; + ll_addr->broadcast.s_addr = ll_addr->in_addr.in.s_addr | htonl(0xfffffffflu >> ll_addr->prefixlen); + ll_addr->scope = RT_SCOPE_LINK; + + r = address_configure(ll_addr, link, &address_handler); + if (r < 0) { + log_warning_link(link, + "could not set addresses: %s", strerror(-r)); + link_enter_failed(link); + return r; + } + + link->addr_messages ++; + } + } + if (link->dhcp_lease) { _cleanup_address_free_ Address *address = NULL; struct in_addr addr; @@ -348,6 +457,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; @@ -367,7 +498,7 @@ static int address_drop_handler(sd_rtnl *rtnl, sd_rtnl_message *m, void *userdat "ERRNO=%d", -r, NULL); - return 1; + return 0; } static int set_hostname_handler(sd_bus *bus, sd_bus_message *m, void *userdata, sd_bus_error *ret_error) { @@ -471,8 +602,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; @@ -485,13 +619,32 @@ 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; - address_drop(address, link, address_drop_handler); + address_drop(address, link, &address_drop_handler); } if (link->network->dhcp_mtu) { @@ -623,7 +776,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); @@ -661,6 +814,17 @@ static void dhcp_handler(sd_dhcp_client *client, int event, void *userdata) { } } + if (event == DHCP_EVENT_EXPIRED && link->network->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; + } + } + break; case DHCP_EVENT_IP_ACQUIRE: r = dhcp_lease_acquired(client, link); @@ -668,6 +832,16 @@ static void dhcp_handler(sd_dhcp_client *client, int event, void *userdata) { link_enter_failed(link); return; } + if (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; + } + } break; default: if (event < 0) @@ -680,53 +854,185 @@ static void dhcp_handler(sd_dhcp_client *client, int event, void *userdata) { return; } -static int link_acquire_conf(Link *link) { +static int ipv4ll_address_update(Link *link, bool deprecate) { int r; + struct in_addr addr; assert(link); - assert(link->network); - assert(link->network->dhcp); - assert(link->manager); - assert(link->manager->event); - if (!link->dhcp_client) { - r = sd_dhcp_client_new(&link->dhcp_client); - if (r < 0) - return r; + r = sd_ipv4ll_get_address(link->ipv4ll, &addr); + if (r >= 0) { + _cleanup_address_free_ Address *address = NULL; - r = sd_dhcp_client_attach_event(link->dhcp_client, NULL, 0); - if (r < 0) - return r; + log_debug_link(link, "IPv4 link-local %s %u.%u.%u.%u", + deprecate ? "deprecate" : "approve", + ADDRESS_FMT_VAL(addr)); - r = sd_dhcp_client_set_index(link->dhcp_client, link->ifindex); - if (r < 0) + r = address_new_dynamic(&address); + if (r < 0) { + log_error_link(link, "Could not allocate address: %s", strerror(-r)); return r; + } - r = sd_dhcp_client_set_mac(link->dhcp_client, &link->mac); - if (r < 0) - 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); - r = sd_dhcp_client_set_callback(link->dhcp_client, dhcp_handler, link); - if (r < 0) + address_update(address, link, &address_update_handler); + } + + return 0; + +} + +static int ipv4ll_address_lost(Link *link) { + 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; + _cleanup_route_free_ Route *route = NULL; + + log_debug_link(link, "IPv4 link-local release %u.%u.%u.%u", + 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; + } - if (link->network->dhcp_mtu) { - r = sd_dhcp_client_set_request_option(link->dhcp_client, 26); - if (r < 0) - return r; + address->family = AF_INET; + address->in_addr.in = addr; + address->prefixlen = 16; + address->scope = RT_SCOPE_LINK; + + address_drop(address, link, &address_drop_handler); + + 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->scope = RT_SCOPE_LINK; + route->metrics = 99; + + route_drop(route, link, &route_drop_handler); } - log_debug_link(link, "acquiring DHCPv4 lease"); + return 0; +} - r = sd_dhcp_client_start(link->dhcp_client); +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; + + assert(ll); + assert(link); + + r = sd_ipv4ll_get_address(ll, &address); if (r < 0) return r; + log_struct_link(LOG_INFO, link, + "MESSAGE=%s: IPv4 link-local address %u.%u.%u.%u", + link->ifname, + ADDRESS_FMT_VAL(address), + NULL); + + link_enter_set_addresses(link); + + return 0; +} + +static void ipv4ll_handler(sd_ipv4ll *ll, int event, void *userdata){ + Link *link = userdata; + int r; + + assert(link); + assert(link->network); + assert(link->manager); + + switch(event) { + case IPV4LL_EVENT_STOP: + case IPV4LL_EVENT_CONFLICT: + r = ipv4ll_address_lost(link); + if (r < 0) { + link_enter_failed(link); + return; + } + break; + case IPV4LL_EVENT_BIND: + r = ipv4ll_address_claimed(ll, link); + if (r < 0) { + link_enter_failed(link); + return; + } + break; + default: + if (event < 0) + log_warning_link(link, "IPv4 link-local error: %s", strerror(-event)); + else + log_warning_link(link, "IPv4 link-local unknown event: %d", event); + break; + } +} + +static int link_acquire_conf(Link *link) { + int r; + + assert(link); + assert(link->network); + assert(link->manager); + assert(link->manager->event); + + if (link->network->ipv4ll) { + assert(link->ipv4ll); + + log_debug_link(link, "acquiring IPv4 link-local address"); + + r = sd_ipv4ll_start(link->ipv4ll); + if (r < 0) + return r; + } + + if (link->network->dhcp) { + assert(link->dhcp_client); + + log_debug_link(link, "acquiring DHCPv4 lease"); + + r = sd_dhcp_client_start(link->dhcp_client); + if (r < 0) + return r; + } + return 0; } 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); @@ -735,45 +1041,80 @@ static int link_update_flags(Link *link, unsigned flags) { if (link->state == LINK_STATE_FAILED) return 0; - if (link->flags == flags) { - log_debug_link(link, "link status unchanged: %#.8x", flags); + if (link->flags == flags) return 0; - } - if ((link->flags & IFF_UP) != (flags & IFF_UP)) - log_info_link(link, - "link is %s", flags & IFF_UP ? "up": "down"); + flags_added = (link->flags ^ flags) & flags; + flags_removed = (link->flags ^ flags) & link->flags; + generic_flags = ~(IFF_UP | IFF_LOWER_UP | IFF_RUNNING); - if ((link->flags & IFF_LOWER_UP) != (flags & IFF_LOWER_UP)) { - if (flags & IFF_LOWER_UP) { - log_info_link(link, "carrier on"); + /* consider link to have carrier when both RUNNING and LOWER_UP, as RUNNING + may mean that the oper state is unknown, in which case we should fall back to + simply trust LOWER_UP, even thought that is less reliable + */ + carrier_gained = ((flags_added & IFF_LOWER_UP) && (flags & IFF_RUNNING)) || + ((flags_added & IFF_RUNNING) && (flags & IFF_LOWER_UP)); + carrier_lost = ((link->flags & (IFF_RUNNING | IFF_LOWER_UP)) == + (IFF_RUNNING | IFF_LOWER_UP)) && + (flags_removed & (IFF_LOWER_UP | IFF_RUNNING)); - 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_link(link, "carrier off"); + link->flags = flags; - 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 (flags_added & generic_flags) + log_debug_link(link, "link flags gained: %#.8x", + flags_added & generic_flags); + + if (flags_removed & generic_flags) + log_debug_link(link, "link flags lost: %#.8x", + flags_removed & generic_flags); + + 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_info_link(link, "link is lower up"); + else if (flags_removed & IFF_LOWER_UP) + log_info_link(link, "link is lower down"); + + if (flags_added & IFF_RUNNING) + log_info_link(link, "link is running"); + else if (flags_removed & IFF_RUNNING) + log_info_link(link, "link is not running"); + + 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 if (carrier_lost) { + log_info_link(link, "lost carrier"); - log_debug_link(link, - "link status updated: %#.8x -> %#.8x", link->flags, flags); + 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; + } + } - link->flags = flags; + 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; + } + } + } return 0; } @@ -788,18 +1129,14 @@ static int link_up_handler(sd_rtnl *rtnl, sd_rtnl_message *m, void *userdata) { return 1; r = sd_rtnl_message_get_errno(m); - if (r < 0) { - log_struct_link(LOG_ERR, link, + if (r >= 0) + link_update_flags(link, link->flags | IFF_UP); + else + log_struct_link(LOG_WARNING, 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); - return 1; } @@ -849,7 +1186,7 @@ static int link_enslaved(Link *link) { return r; } - if (!link->network->dhcp) + if (!link->network->dhcp && !link->network->ipv4ll) return link_enter_set_addresses(link); return 0; @@ -888,7 +1225,7 @@ static int enslave_handler(sd_rtnl *rtnl, sd_rtnl_message *m, void *userdata) { } static int link_enter_enslave(Link *link) { - NetDev *vlan; + NetDev *vlan, *macvlan; Iterator i; int r; @@ -898,8 +1235,11 @@ static int link_enter_enslave(Link *link) { link->state = LINK_STATE_ENSLAVING; + link_save(link); + if (!link->network->bridge && !link->network->bond && - hashmap_isempty(link->network->vlans)) + hashmap_isempty(link->network->vlans) && + hashmap_isempty(link->network->macvlans)) return link_enslaved(link); if (link->network->bridge) { @@ -923,6 +1263,27 @@ static int link_enter_enslave(Link *link) { link->enslaving ++; } + if (link->network->bond) { + log_struct_link(LOG_DEBUG, link, + "MESSAGE=%s: enslaving by '%s'", + link->ifname, link->network->bond->name, + 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), + NETDEV(link->network->bond), + NULL); + link_enter_failed(link); + return r; + } + + link->enslaving ++; + } + HASHMAP_FOREACH(vlan, link->network->vlans, i) { log_struct_link(LOG_DEBUG, link, "MESSAGE=%s: enslaving by '%s'", @@ -941,6 +1302,24 @@ static int link_enter_enslave(Link *link) { link->enslaving ++; } + 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); + + 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), + NETDEV(macvlan), NULL); + link_enter_failed(link); + return r; + } + + link->enslaving ++; + } + return 0; } @@ -950,6 +1329,7 @@ static int link_getlink_handler(sd_rtnl *rtnl, sd_rtnl_message *m, int r; assert(link); + assert(link->ifname); if (link->state == LINK_STATE_FAILED) return 1; @@ -965,8 +1345,6 @@ static int link_getlink_handler(sd_rtnl *rtnl, sd_rtnl_message *m, return 1; } - log_debug_link(link, "got link state"); - link_update(link, m); return 1; @@ -1000,48 +1378,224 @@ static int link_getlink(Link *link) { return 0; } -int link_configure(Link *link) { +static int link_configure(Link *link) { int r; assert(link); - assert(link->network); assert(link->state == _LINK_STATE_INVALID); r = link_getlink(link); - if (r < 0) { - link_enter_failed(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; + + if (link->network->ipv4ll) { + uint8_t seed[8]; + r = sd_ipv4ll_new(&link->ipv4ll); + if (r < 0) + return r; + + 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_index(link->ipv4ll, link->ifindex); + if (r < 0) + return r; + + r = sd_ipv4ll_set_callback(link->ipv4ll, ipv4ll_handler, link); + if (r < 0) + return r; + } + + if (link->network->dhcp) { + r = sd_dhcp_client_new(&link->dhcp_client); + if (r < 0) + return r; + + r = sd_dhcp_client_attach_event(link->dhcp_client, NULL, 0); + if (r < 0) + return r; + + r = sd_dhcp_client_set_index(link->dhcp_client, link->ifindex); + if (r < 0) + return r; + + 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_client, 26); + if (r < 0) + return r; + } + } + + r = link_configure(link); + if (r < 0) + return r; + + return 0; +} + int link_update(Link *link, sd_rtnl_message *m) { unsigned flags; - void *data; - uint16_t type; + struct ether_addr mac; int r; assert(link); + assert(link->network); assert(m); if (link->state == LINK_STATE_FAILED) return 0; + if (link->network->dhcp && link->network->dhcp_mtu && + !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) { + 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); + + 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->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; + } + } + } + } + r = sd_rtnl_message_link_get_flags(m, &flags); if (r < 0) { 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); +} + +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; + + fchmod(fileno(f), 0644); + + fprintf(f, + "# This is private data. Do not parse.\n" + "STATE=%s\n", state); + + if (link->dhcp_lease) { + _cleanup_free_ char *lease_file = NULL; + + r = asprintf(&lease_file, "/run/systemd/network/leases/%"PRIu64, + link->ifindex); + if (r < 0) + return -ENOMEM; + + r = dhcp_lease_save(link->dhcp_lease, lease_file); + if (r < 0) + goto finish; + + fprintf(f, "DHCP_LEASE=%s\n", lease_file); } - return link_update_flags(link, flags); + fflush(f); + + if (ferror(f) || rename(temp_path, link->state_file) < 0) { + r = -errno; + unlink(link->state_file); + unlink(temp_path); + } + +finish: + if (r < 0) + log_error("Failed to save link data %s: %s", link->state_file, strerror(-r)); + + return r; } + +static const char* const link_state_table[_LINK_STATE_MAX] = { + [LINK_STATE_ENSLAVING] = "configuring", + [LINK_STATE_SETTING_ADDRESSES] = "configuring", + [LINK_STATE_SETTING_ROUTES] = "configuring", + [LINK_STATE_CONFIGURED] = "configured", + [LINK_STATE_FAILED] = "failed", +}; + +DEFINE_STRING_TABLE_LOOKUP(link_state, LinkState);