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=0b1cac1055ffaa055f010c2cc189c5ae3afa37b5;hp=961c1ab8ad13f3a1845f78b5ae3b7c80a4ceeddc;hb=e2acdb6b0f68d9b4152708a9f21bf9e11f8b9e7e;hpb=393c0c5e64d0cb85ce14f25a06fa8958c9e119e7 diff --git a/src/network/networkd-link.c b/src/network/networkd-link.c index 961c1ab8a..0b1cac105 100644 --- a/src/network/networkd-link.c +++ b/src/network/networkd-link.c @@ -23,29 +23,187 @@ #include #include -#include "networkd.h" -#include "libudev-private.h" -#include "udev-util.h" #include "util.h" #include "virt.h" +#include "fileio.h" #include "bus-util.h" +#include "udev-util.h" +#include "libudev-private.h" #include "network-internal.h" +#include "networkd-link.h" +#include "networkd-netdev.h" #include "conf-parser.h" - -#include "network-util.h" #include "dhcp-lease-internal.h" -static int ipv4ll_address_update(Link *link, bool deprecate); -static bool ipv4ll_is_bound(sd_ipv4ll *ll); +bool link_dhcp6_enabled(Link *link) { + if (link->flags & IFF_LOOPBACK) + return false; + + if (!link->network) + return false; + + return IN_SET(link->network->dhcp, ADDRESS_FAMILY_IPV6, ADDRESS_FAMILY_YES); +} + +bool link_dhcp4_enabled(Link *link) { + if (link->flags & IFF_LOOPBACK) + return false; + + if (!link->network) + return false; + + return IN_SET(link->network->dhcp, ADDRESS_FAMILY_IPV4, ADDRESS_FAMILY_YES); +} + +bool link_dhcp4_server_enabled(Link *link) { + if (link->flags & IFF_LOOPBACK) + return false; + + if (!link->network) + return false; + + return link->network->dhcp_server; +} + +bool link_ipv4ll_enabled(Link *link) { + if (link->flags & IFF_LOOPBACK) + return false; + + if (!link->network) + return false; + + return IN_SET(link->network->link_local, ADDRESS_FAMILY_IPV4, ADDRESS_FAMILY_YES); +} + +bool link_ipv6ll_enabled(Link *link) { + if (link->flags & IFF_LOOPBACK) + return false; + + if (!link->network) + return false; + + return IN_SET(link->network->link_local, ADDRESS_FAMILY_IPV6, ADDRESS_FAMILY_YES); +} + +bool link_lldp_enabled(Link *link) { + if (link->flags & IFF_LOOPBACK) + return false; + + if (!link->network) + return false; + + if (link->network->bridge) + return false; + + return link->network->lldp; +} + +static bool link_ipv4_forward_enabled(Link *link) { + if (link->flags & IFF_LOOPBACK) + return false; + + if (!link->network) + return false; + + return IN_SET(link->network->ip_forward, ADDRESS_FAMILY_IPV4, ADDRESS_FAMILY_YES); +} + +static bool link_ipv6_forward_enabled(Link *link) { + if (link->flags & IFF_LOOPBACK) + return false; + + if (!link->network) + return false; + + return IN_SET(link->network->ip_forward, ADDRESS_FAMILY_IPV6, ADDRESS_FAMILY_YES); +} + +#define FLAG_STRING(string, flag, old, new) \ + (((old ^ new) & flag) \ + ? ((old & flag) ? (" -" string) : (" +" string)) \ + : "") + +static int link_update_flags(Link *link, sd_rtnl_message *m) { + unsigned flags, unknown_flags_added, unknown_flags_removed, unknown_flags; + uint8_t operstate; + int r; + + assert(link); + + r = sd_rtnl_message_link_get_flags(m, &flags); + if (r < 0) { + log_link_warning(link, "Could not get link flags"); + return r; + } + + r = sd_rtnl_message_read_u8(m, IFLA_OPERSTATE, &operstate); + if (r < 0) + /* if we got a message without operstate, take it to mean + the state was unchanged */ + operstate = link->kernel_operstate; + + if ((link->flags == flags) && (link->kernel_operstate == operstate)) + return 0; + + if (link->flags != flags) { + log_link_debug(link, "flags change:%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s", + FLAG_STRING("LOOPBACK", IFF_LOOPBACK, link->flags, flags), + FLAG_STRING("MASTER", IFF_MASTER, link->flags, flags), + FLAG_STRING("SLAVE", IFF_SLAVE, link->flags, flags), + FLAG_STRING("UP", IFF_UP, link->flags, flags), + FLAG_STRING("DORMANT", IFF_DORMANT, link->flags, flags), + FLAG_STRING("LOWER_UP", IFF_LOWER_UP, link->flags, flags), + FLAG_STRING("RUNNING", IFF_RUNNING, link->flags, flags), + FLAG_STRING("MULTICAST", IFF_MULTICAST, link->flags, flags), + FLAG_STRING("BROADCAST", IFF_BROADCAST, link->flags, flags), + FLAG_STRING("POINTOPOINT", IFF_POINTOPOINT, link->flags, flags), + FLAG_STRING("PROMISC", IFF_PROMISC, link->flags, flags), + FLAG_STRING("ALLMULTI", IFF_ALLMULTI, link->flags, flags), + FLAG_STRING("PORTSEL", IFF_PORTSEL, link->flags, flags), + FLAG_STRING("AUTOMEDIA", IFF_AUTOMEDIA, link->flags, flags), + FLAG_STRING("DYNAMIC", IFF_DYNAMIC, link->flags, flags), + FLAG_STRING("NOARP", IFF_NOARP, link->flags, flags), + FLAG_STRING("NOTRAILERS", IFF_NOTRAILERS, link->flags, flags), + FLAG_STRING("DEBUG", IFF_DEBUG, link->flags, flags), + FLAG_STRING("ECHO", IFF_ECHO, link->flags, flags)); + + unknown_flags = ~(IFF_LOOPBACK | IFF_MASTER | IFF_SLAVE | IFF_UP | + IFF_DORMANT | IFF_LOWER_UP | IFF_RUNNING | + IFF_MULTICAST | IFF_BROADCAST | IFF_POINTOPOINT | + IFF_PROMISC | IFF_ALLMULTI | IFF_PORTSEL | + IFF_AUTOMEDIA | IFF_DYNAMIC | IFF_NOARP | + IFF_NOTRAILERS | IFF_DEBUG | IFF_ECHO); + unknown_flags_added = ((link->flags ^ flags) & flags & unknown_flags); + unknown_flags_removed = ((link->flags ^ flags) & link->flags & unknown_flags); + + /* link flags are currently at most 18 bits, let's align to + * printing 20 */ + if (unknown_flags_added) + log_link_debug(link, + "unknown link flags gained: %#.5x (ignoring)", + unknown_flags_added); + + if (unknown_flags_removed) + log_link_debug(link, + "unknown link flags lost: %#.5x (ignoring)", + unknown_flags_removed); + } + + link->flags = flags; + link->kernel_operstate = operstate; + + link_save(link); + + return 0; +} static int link_new(Manager *manager, sd_rtnl_message *message, Link **ret) { _cleanup_link_unref_ Link *link = NULL; uint16_t type; - char *ifname; + const char *ifname; int r, ifindex; assert(manager); - assert(manager->links); assert(message); assert(ret); @@ -71,7 +229,7 @@ static int link_new(Manager *manager, sd_rtnl_message *message, Link **ret) { link->n_ref = 1; link->manager = manager; - link->state = LINK_STATE_INITIALIZING; + link->state = LINK_STATE_PENDING; link->ifindex = ifindex; link->ifname = strdup(ifname); if (!link->ifname) @@ -79,19 +237,33 @@ static int link_new(Manager *manager, sd_rtnl_message *message, Link **ret) { r = sd_rtnl_message_read_ether_addr(message, IFLA_ADDRESS, &link->mac); if (r < 0) - log_debug_link(link, "MAC address not found for new device, continuing without"); + log_link_debug(link, "MAC address not found for new device, continuing without"); + + r = asprintf(&link->state_file, "/run/systemd/netif/links/%d", + link->ifindex); + if (r < 0) + return -ENOMEM; - r = asprintf(&link->state_file, "/run/systemd/netif/links/%"PRIu64, + r = asprintf(&link->lease_file, "/run/systemd/netif/leases/%d", link->ifindex); if (r < 0) return -ENOMEM; - r = asprintf(&link->lease_file, "/run/systemd/netif/leases/%"PRIu64, + r = asprintf(&link->lldp_file, "/run/systemd/netif/lldp/%d", link->ifindex); if (r < 0) return -ENOMEM; - r = hashmap_put(manager->links, &link->ifindex, link); + + r = hashmap_ensure_allocated(&manager->links, NULL); + if (r < 0) + return r; + + r = hashmap_put(manager->links, INT_TO_PTR(link->ifindex), link); + if (r < 0) + return r; + + r = link_update_flags(link, message); if (r < 0) return r; @@ -117,22 +289,25 @@ static void link_free(Link *link) { address_free(address); } + sd_dhcp_server_unref(link->dhcp_server); sd_dhcp_client_unref(link->dhcp_client); sd_dhcp_lease_unref(link->dhcp_lease); - unlink(link->lease_file); free(link->lease_file); + sd_lldp_free(link->lldp); + + free(link->lldp_file); + sd_ipv4ll_unref(link->ipv4ll); sd_dhcp6_client_unref(link->dhcp6_client); sd_icmp6_nd_unref(link->icmp6_router_discovery); if (link->manager) - hashmap_remove(link->manager->links, &link->ifindex); + hashmap_remove(link->manager->links, INT_TO_PTR(link->ifindex)); free(link->ifname); - unlink(link->state_file); free(link->state_file); udev_device_unref(link->udev_device); @@ -156,15 +331,12 @@ Link *link_ref(Link *link) { int link_get(Manager *m, int ifindex, Link **ret) { Link *link; - uint64_t ifindex_64; assert(m); - assert(m->links); assert(ifindex); assert(ret); - ifindex_64 = ifindex; - link = hashmap_get(m->links, &ifindex_64); + link = hashmap_get(m->links, INT_TO_PTR(ifindex)); if (!link) return -ENODEV; @@ -173,13 +345,26 @@ int link_get(Manager *m, int ifindex, Link **ret) { return 0; } +static void link_set_state(Link *link, LinkState state) { + assert(link); + + if (link->state == state) + return; + + link->state = state; + + link_send_changed(link, "AdministrativeState", NULL); + + return; +} + void link_drop(Link *link) { if (!link || link->state == LINK_STATE_LINGER) return; - link->state = LINK_STATE_LINGER; + link_set_state(link, LINK_STATE_LINGER); - log_debug_link(link, "link removed"); + log_link_debug(link, "link removed"); link_unref(link); @@ -189,9 +374,9 @@ void link_drop(Link *link) { static void link_enter_unmanaged(Link *link) { assert(link); - log_debug_link(link, "unmanaged"); + log_link_debug(link, "unmanaged"); - link->state = LINK_STATE_UNMANAGED; + link_set_state(link, LINK_STATE_UNMANAGED); link_save(link); } @@ -206,50 +391,50 @@ static int link_stop_clients(Link *link) { if (!link->network) return 0; - if (IN_SET(link->network->dhcp, DHCP_SUPPORT_BOTH, DHCP_SUPPORT_V6)) { - assert(link->dhcp_client); - + if (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)); + log_link_warning(link, "Could not stop DHCPv4 client: %s", + strerror(-r)); r = k; } } - if (link->network->ipv4ll) { - assert(link->ipv4ll); - + if (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; - } - } - - if (link->network->dhcp_server) { - assert(link->dhcp_server); - - k = sd_dhcp_server_stop(link->dhcp_server); - if (k < 0) { - log_warning_link(link, "Could not stop DHCPv4 server: %s", strerror(-r)); + log_link_warning(link, "Could not stop IPv4 link-local: %s", + strerror(-r)); r = k; } } - if (IN_SET(link->network->dhcp, DHCP_SUPPORT_BOTH, DHCP_SUPPORT_V6)) { - assert(link->icmp6_router_discovery); + if(link->icmp6_router_discovery) { if (link->dhcp6_client) { k = sd_dhcp6_client_stop(link->dhcp6_client); if (k < 0) { - log_warning_link(link, "Could not stop DHCPv6 client: %s", strerror(-r)); + log_link_warning(link, "Could not stop DHCPv6 client: %s", + strerror(-r)); r = k; } } k = sd_icmp6_nd_stop(link->icmp6_router_discovery); if (k < 0) { - log_warning_link(link, "Could not stop ICMPv6 router discovery: %s", strerror(-r)); + log_link_warning(link, + "Could not stop ICMPv6 router discovery: %s", + strerror(-r)); + r = k; + } + } + + if (link->lldp) { + + k = sd_lldp_stop(link->lldp); + if (k < 0) { + log_link_warning(link, "Could not stop LLDP : %s", + strerror(-r)); r = k; } } @@ -257,15 +442,15 @@ static int link_stop_clients(Link *link) { return r; } -static void link_enter_failed(Link *link) { +void link_enter_failed(Link *link) { assert(link); if (IN_SET(link->state, LINK_STATE_FAILED, LINK_STATE_LINGER)) return; - log_warning_link(link, "failed"); + log_link_warning(link, "failed"); - link->state = LINK_STATE_FAILED; + link_set_state(link, LINK_STATE_FAILED); link_stop_clients(link); @@ -278,13 +463,13 @@ static Address* link_find_dhcp_server_address(Link *link) { assert(link); assert(link->network); - /* The the first statically configured address if there is any */ + /* The first statically configured address if there is any */ LIST_FOREACH(addresses, address, link->network->static_addresses) { if (address->family != AF_INET) continue; - if (in_addr_null(address->family, &address->in_addr)) + if (in_addr_is_null(address->family, &address->in_addr)) continue; return address; @@ -302,285 +487,104 @@ static Address* link_find_dhcp_server_address(Link *link) { } static int link_enter_configured(Link *link) { - int r; - assert(link); assert(link->network); assert(link->state == LINK_STATE_SETTING_ROUTES); - if (link->network->dhcp_server && - !sd_dhcp_server_is_running(link->dhcp_server)) { - struct in_addr pool_start; - Address *address; - - address = link_find_dhcp_server_address(link); - if (!address) { - log_warning_link(link, "Failed to find suitable address for DHCPv4 server instance."); - link_enter_failed(link); - return 0; - } - - log_debug_link(link, "offering DHCPv4 leases"); - - r = sd_dhcp_server_set_address(link->dhcp_server, &address->in_addr.in); - if (r < 0) - return r; - - /* offer 32 addresses starting from the address following the server address */ - pool_start.s_addr = htobe32(be32toh(address->in_addr.in.s_addr) + 1); - r = sd_dhcp_server_set_lease_pool(link->dhcp_server, - &pool_start, 32); - if (r < 0) - return r; + log_link_info(link, "link configured"); - /* TODO: - r = sd_dhcp_server_set_router(link->dhcp_server, - &main_address->in_addr.in); - if (r < 0) - return r; + link_set_state(link, LINK_STATE_CONFIGURED); - r = sd_dhcp_server_set_prefixlen(link->dhcp_server, - main_address->prefixlen); - if (r < 0) - return r; - */ + link_save(link); - r = sd_dhcp_server_start(link->dhcp_server); - if (r < 0) { - log_warning_link(link, "could not start DHCPv4 server " - "instance: %s", strerror(-r)); + return 0; +} - link_enter_failed(link); +void link_client_handler(Link *link) { + assert(link); + assert(link->network); - return 0; - } - } + if (!link->static_configured) + return; - log_info_link(link, "link configured"); + if (link_ipv4ll_enabled(link)) + if (!link->ipv4ll_address || + !link->ipv4ll_route) + return; - link->state = LINK_STATE_CONFIGURED; + if (link_dhcp4_enabled(link) && !link->dhcp4_configured) + return; - link_save(link); + if (link->state != LINK_STATE_CONFIGURED) + link_enter_configured(link); - return 0; + return; } static int route_handler(sd_rtnl *rtnl, sd_rtnl_message *m, void *userdata) { _cleanup_link_unref_ Link *link = userdata; int r; - assert(link->route_messages > 0); + assert(link->link_messages > 0); assert(IN_SET(link->state, LINK_STATE_SETTING_ADDRESSES, LINK_STATE_SETTING_ROUTES, LINK_STATE_FAILED, LINK_STATE_LINGER)); - link->route_messages --; + link->link_messages --; - if (IN_SET(LINK_STATE_FAILED, LINK_STATE_LINGER)) + if (IN_SET(link->state, LINK_STATE_FAILED, LINK_STATE_LINGER)) return 1; 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", - IFNAMSIZ, - link->ifname, strerror(-r), - "ERRNO=%d", -r, - NULL); + log_link_warning_errno(link, -r, "%-*s: could not set route: %m", IFNAMSIZ, link->ifname); - /* 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_link(link, "routes set"); - link_enter_configured(link); + if (link->link_messages == 0) { + log_link_debug(link, "routes set"); + link->static_configured = true; + link_client_handler(link); } return 1; } -static int link_set_dhcp_routes(Link *link) { - struct sd_dhcp_route *static_routes; - size_t static_routes_size; +static int link_enter_set_routes(Link *link) { + Route *rt; int r; - unsigned i; assert(link); + assert(link->network); + assert(link->state == LINK_STATE_SETTING_ADDRESSES); - r = sd_dhcp_lease_get_routes(link->dhcp_lease, &static_routes, &static_routes_size); - if (r < 0) { - if (r != -ENOENT) - log_warning_link(link, "DHCP error: could not get routes: %s", strerror(-r)); - return r; - } - - for (i = 0; i < static_routes_size; i++) { - _cleanup_route_free_ Route *route = NULL; - - 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->in_addr.in = static_routes[i].gw_addr; - route->dst_addr.in = static_routes[i].dst_addr; - route->dst_prefixlen = static_routes[i].dst_prefixlen; - route->metrics = DHCP_STATIC_ROUTE_METRIC; + link_set_state(link, LINK_STATE_SETTING_ROUTES); - r = route_configure(route, link, &route_handler); + LIST_FOREACH(routes, rt, link->network->static_routes) { + r = route_configure(rt, link, &route_handler); if (r < 0) { - log_warning_link(link, - "could not set host route: %s", strerror(-r)); + log_link_warning(link, + "could not set routes: %s", + strerror(-r)); + link_enter_failed(link); return r; } - link->route_messages ++; + link->link_messages ++; } + if (link->link_messages == 0) { + link->static_configured = true; + link_client_handler(link); + } else + log_link_debug(link, "setting routes"); + return 0; } -static int link_enter_set_routes(Link *link) { - Route *rt; +int link_route_drop_handler(sd_rtnl *rtnl, sd_rtnl_message *m, void *userdata) { + _cleanup_link_unref_ Link *link = userdata; int r; - assert(link); - assert(link->network); - assert(link->state == LINK_STATE_SETTING_ADDRESSES); - - link->state = LINK_STATE_SETTING_ROUTES; - - 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"); - - LIST_FOREACH(routes, rt, link->network->static_routes) { - r = route_configure(rt, 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->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); - if (r < 0 && r != -ENOENT) { - log_warning_link(link, "DHCP error: could not get gateway: %s", - strerror(-r)); - return r; - } - - if (r >= 0) { - r = route_new_dynamic(&route); - if (r < 0) { - log_error_link(link, "Could not allocate route: %s", - strerror(-r)); - 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; - route_gw->metrics = DHCP_STATIC_ROUTE_METRIC; - - 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; - route->metrics = DHCP_STATIC_ROUTE_METRIC; - - 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->network->dhcp_routes) - link_set_dhcp_routes(link); - } - - if (link->route_messages == 0) { - link_enter_configured(link); - } - - return 0; -} - -static int route_drop_handler(sd_rtnl *rtnl, sd_rtnl_message *m, void *userdata) { - _cleanup_link_unref_ Link *link = userdata; - int r; - - assert(m); + assert(m); assert(link); assert(link->ifname); @@ -589,43 +593,36 @@ 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", - IFNAMSIZ, - link->ifname, strerror(-r), - "ERRNO=%d", -r, - NULL); + log_link_warning_errno(link, -r, "%-*s: could not drop route: %m", IFNAMSIZ, link->ifname); - return 0; + return 1; } static int address_handler(sd_rtnl *rtnl, sd_rtnl_message *m, void *userdata) { _cleanup_link_unref_ Link *link = userdata; int r; + assert(rtnl); assert(m); assert(link); assert(link->ifname); - assert(link->addr_messages > 0); + assert(link->link_messages > 0); assert(IN_SET(link->state, LINK_STATE_SETTING_ADDRESSES, LINK_STATE_FAILED, LINK_STATE_LINGER)); - link->addr_messages --; + link->link_messages --; if (IN_SET(link->state, LINK_STATE_FAILED, LINK_STATE_LINGER)) return 1; 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", - IFNAMSIZ, - link->ifname, strerror(-r), - "ERRNO=%d", -r, - NULL); + log_link_warning_errno(link, -r, "%-*s: could not set address: %m", IFNAMSIZ, link->ifname); + else if (r >= 0) + link_rtnl_process_address(rtnl, m, link->manager); - if (link->addr_messages == 0) { - log_debug_link(link, "addresses set"); + if (link->link_messages == 0) { + log_link_debug(link, "addresses set"); link_enter_set_routes(link); } @@ -635,131 +632,85 @@ static int address_handler(sd_rtnl *rtnl, sd_rtnl_message *m, void *userdata) { static int link_enter_set_addresses(Link *link) { Address *ad; int r; - uint32_t lifetime = CACHE_INFO_INFINITY_LIFE_TIME; assert(link); assert(link->network); assert(link->state != _LINK_STATE_INVALID); - link->state = LINK_STATE_SETTING_ADDRESSES; - - 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"); + link_set_state(link, LINK_STATE_SETTING_ADDRESSES); LIST_FOREACH(addresses, ad, link->network->static_addresses) { r = address_configure(ad, link, &address_handler); if (r < 0) { - log_warning_link(link, - "could not set addresses: %s", strerror(-r)); + log_link_warning_errno(link, r, "Could not set addresses: %m"); link_enter_failed(link); return r; } - link->addr_messages ++; + link->link_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; - } + /* now that we can figure out a default address for the dhcp server, + start it */ + if (link_dhcp4_server_enabled(link)) { + struct in_addr pool_start; + Address *address; - link->addr_messages ++; + address = link_find_dhcp_server_address(link); + if (!address) { + log_link_warning(link, + "Failed to find suitable address for DHCPv4 server instance."); + link_enter_failed(link); + return 0; } - } - - if (link->dhcp_lease) { - _cleanup_address_free_ Address *address = NULL; - struct in_addr addr; - struct in_addr netmask; - unsigned prefixlen; - r = sd_dhcp_lease_get_address(link->dhcp_lease, &addr); - if (r < 0) { - log_warning_link(link, "DHCP error: no address: %s", - strerror(-r)); + r = sd_dhcp_server_set_address(link->dhcp_server, + &address->in_addr.in, + address->prefixlen); + if (r < 0) return r; - } - - if (!link->network->dhcp_critical) { - r = sd_dhcp_lease_get_lifetime(link->dhcp_lease, - &lifetime); - if (r < 0) { - log_warning_link(link, "DHCP error: no lifetime: %s", - strerror(-r)); - return r; - } - } - r = sd_dhcp_lease_get_netmask(link->dhcp_lease, &netmask); - if (r < 0) { - log_warning_link(link, "DHCP error: no netmask: %s", - strerror(-r)); + /* offer 32 addresses starting from the address following the server address */ + pool_start.s_addr = htobe32(be32toh(address->in_addr.in.s_addr) + 1); + r = sd_dhcp_server_set_lease_pool(link->dhcp_server, + &pool_start, 32); + if (r < 0) return r; - } - - prefixlen = net_netmask_to_prefixlen(&netmask); - r = address_new_dynamic(&address); - if (r < 0) { - log_error_link(link, "Could not allocate address: %s", - strerror(-r)); + /* TODO: + r = sd_dhcp_server_set_router(link->dhcp_server, + &main_address->in_addr.in); + if (r < 0) return r; - } - address->family = AF_INET; - address->in_addr.in = addr; - address->cinfo.ifa_prefered = lifetime; - address->cinfo.ifa_valid = lifetime; - address->prefixlen = prefixlen; - address->broadcast.s_addr = addr.s_addr | ~netmask.s_addr; + r = sd_dhcp_server_set_prefixlen(link->dhcp_server, + main_address->prefixlen); + if (r < 0) + return r; + */ - /* use update rather than configure so that we will update the lifetime - of an existing address if it has already been configured */ - r = address_update(address, link, &address_handler); + r = sd_dhcp_server_start(link->dhcp_server); if (r < 0) { - log_warning_link(link, - "could not set addresses: %s", strerror(-r)); + log_link_warning(link, "could not start DHCPv4 server " + "instance: %s", strerror(-r)); + link_enter_failed(link); - return r; + + return 0; } - link->addr_messages ++; + log_link_debug(link, "offering DHCPv4 leases"); } + if (link->link_messages == 0) { + link_enter_set_routes(link); + } else + log_link_debug(link, "setting addresses"); + return 0; } -static int address_update_handler(sd_rtnl *rtnl, sd_rtnl_message *m, void *userdata) { +int link_address_drop_handler(sd_rtnl *rtnl, sd_rtnl_message *m, void *userdata) { _cleanup_link_unref_ Link *link = userdata; int r; @@ -771,41 +722,50 @@ static int address_update_handler(sd_rtnl *rtnl, sd_rtnl_message *m, void *userd 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", - IFNAMSIZ, - link->ifname, strerror(-r), - "ERRNO=%d", -r, - NULL); + if (r < 0 && r != -EADDRNOTAVAIL) + log_link_warning_errno(link, -r, "%-*s: could not drop address: %m", IFNAMSIZ, link->ifname); - return 0; + return 1; +} + +static int link_set_bridge_fdb(const Link *const link) { + FdbEntry *fdb_entry; + int r = 0; + + LIST_FOREACH(static_fdb_entries, fdb_entry, link->network->static_fdb_entries) { + r = fdb_entry_configure(link->manager->rtnl, fdb_entry, link->ifindex); + if(r < 0) { + log_link_error(link, "Failed to add MAC entry to static MAC table: %s", strerror(-r)); + break; + } + } + + return r; } -static int address_drop_handler(sd_rtnl *rtnl, sd_rtnl_message *m, void *userdata) { +static int link_set_handler(sd_rtnl *rtnl, sd_rtnl_message *m, void *userdata) { _cleanup_link_unref_ Link *link = userdata; int r; - assert(m); - assert(link); - assert(link->ifname); - - if (IN_SET(link->state, LINK_STATE_FAILED, LINK_STATE_LINGER)) - return 1; + log_link_debug(link, "set link"); 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", + if (r < 0 && r != -EEXIST) { + log_link_struct(link, LOG_ERR, + "MESSAGE=%-*s: could not join netdev: %s", IFNAMSIZ, link->ifname, strerror(-r), "ERRNO=%d", -r, NULL); + link_enter_failed(link); + return 1; + } return 0; } -static int set_hostname_handler(sd_bus *bus, sd_bus_message *m, void *userdata, sd_bus_error *ret_error) { +static int set_hostname_handler(sd_bus *bus, sd_bus_message *m, void *userdata, + sd_bus_error *ret_error) { _cleanup_link_unref_ Link *link = userdata; int r; @@ -815,13 +775,14 @@ static int set_hostname_handler(sd_bus *bus, sd_bus_message *m, void *userdata, return 1; r = sd_bus_message_get_errno(m); - if (r < 0) - log_warning_link(link, "Could not set hostname: %s", strerror(-r)); + if (r > 0) + log_link_warning(link, "Could not set hostname: %s", + strerror(r)); return 1; } -static int link_set_hostname(Link *link, const char *hostname) { +int link_set_hostname(Link *link, const char *hostname) { _cleanup_bus_message_unref_ sd_bus_message *m = NULL; int r = 0; @@ -829,10 +790,12 @@ static int link_set_hostname(Link *link, const char *hostname) { assert(link->manager); assert(hostname); - log_debug_link(link, "Setting transient hostname: '%s'", hostname); + log_link_debug(link, "Setting transient hostname: '%s'", hostname); - if (!link->manager->bus) { /* TODO: replace by assert when we can rely on kdbus */ - log_info_link(link, "Not connected to system bus, ignoring transient hostname."); + if (!link->manager->bus) { + /* TODO: replace by assert when we can rely on kdbus */ + log_link_info(link, + "Not connected to system bus, ignoring transient hostname."); return 0; } @@ -850,9 +813,11 @@ static int link_set_hostname(Link *link, const char *hostname) { if (r < 0) return r; - r = sd_bus_call_async(link->manager->bus, NULL, m, set_hostname_handler, link, 0); + r = sd_bus_call_async(link->manager->bus, NULL, m, set_hostname_handler, + link, 0); if (r < 0) { - log_error_link(link, "Could not set transient hostname: %s", strerror(-r)); + log_link_error(link, "Could not set transient hostname: %s", + strerror(-r)); return r; } @@ -874,16 +839,12 @@ static int set_mtu_handler(sd_rtnl *rtnl, sd_rtnl_message *m, void *userdata) { r = sd_rtnl_message_get_errno(m); if (r < 0) - log_struct_link(LOG_WARNING, link, - "MESSAGE=%-*s: could not set MTU: %s", - IFNAMSIZ, link->ifname, strerror(-r), - "ERRNO=%d", -r, - NULL); + log_link_warning_errno(link, -r, "%-*s: could not set MTU: %m", IFNAMSIZ, link->ifname); return 1; } -static int link_set_mtu(Link *link, uint32_t mtu) { +int link_set_mtu(Link *link, uint32_t mtu) { _cleanup_rtnl_message_unref_ sd_rtnl_message *req = NULL; int r; @@ -891,25 +852,27 @@ static int link_set_mtu(Link *link, uint32_t mtu) { assert(link->manager); assert(link->manager->rtnl); - log_debug_link(link, "setting MTU: %" PRIu32, mtu); + log_link_debug(link, "setting MTU: %" PRIu32, mtu); r = sd_rtnl_message_new_link(link->manager->rtnl, &req, RTM_SETLINK, link->ifindex); if (r < 0) { - log_error_link(link, "Could not allocate RTM_SETLINK message"); + log_link_error(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)); + log_link_error(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); + 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)); + log_link_error(link, + "Could not send rtnetlink message: %s", + strerror(-r)); return r; } @@ -918,782 +881,268 @@ static int link_set_mtu(Link *link, uint32_t mtu) { return 0; } -static int dhcp_lease_lost(Link *link) { - _cleanup_address_free_ Address *address = NULL; - struct in_addr addr; - struct in_addr netmask; - struct in_addr gateway; - unsigned prefixlen; - unsigned i; +static int link_set_bridge(Link *link) { + _cleanup_rtnl_message_unref_ sd_rtnl_message *req = NULL; int r; assert(link); - assert(link->dhcp_lease); - - log_warning_link(link, "DHCP lease lost"); - - if (link->network->dhcp_routes) { - struct sd_dhcp_route *routes; - size_t routes_size; - - r = sd_dhcp_lease_get_routes(link->dhcp_lease, &routes, &routes_size); - if (r >= 0) { - for (i = 0; i < routes_size; i++) { - _cleanup_route_free_ Route *route = NULL; + assert(link->network); - r = route_new_dynamic(&route); - if (r >= 0) { - route->family = AF_INET; - route->in_addr.in = routes[i].gw_addr; - route->dst_addr.in = routes[i].dst_addr; - route->dst_prefixlen = routes[i].dst_prefixlen; + if(link->network->cost == 0) + return 0; - route_drop(route, link, &route_drop_handler); - } - } - } + r = sd_rtnl_message_new_link(link->manager->rtnl, &req, + RTM_SETLINK, link->ifindex); + if (r < 0) { + log_link_error(link, "Could not allocate RTM_SETLINK message"); + return r; } - r = address_new_dynamic(&address); - if (r >= 0) { - r = sd_dhcp_lease_get_router(link->dhcp_lease, &gateway); - if (r >= 0) { - _cleanup_route_free_ Route *route_gw = NULL; - _cleanup_route_free_ Route *route = NULL; - - 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); - } - } - - sd_dhcp_lease_get_address(link->dhcp_lease, &addr); - sd_dhcp_lease_get_netmask(link->dhcp_lease, &netmask); - prefixlen = net_netmask_to_prefixlen(&netmask); - - address->family = AF_INET; - address->in_addr.in = addr; - address->prefixlen = prefixlen; - - address_drop(address, link, &address_drop_handler); + r = sd_rtnl_message_link_set_family(req, PF_BRIDGE); + if (r < 0) { + log_link_error(link, + "Could not set message family %s", strerror(-r)); + return r; } - if (link->network->dhcp_mtu) { - uint16_t mtu; + r = sd_rtnl_message_open_container(req, IFLA_PROTINFO); + if (r < 0) { + log_link_error(link, + "Could not append IFLA_PROTINFO attribute: %s", + strerror(-r)); + return r; + } - r = sd_dhcp_lease_get_mtu(link->dhcp_lease, &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 r; - } + if(link->network->cost != 0) { + r = sd_rtnl_message_append_u32(req, IFLA_BRPORT_COST, link->network->cost); + if (r < 0) { + log_link_error(link, + "Could not append IFLA_BRPORT_COST attribute: %s", + strerror(-r)); + return r; } } - if (link->network->dhcp_hostname) { - const char *hostname = NULL; + r = sd_rtnl_message_close_container(req); + if (r < 0) { + log_link_error(link, + "Could not append IFLA_LINKINFO attribute: %s", + strerror(-r)); + return r; + } - r = sd_dhcp_lease_get_hostname(link->dhcp_lease, &hostname); - if (r >= 0 && hostname) { - r = link_set_hostname(link, ""); - if (r < 0) - log_error_link(link, "Failed to reset transient hostname"); - } + r = sd_rtnl_call_async(link->manager->rtnl, req, link_set_handler, link, 0, NULL); + if (r < 0) { + log_link_error(link, + "Could not send rtnetlink message: %s", + strerror(-r)); + return r; } - link->dhcp_lease = sd_dhcp_lease_unref(link->dhcp_lease); + link_ref(link); - return 0; + return r; } -static int dhcp_lease_renew(sd_dhcp_client *client, Link *link) { - sd_dhcp_lease *lease; +static void lldp_handler(sd_lldp *lldp, int event, void *userdata) { + Link *link = userdata; int r; - r = sd_dhcp_client_get_lease(client, &lease); - if (r < 0) { - log_warning_link(link, "DHCP error: no lease %s", - strerror(-r)); - return r; - } + assert(link); + assert(link->network); + assert(link->manager); - sd_dhcp_lease_unref(link->dhcp_lease); - link->dhcp_lease = lease; + if (event != UPDATE_INFO) + return; - link_enter_set_addresses(link); + r = sd_lldp_save(link->lldp, link->lldp_file); + if (r < 0) + log_link_warning(link, "could not save LLDP"); - return 0; } -static int dhcp_lease_acquired(sd_dhcp_client *client, Link *link) { - sd_dhcp_lease *lease; - struct in_addr address; - struct in_addr netmask; - struct in_addr gateway; - unsigned prefixlen; +static int link_acquire_conf(Link *link) { int r; - assert(client); assert(link); + assert(link->network); + assert(link->manager); + assert(link->manager->event); - r = sd_dhcp_client_get_lease(client, &lease); - if (r < 0) { - log_warning_link(link, "DHCP error: no lease: %s", - strerror(-r)); - return r; - } + if (link_ipv4ll_enabled(link)) { + assert(link->ipv4ll); - r = sd_dhcp_lease_get_address(lease, &address); - if (r < 0) { - log_warning_link(link, "DHCP error: no address: %s", - strerror(-r)); - return r; - } + log_link_debug(link, "acquiring IPv4 link-local address"); - r = sd_dhcp_lease_get_netmask(lease, &netmask); - if (r < 0) { - log_warning_link(link, "DHCP error: no netmask: %s", - strerror(-r)); - return r; + r = sd_ipv4ll_start(link->ipv4ll); + if (r < 0) { + log_link_warning(link, "could not acquire IPv4 " + "link-local address"); + return r; + } } - prefixlen = net_netmask_to_prefixlen(&netmask); + if (link_dhcp4_enabled(link)) { + assert(link->dhcp_client); - r = sd_dhcp_lease_get_router(lease, &gateway); - if (r < 0 && r != -ENOENT) { - log_warning_link(link, "DHCP error: could not get gateway: %s", - strerror(-r)); - return r; - } + log_link_debug(link, "acquiring DHCPv4 lease"); - if (r >= 0) - log_struct_link(LOG_INFO, link, - "MESSAGE=%-*s: DHCPv4 address %u.%u.%u.%u/%u via %u.%u.%u.%u", - IFNAMSIZ, - 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); - else - log_struct_link(LOG_INFO, link, - "MESSAGE=%-*s: DHCPv4 address %u.%u.%u.%u/%u", - IFNAMSIZ, - link->ifname, - ADDRESS_FMT_VAL(address), - prefixlen, - "ADDRESS=%u.%u.%u.%u", - ADDRESS_FMT_VAL(address), - "PREFIXLEN=%u", - prefixlen, - NULL); - - link->dhcp_lease = lease; - - if (link->network->dhcp_mtu) { - uint16_t mtu; - - r = sd_dhcp_lease_get_mtu(lease, &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_lease_get_hostname(lease, &hostname); - if (r >= 0) { - r = link_set_hostname(link, hostname); - if (r < 0) - log_error_link(link, "Failed to set transient hostname " - "to '%s'", hostname); - } - } - - link_enter_set_addresses(link); - - return 0; -} - -static void dhcp_handler(sd_dhcp_client *client, int event, void *userdata) { - Link *link = userdata; - int r = 0; - - assert(link); - assert(link->network); - assert(link->manager); - - if (IN_SET(link->state, LINK_STATE_FAILED, LINK_STATE_LINGER)) - return; - - switch (event) { - case DHCP_EVENT_NO_LEASE: - log_debug_link(link, "IP address in use."); - break; - case DHCP_EVENT_EXPIRED: - case DHCP_EVENT_STOP: - case DHCP_EVENT_IP_CHANGE: - if (link->network->dhcp_critical) { - log_error_link(link, "DHCPv4 connection considered system critical, " - "ignoring request to reconfigure it."); - return; - } - - if (link->dhcp_lease) { - r = dhcp_lease_lost(link); - if (r < 0) { - link_enter_failed(link); - return; - } - } - - if (event == DHCP_EVENT_IP_CHANGE) { - r = dhcp_lease_acquired(client, link); - if (r < 0) { - link_enter_failed(link); - return; - } - } - - 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_RENEW: - r = dhcp_lease_renew(client, link); - if (r < 0) { - link_enter_failed(link); - return; - } - break; - case DHCP_EVENT_IP_ACQUIRE: - r = dhcp_lease_acquired(client, link); - if (r < 0) { - 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) - log_warning_link(link, "DHCP error: client failed: %s", strerror(-event)); - else - log_warning_link(link, "DHCP unknown event: %d", event); - break; - } - - return; -} - -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); + r = sd_dhcp_client_start(link->dhcp_client); if (r < 0) { - log_error_link(link, "Could not allocate address: %s", strerror(-r)); + log_link_warning(link, "could not acquire DHCPv4 " + "lease"); 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(link); - - r = sd_ipv4ll_get_address(link->ipv4ll, &addr); - if (r >= 0) { - _cleanup_address_free_ Address *address = NULL; - _cleanup_route_free_ Route *route = NULL; + if (link_dhcp6_enabled(link)) { + assert(link->icmp6_router_discovery); - log_debug_link(link, "IPv4 link-local release %u.%u.%u.%u", - ADDRESS_FMT_VAL(addr)); + log_link_debug(link, "discovering IPv6 routers"); - r = address_new_dynamic(&address); + r = sd_icmp6_router_solicitation_start(link->icmp6_router_discovery); if (r < 0) { - log_error_link(link, "Could not allocate address: %s", strerror(-r)); + log_link_warning(link, + "could not start IPv6 router discovery"); return r; } + } - address->family = AF_INET; - address->in_addr.in = addr; - address->prefixlen = 16; - address->scope = RT_SCOPE_LINK; + if (link_lldp_enabled(link)) { + assert(link->lldp); - address_drop(address, link, &address_drop_handler); + log_link_debug(link, "Starting LLDP"); - r = route_new_dynamic(&route); + r = sd_lldp_start(link->lldp); if (r < 0) { - log_error_link(link, "Could not allocate route: %s", - strerror(-r)); + log_link_warning(link, "could not start LLDP "); return r; } - - route->family = AF_INET; - route->scope = RT_SCOPE_LINK; - route->metrics = 99; - - route_drop(route, link, &route_drop_handler); } 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; - - assert(ll); - assert(link); - - r = sd_ipv4ll_get_address(ll, &address); - if (r < 0) - return r; +bool link_has_carrier(Link *link) { + /* see Documentation/networking/operstates.txt in the kernel sources */ - log_struct_link(LOG_INFO, link, - "MESSAGE=%-*s: IPv4 link-local address %u.%u.%u.%u", - IFNAMSIZ, - link->ifname, - ADDRESS_FMT_VAL(address), - NULL); + if (link->kernel_operstate == IF_OPER_UP) + return true; - link_enter_set_addresses(link); + if (link->kernel_operstate == IF_OPER_UNKNOWN) + /* operstate may not be implemented, so fall back to flags */ + if ((link->flags & IFF_LOWER_UP) && !(link->flags & IFF_DORMANT)) + return true; - return 0; + return false; } -static void ipv4ll_handler(sd_ipv4ll *ll, int event, void *userdata){ - Link *link = userdata; +static int link_up_handler(sd_rtnl *rtnl, sd_rtnl_message *m, void *userdata) { + _cleanup_link_unref_ Link *link = userdata; int r; assert(link); - assert(link->network); - assert(link->manager); if (IN_SET(link->state, LINK_STATE_FAILED, LINK_STATE_LINGER)) - return; + return 1; - 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; + r = sd_rtnl_message_get_errno(m); + if (r < 0) { + /* we warn but don't fail the link, as it may + be brought up later */ + log_link_warning_errno(link, -r, "%-*s: could not bring up interface: %m", IFNAMSIZ, link->ifname); } -} - -static void dhcp6_handler(sd_dhcp6_client *client, int event, void *userdata) { - Link *link = userdata; - assert(link); - assert(link->network); - assert(link->manager); - - if (IN_SET(link->state, LINK_STATE_FAILED, LINK_STATE_LINGER)) - return; - - switch(event) { - case DHCP6_EVENT_STOP: - case DHCP6_EVENT_RESEND_EXPIRE: - case DHCP6_EVENT_RETRANS_MAX: - case DHCP6_EVENT_IP_ACQUIRE: - log_debug_link(link, "DHCPv6 event %d", event); - - break; - - default: - if (event < 0) - log_warning_link(link, "DHCPv6 error: %s", - strerror(-event)); - else - log_warning_link(link, "DHCPv6 unknown event: %d", - event); - return; - } + return 1; } -static void icmp6_router_handler(sd_icmp6_nd *nd, int event, void *userdata) { - Link *link = userdata; +static int link_up(Link *link) { + _cleanup_rtnl_message_unref_ sd_rtnl_message *req = NULL; int r; assert(link); assert(link->network); assert(link->manager); + assert(link->manager->rtnl); - if (IN_SET(link->state, LINK_STATE_FAILED, LINK_STATE_LINGER)) - return; - - switch(event) { - case ICMP6_EVENT_ROUTER_ADVERTISMENT_NONE: - case ICMP6_EVENT_ROUTER_ADVERTISMENT_OTHER: - return; - - case ICMP6_EVENT_ROUTER_ADVERTISMENT_TIMEOUT: - case ICMP6_EVENT_ROUTER_ADVERTISMENT_MANAGED: - break; - - default: - if (event < 0) - log_warning_link(link, "ICMPv6 error: %s", - strerror(-event)); - else - log_warning_link(link, "ICMPv6 unknown event: %d", - event); - - return; - } - - if (link->dhcp6_client) - return; - - r = sd_dhcp6_client_new(&link->dhcp6_client); - if (r < 0) - return; - - r = sd_dhcp6_client_attach_event(link->dhcp6_client, NULL, 0); - if (r < 0) { - link->dhcp6_client = sd_dhcp6_client_unref(link->dhcp6_client); - return; - } - - r = sd_dhcp6_client_set_mac(link->dhcp6_client, &link->mac); - if (r < 0) { - link->dhcp6_client = sd_dhcp6_client_unref(link->dhcp6_client); - return; - } + log_link_debug(link, "bringing link up"); - r = sd_dhcp6_client_set_index(link->dhcp6_client, link->ifindex); + r = sd_rtnl_message_new_link(link->manager->rtnl, &req, + RTM_SETLINK, link->ifindex); if (r < 0) { - link->dhcp6_client = sd_dhcp6_client_unref(link->dhcp6_client); - return; + log_link_error(link, "Could not allocate RTM_SETLINK message"); + return r; } - r = sd_dhcp6_client_set_callback(link->dhcp6_client, dhcp6_handler, - link); + r = sd_rtnl_message_link_set_flags(req, IFF_UP, IFF_UP); if (r < 0) { - link->dhcp6_client = sd_dhcp6_client_unref(link->dhcp6_client); - return; - } - - r = sd_dhcp6_client_start(link->dhcp6_client); - if (r < 0) - link->dhcp6_client = sd_dhcp6_client_unref(link->dhcp6_client); -} - -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) { - log_warning_link(link, "could not acquire IPv4 " - "link-local address"); - return r; - } + log_link_error(link, "Could not set link flags: %s", + strerror(-r)); + return r; } - if (IN_SET(link->network->dhcp, DHCP_SUPPORT_BOTH, DHCP_SUPPORT_V4)) { - assert(link->dhcp_client); - - log_debug_link(link, "acquiring DHCPv4 lease"); - - r = sd_dhcp_client_start(link->dhcp_client); + if (link->network->mac) { + r = sd_rtnl_message_append_ether_addr(req, IFLA_ADDRESS, link->network->mac); if (r < 0) { - log_warning_link(link, "could not acquire DHCPv4 " - "lease"); + log_link_error(link, "Could not set MAC address: %s", strerror(-r)); return r; } } - if (IN_SET(link->network->dhcp, DHCP_SUPPORT_BOTH, DHCP_SUPPORT_V6)) { - assert(link->icmp6_router_discovery); - - log_debug_link(link, "discovering IPv6 routers"); - - r = sd_icmp6_router_solicitation_start(link->icmp6_router_discovery); + if (link->network->mtu) { + r = sd_rtnl_message_append_u32(req, IFLA_MTU, link->network->mtu); if (r < 0) { - log_warning_link(link, "could not start IPv6 router discovery"); + log_link_error(link, "Could not set MTU: %s", strerror(-r)); return r; } } - return 0; -} - -bool link_has_carrier(unsigned flags, uint8_t operstate) { - /* see Documentation/networking/operstates.txt in the kernel sources */ - - if (operstate == IF_OPER_UP) - return true; - - if (operstate == IF_OPER_UNKNOWN) - /* operstate may not be implemented, so fall back to flags */ - if ((flags & IFF_LOWER_UP) && !(flags & IFF_DORMANT)) - return true; - - return false; -} - -#define FLAG_STRING(string, flag, old, new) \ - (((old ^ new) & flag) \ - ? ((old & flag) ? (" -" string) : (" +" string)) \ - : "") - -static int link_update_flags(Link *link, sd_rtnl_message *m) { - unsigned flags, unknown_flags_added, unknown_flags_removed, unknown_flags; - uint8_t operstate; - bool carrier_gained = false, carrier_lost = false; - int r; - - assert(link); - - r = sd_rtnl_message_link_get_flags(m, &flags); + r = sd_rtnl_message_open_container(req, IFLA_AF_SPEC); if (r < 0) { - log_warning_link(link, "Could not get link flags"); + log_link_error(link, "Could not open IFLA_AF_SPEC container: %s", strerror(-r)); return r; } - r = sd_rtnl_message_read_u8(m, IFLA_OPERSTATE, &operstate); - if (r < 0) - /* if we got a message without operstate, take it to mean - the state was unchanged */ - operstate = link->kernel_operstate; - - if ((link->flags == flags) && (link->kernel_operstate == operstate)) - return 0; - - if (link->flags != flags) { - log_debug_link(link, "flags change:%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s", - FLAG_STRING("LOOPBACK", IFF_LOOPBACK, link->flags, flags), - FLAG_STRING("MASTER", IFF_MASTER, link->flags, flags), - FLAG_STRING("SLAVE", IFF_SLAVE, link->flags, flags), - FLAG_STRING("UP", IFF_UP, link->flags, flags), - FLAG_STRING("DORMANT", IFF_DORMANT, link->flags, flags), - FLAG_STRING("LOWER_UP", IFF_LOWER_UP, link->flags, flags), - FLAG_STRING("RUNNING", IFF_RUNNING, link->flags, flags), - FLAG_STRING("MULTICAST", IFF_MULTICAST, link->flags, flags), - FLAG_STRING("BROADCAST", IFF_BROADCAST, link->flags, flags), - FLAG_STRING("POINTOPOINT", IFF_POINTOPOINT, link->flags, flags), - FLAG_STRING("PROMISC", IFF_PROMISC, link->flags, flags), - FLAG_STRING("ALLMULTI", IFF_ALLMULTI, link->flags, flags), - FLAG_STRING("PORTSEL", IFF_PORTSEL, link->flags, flags), - FLAG_STRING("AUTOMEDIA", IFF_AUTOMEDIA, link->flags, flags), - FLAG_STRING("DYNAMIC", IFF_DYNAMIC, link->flags, flags), - FLAG_STRING("NOARP", IFF_NOARP, link->flags, flags), - FLAG_STRING("NOTRAILERS", IFF_NOTRAILERS, link->flags, flags), - FLAG_STRING("DEBUG", IFF_DEBUG, link->flags, flags), - FLAG_STRING("ECHO", IFF_ECHO, link->flags, flags)); - - unknown_flags = ~(IFF_LOOPBACK | IFF_MASTER | IFF_SLAVE | IFF_UP | - IFF_DORMANT | IFF_LOWER_UP | IFF_RUNNING | - IFF_MULTICAST | IFF_BROADCAST | IFF_POINTOPOINT | - IFF_PROMISC | IFF_ALLMULTI | IFF_PORTSEL | - IFF_AUTOMEDIA | IFF_DYNAMIC | IFF_NOARP | - IFF_NOTRAILERS | IFF_DEBUG | IFF_ECHO); - unknown_flags_added = ((link->flags ^ flags) & flags & unknown_flags); - unknown_flags_removed = ((link->flags ^ flags) & link->flags & unknown_flags); - - /* link flags are currently at most 18 bits, let's align to printing 20 */ - if (unknown_flags_added) - log_debug_link(link, "unknown link flags gained: %#.5x (ignoring)", - unknown_flags_added); - - if (unknown_flags_removed) - log_debug_link(link, "unknown link flags lost: %#.5x (ignoring)", - unknown_flags_removed); + r = sd_rtnl_message_open_container(req, AF_INET6); + if (r < 0) { + log_link_error(link, "Could not open AF_INET6 container: %s", strerror(-r)); + return r; } - carrier_gained = !link_has_carrier(link->flags, link->kernel_operstate) && - link_has_carrier(flags, operstate); - carrier_lost = link_has_carrier(link->flags, link->kernel_operstate) && - !link_has_carrier(flags, operstate); - - link->flags = flags; - link->kernel_operstate = operstate; - - link_save(link); - - if (link->state == LINK_STATE_FAILED || - link->state == LINK_STATE_UNMANAGED) - return 0; - - if (carrier_gained) { - log_info_link(link, "gained carrier"); - - if (link->network) { - r = link_acquire_conf(link); - if (r < 0) { - link_enter_failed(link); - return r; - } - } - } else if (carrier_lost) { - log_info_link(link, "lost carrier"); - - r = link_stop_clients(link); + if (!link_ipv6ll_enabled(link)) { + r = sd_rtnl_message_append_u8(req, IFLA_INET6_ADDR_GEN_MODE, IN6_ADDR_GEN_MODE_NONE); if (r < 0) { - link_enter_failed(link); + log_link_error(link, "Could not append IFLA_INET6_ADDR_GEN_MODE: %s", strerror(-r)); return r; } } - return 0; -} - -static int link_up_handler(sd_rtnl *rtnl, sd_rtnl_message *m, void *userdata) { - _cleanup_link_unref_ Link *link = userdata; - int r; - - assert(link); - - if (IN_SET(link->state, LINK_STATE_FAILED, LINK_STATE_LINGER)) - return 1; - - r = sd_rtnl_message_get_errno(m); - if (r < 0) { - /* 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", - IFNAMSIZ, - link->ifname, strerror(-r), - "ERRNO=%d", -r, - NULL); + if (!in_addr_is_null(AF_INET6, &link->network->ipv6_token)) { + r = sd_rtnl_message_append_in6_addr(req, IFLA_INET6_TOKEN, &link->network->ipv6_token.in6); + if (r < 0) { + log_link_error(link, "Could not append IFLA_INET6_TOKEN: %s", strerror(-r)); + return r; + } } - return 1; -} - -static int link_up(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, "bringing link up"); - - r = sd_rtnl_message_new_link(link->manager->rtnl, &req, - RTM_SETLINK, link->ifindex); + r = sd_rtnl_message_close_container(req); if (r < 0) { - log_error_link(link, "Could not allocate RTM_SETLINK message"); + log_link_error(link, "Could not close AF_INET6 container: %s", strerror(-r)); return r; } - r = sd_rtnl_message_link_set_flags(req, IFF_UP, IFF_UP); + r = sd_rtnl_message_close_container(req); if (r < 0) { - log_error_link(link, "Could not set link flags: %s", strerror(-r)); + log_link_error(link, "Could not close IFLA_AF_SPEC container: %s", strerror(-r)); return r; } - r = sd_rtnl_call_async(link->manager->rtnl, req, link_up_handler, link, 0, NULL); + r = sd_rtnl_call_async(link->manager->rtnl, req, link_up_handler, link, + 0, NULL); if (r < 0) { - log_error_link(link, - "Could not send rtnetlink message: %s", strerror(-r)); + log_link_error(link, + "Could not send rtnetlink message: %s", + strerror(-r)); return r; } @@ -1702,15 +1151,12 @@ static int link_up(Link *link) { return 0; } -static int link_enslaved(Link *link) { +static int link_joined(Link *link) { int r; assert(link); - assert(link->state == LINK_STATE_ENSLAVING); assert(link->network); - log_debug_link(link, "enslaved"); - if (!(link->flags & IFF_UP)) { r = link_up(link); if (r < 0) { @@ -1719,16 +1165,24 @@ static int link_enslaved(Link *link) { } } + if(link->network->bridge) { + r = link_set_bridge(link); + if (r < 0) { + log_link_error(link, + "Could not set bridge message: %s", + strerror(-r)); + } + } + return link_enter_set_addresses(link); } -static int enslave_handler(sd_rtnl *rtnl, sd_rtnl_message *m, void *userdata) { +static int netdev_join_handler(sd_rtnl *rtnl, sd_rtnl_message *m, + void *userdata) { _cleanup_link_unref_ Link *link = userdata; int r; assert(link); - assert(IN_SET(link->state, LINK_STATE_ENSLAVING, LINK_STATE_FAILED, - LINK_STATE_LINGER)); assert(link->network); link->enslaving --; @@ -1738,125 +1192,53 @@ static int enslave_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_ERR, link, - "MESSAGE=%-*s: could not enslave: %s", - IFNAMSIZ, - link->ifname, strerror(-r), - "ERRNO=%d", -r, - NULL); + log_link_error_errno(link, -r, "%-*s: could not join netdev: %m", IFNAMSIZ, link->ifname); link_enter_failed(link); return 1; - } + } else + log_link_debug(link, "joined netdev"); if (link->enslaving <= 0) - link_enslaved(link); + link_joined(link); return 1; } -static int link_enter_enslave(Link *link) { - NetDev *vlan, *macvlan, *vxlan; +static int link_enter_join_netdev(Link *link) { + NetDev *netdev; Iterator i; int r; assert(link); assert(link->network); - assert(link->state == LINK_STATE_INITIALIZING); + assert(link->state == LINK_STATE_PENDING); - link->state = LINK_STATE_ENSLAVING; + link_set_state(link, LINK_STATE_ENSLAVING); link_save(link); if (!link->network->bridge && !link->network->bond && - !link->network->tunnel && - hashmap_isempty(link->network->vlans) && - hashmap_isempty(link->network->macvlans) && - hashmap_isempty(link->network->vxlans)) - return link_enslaved(link); + hashmap_isempty(link->network->stacked_netdevs)) + return link_joined(link); if (link->network->bond) { - log_struct_link(LOG_DEBUG, link, + log_link_struct(link, LOG_DEBUG, "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", - IFNAMSIZ, - link->ifname, link->network->bond->ifname, strerror(-r), - NETDEV(link->network->bond), - NULL); - link_enter_failed(link); - return r; - } - - link->enslaving ++; - } - - if (link->network->bridge) { - log_struct_link(LOG_DEBUG, link, - "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", - IFNAMSIZ, - link->ifname, link->network->bridge->ifname, strerror(-r), - NETDEV(link->network->bridge), - NULL); - link_enter_failed(link); - return r; - } - - link->enslaving ++; - } - - if (link->network->tunnel) { - log_struct_link(LOG_DEBUG, link, - "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", - IFNAMSIZ, - link->ifname, link->network->tunnel->ifname, strerror(-r), - NETDEV(link->network->tunnel), - 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'", - IFNAMSIZ, - link->ifname, vlan->ifname, NETDEV(vlan), NULL); + NETDEVIF(link->network->bond), + NULL); - r = netdev_enslave(vlan, link, &enslave_handler); + r = netdev_join(link->network->bond, link, &netdev_join_handler); if (r < 0) { - log_struct_link(LOG_WARNING, link, - "MESSAGE=%-*s: could not enslave by '%s': %s", + log_link_struct(link, LOG_WARNING, + "MESSAGE=%-*s: could not join netdev '%s': %s", IFNAMSIZ, - link->ifname, vlan->ifname, strerror(-r), - NETDEV(vlan), NULL); + link->ifname, link->network->bond->ifname, + strerror(-r), + NETDEVIF(link->network->bond), + NULL); link_enter_failed(link); return r; } @@ -1864,19 +1246,24 @@ static int link_enter_enslave(Link *link) { link->enslaving ++; } - HASHMAP_FOREACH(macvlan, link->network->macvlans, i) { - log_struct_link(LOG_DEBUG, link, + if (link->network->bridge) { + log_link_struct(link, LOG_DEBUG, "MESSAGE=%-*s: enslaving by '%s'", IFNAMSIZ, - link->ifname, macvlan->ifname, NETDEV(macvlan), NULL); + link->ifname, link->network->bridge->ifname, + NETDEVIF(link->network->bridge), + NULL); - r = netdev_enslave(macvlan, link, &enslave_handler); + r = netdev_join(link->network->bridge, link, + &netdev_join_handler); if (r < 0) { - log_struct_link(LOG_WARNING, link, - "MESSAGE=%-*s: could not enslave by '%s': %s", + log_link_struct(link, LOG_WARNING, + "MESSAGE=%-*s: could not join netdev '%s': %s", IFNAMSIZ, - link->ifname, macvlan->ifname, strerror(-r), - NETDEV(macvlan), NULL); + link->ifname, link->network->bridge->ifname, + strerror(-r), + NETDEVIF(link->network->bridge), + NULL); link_enter_failed(link); return r; } @@ -1884,19 +1271,21 @@ static int link_enter_enslave(Link *link) { link->enslaving ++; } - HASHMAP_FOREACH(vxlan, link->network->vxlans, i) { - log_struct_link(LOG_DEBUG, link, - "MESSAGE=%*s: enslaving by '%s'", + HASHMAP_FOREACH(netdev, link->network->stacked_netdevs, i) { + log_link_struct(link, LOG_DEBUG, + "MESSAGE=%-*s: enslaving by '%s'", IFNAMSIZ, - link->ifname, vxlan->ifname, NETDEV(vxlan), NULL); + link->ifname, netdev->ifname, NETDEVIF(netdev), + NULL); - r = netdev_enslave(vxlan, link, &enslave_handler); + r = netdev_join(netdev, link, &netdev_join_handler); if (r < 0) { - log_struct_link(LOG_WARNING, link, - "MESSAGE=%*s: could not enslave by '%s': %s", + log_link_struct(link, LOG_WARNING, + "MESSAGE=%-*s: could not join netdev '%s': %s", IFNAMSIZ, - link->ifname, vxlan->ifname, strerror(-r), - NETDEV(vxlan), NULL); + link->ifname, netdev->ifname, + strerror(-r), + NETDEVIF(netdev), NULL); link_enter_failed(link); return r; } @@ -1907,95 +1296,88 @@ static int link_enter_enslave(Link *link) { return 0; } -static int link_configure(Link *link) { +static int link_set_ipv4_forward(Link *link) { + const char *p = NULL; + bool b; int r; - assert(link); - assert(link->state == LINK_STATE_INITIALIZING); - - if (link->network->ipv4ll) { - uint8_t seed[8]; + b = link_ipv4_forward_enabled(link); - r = sd_ipv4ll_new(&link->ipv4ll); + p = strjoina("/proc/sys/net/ipv4/conf/", link->ifname, "/forwarding"); + r = write_string_file_no_create(p, one_zero(b)); + if (r < 0) + log_link_warning_errno(link, r, "Cannot configure IPv4 forwarding for interface %s: %m", link->ifname); + + if (b) { + _cleanup_free_ char *buf = NULL; + + /* If IP forwarding is turned on for this interface, + * then propagate this to the global setting. Given + * that turning this on has side-effects on other + * fields, we'll try to avoid doing this unless + * necessary, hence check the previous value + * first. Note that we never turn this option off + * again, since all interfaces we manage do not do + * forwarding anyway by default, and ownership rules + * of this control are so unclear. */ + + r = read_one_line_file("/proc/sys/net/ipv4/ip_forward", &buf); 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; - } + log_link_warning_errno(link, r, "Cannot read /proc/sys/net/ipv4/ip_forward: %m"); + else if (!streq(buf, "1")) { + r = write_string_file_no_create("/proc/sys/net/ipv4/ip_forward", "1"); + if (r < 0) + log_link_warning_errno(link, r, "Cannot write /proc/sys/net/ipv4/ip_forward: %m"); } + } - r = sd_ipv4ll_attach_event(link->ipv4ll, NULL, 0); - if (r < 0) - return r; + return 0; +} - r = sd_ipv4ll_set_mac(link->ipv4ll, &link->mac); - if (r < 0) - return r; +static int link_set_ipv6_forward(Link *link) { + const char *p = NULL; + int r; - r = sd_ipv4ll_set_index(link->ipv4ll, link->ifindex); - if (r < 0) - return r; + p = strjoina("/proc/sys/net/ipv6/conf/", link->ifname, "/forwarding"); + r = write_string_file_no_create(p, one_zero(link_ipv6_forward_enabled(link))); + if (r < 0) + log_link_warning_errno(link, r, "Cannot configure IPv6 forwarding for interface: %m"); - r = sd_ipv4ll_set_callback(link->ipv4ll, ipv4ll_handler, link); - if (r < 0) - return r; - } + return 0; +} - if (IN_SET(link->network->dhcp, DHCP_SUPPORT_BOTH, DHCP_SUPPORT_V4)) { - r = sd_dhcp_client_new(&link->dhcp_client); - if (r < 0) - return r; +static int link_configure(Link *link) { + int r; - r = sd_dhcp_client_attach_event(link->dhcp_client, NULL, 0); - if (r < 0) - return r; + assert(link); + assert(link->network); + assert(link->state == LINK_STATE_PENDING); - r = sd_dhcp_client_set_mac(link->dhcp_client, &link->mac); - if (r < 0) - return r; + r = link_set_bridge_fdb(link); + if (r < 0) + return r; + + r = link_set_ipv4_forward(link); + if (r < 0) + return r; + + r = link_set_ipv6_forward(link); + if (r < 0) + return r; - r = sd_dhcp_client_set_index(link->dhcp_client, link->ifindex); + if (link_ipv4ll_enabled(link)) { + r = ipv4ll_configure(link); if (r < 0) return r; + } - r = sd_dhcp_client_set_callback(link->dhcp_client, dhcp_handler, link); + if (link_dhcp4_enabled(link)) { + r = dhcp4_configure(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; - } - - if (link->network->dhcp_routes) { - r = sd_dhcp_client_set_request_option(link->dhcp_client, DHCP_OPTION_STATIC_ROUTE); - if (r < 0) - return r; - r = sd_dhcp_client_set_request_option(link->dhcp_client, DHCP_OPTION_CLASSLESS_STATIC_ROUTE); - if (r < 0) - return r; - } - - if (link->network->dhcp_sendhost) { - _cleanup_free_ char *hostname = gethostname_malloc(); - if (!hostname) - return -ENOMEM; - - if (!is_localhost(hostname)) { - r = sd_dhcp_client_set_hostname(link->dhcp_client, hostname); - if (r < 0) - return r; - } - } } - if (link->network->dhcp_server) { + if (link_dhcp4_server_enabled(link)) { r = sd_dhcp_server_new(&link->dhcp_server, link->ifindex); if (r < 0) return r; @@ -2005,42 +1387,38 @@ static int link_configure(Link *link) { return r; } - if (IN_SET(link->network->dhcp, DHCP_SUPPORT_BOTH, DHCP_SUPPORT_V6)) { - r = sd_icmp6_nd_new(&link->icmp6_router_discovery); - if (r < 0) - return r; - - r = sd_icmp6_nd_attach_event(link->icmp6_router_discovery, - NULL, 0); + if (link_dhcp6_enabled(link)) { + r = icmp6_configure(link); if (r < 0) return r; + } - r = sd_icmp6_nd_set_mac(link->icmp6_router_discovery, - &link->mac); + if (link_lldp_enabled(link)) { + r = sd_lldp_new(link->ifindex, link->ifname, &link->mac, &link->lldp); if (r < 0) return r; - r = sd_icmp6_nd_set_index(link->icmp6_router_discovery, - link->ifindex); + r = sd_lldp_attach_event(link->lldp, NULL, 0); if (r < 0) return r; - r = sd_icmp6_nd_set_callback(link->icmp6_router_discovery, - icmp6_router_handler, link); + r = sd_lldp_set_callback(link->lldp, + lldp_handler, link); if (r < 0) return r; } - if (link_has_carrier(link->flags, link->kernel_operstate)) { + if (link_has_carrier(link)) { r = link_acquire_conf(link); if (r < 0) return r; } - return link_enter_enslave(link); + return link_enter_join_netdev(link); } -static int link_initialized_and_synced(sd_rtnl *rtnl, sd_rtnl_message *m, void *userdata) { +static int link_initialized_and_synced(sd_rtnl *rtnl, sd_rtnl_message *m, + void *userdata) { _cleanup_link_unref_ Link *link = userdata; Network *network; int r; @@ -2049,18 +1427,30 @@ static int link_initialized_and_synced(sd_rtnl *rtnl, sd_rtnl_message *m, void * assert(link->ifname); assert(link->manager); - if (link->state != LINK_STATE_INITIALIZING) + if (link->state != LINK_STATE_PENDING) return 1; - log_debug_link(link, "link state is up-to-date"); + log_link_debug(link, "link state is up-to-date"); - r = network_get(link->manager, link->udev_device, link->ifname, &link->mac, &network); + r = network_get(link->manager, link->udev_device, link->ifname, + &link->mac, &network); if (r == -ENOENT) { link_enter_unmanaged(link); return 1; } else if (r < 0) return r; + if (link->flags & IFF_LOOPBACK) { + if (network->link_local != ADDRESS_FAMILY_NO) + log_link_debug(link, "ignoring link-local autoconfiguration for loopback link"); + + if (network->dhcp != ADDRESS_FAMILY_NO) + log_link_debug(link, "ignoring DHCP clients for loopback link"); + + if (network->dhcp_server) + log_link_debug(link, "ignoring DHCP server for loopback link"); + } + r = network_apply(link->manager, network, link); if (r < 0) return r; @@ -2081,23 +1471,28 @@ int link_initialized(Link *link, struct udev_device *device) { assert(link->manager->rtnl); assert(device); - if (link->state != LINK_STATE_INITIALIZING) + if (link->state != LINK_STATE_PENDING) return 0; - log_debug_link(link, "udev initialized link"); + if (link->udev_device) + return 0; + + log_link_debug(link, "udev initialized link"); link->udev_device = udev_device_ref(device); - /* udev has initialized the link, but we don't know if we have yet processed - the NEWLINK messages with the latest state. Do a GETLINK, when it returns - we know that the pending NEWLINKs have already been processed and that we - are up-to-date */ + /* udev has initialized the link, but we don't know if we have yet + * processed the NEWLINK messages with the latest state. Do a GETLINK, + * when it returns we know that the pending NEWLINKs have already been + * processed and that we are up-to-date */ - r = sd_rtnl_message_new_link(link->manager->rtnl, &req, RTM_GETLINK, link->ifindex); + r = sd_rtnl_message_new_link(link->manager->rtnl, &req, RTM_GETLINK, + link->ifindex); if (r < 0) return r; - r = sd_rtnl_call_async(link->manager->rtnl, req, link_initialized_and_synced, link, 0, NULL); + r = sd_rtnl_call_async(link->manager->rtnl, req, + link_initialized_and_synced, link, 0, NULL); if (r < 0) return r; @@ -2106,20 +1501,41 @@ int link_initialized(Link *link, struct udev_device *device) { return 0; } +static Address* link_get_equal_address(Link *link, Address *needle) { + Address *i; + + assert(link); + assert(needle); + + LIST_FOREACH(addresses, i, link->addresses) + if (address_equal(i, needle)) + return i; + + return NULL; +} + int link_rtnl_process_address(sd_rtnl *rtnl, sd_rtnl_message *message, void *userdata) { Manager *m = userdata; Link *link = NULL; uint16_t type; _cleanup_address_free_ Address *address = NULL; - Address *ad; - char buf[INET6_ADDRSTRLEN]; - bool address_dropped = false; + Address *existing; + char buf[INET6_ADDRSTRLEN], valid_buf[FORMAT_TIMESPAN_MAX]; + const char *valid_str = NULL; int r, ifindex; assert(rtnl); assert(message); assert(m); + if (sd_rtnl_message_is_error(message)) { + r = sd_rtnl_message_get_errno(message); + if (r < 0) + log_warning_errno(r, "rtnl: failed to receive address: %m"); + + return 0; + } + r = sd_rtnl_message_get_type(message, &type); if (r < 0) { log_warning("rtnl: could not get message type"); @@ -2127,13 +1543,19 @@ int link_rtnl_process_address(sd_rtnl *rtnl, sd_rtnl_message *message, void *use } r = sd_rtnl_message_addr_get_ifindex(message, &ifindex); - if (r < 0 || ifindex <= 0) { - log_warning("rtnl: received address message without valid ifindex, ignoring"); + if (r < 0) { + log_warning_errno(r, "rtnl: could not get ifindex: %m"); + return 0; + } else if (ifindex <= 0) { + log_warning("rtnl: received address message with invalid ifindex: %d", ifindex); return 0; } else { r = link_get(m, ifindex, &link); if (r < 0 || !link) { - log_warning("rtnl: received address for a nonexistent link, ignoring"); + /* when enumerating we might be out of sync, but we will + * get the address again, so just ignore it */ + if (!m->enumerating) + log_warning("rtnl: received address for nonexistent link (%d), ignoring", ifindex); return 0; } } @@ -2144,19 +1566,25 @@ 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_link(link, "rtnl: received address with invalid family, ignoring"); + log_link_warning(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_link(link, "rtnl: received address with invalid prefixlen, ignoring"); + log_link_warning(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"); + log_link_warning(link, "rtnl: received address with invalid scope, ignoring"); + return 0; + } + + r = sd_rtnl_message_addr_get_flags(message, &address->flags); + if (r < 0) { + log_link_warning(link, "rtnl: received address with invalid flags, ignoring"); return 0; } @@ -2164,7 +1592,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_link(link, "rtnl: received address without valid address, ignoring"); + log_link_warning(link, "rtnl: received address without valid address, ignoring"); return 0; } @@ -2173,7 +1601,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_link(link, "rtnl: received address without valid address, ignoring"); + log_link_warning(link, "rtnl: received address without valid address, ignoring"); return 0; } @@ -2184,46 +1612,54 @@ 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_link(link, "could not print address"); + log_link_warning(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; - } + r = sd_rtnl_message_read_cache_info(message, IFA_CACHEINFO, &address->cinfo); + if (r >= 0) { + if (address->cinfo.ifa_valid == CACHE_INFO_INFINITY_LIFE_TIME) + valid_str = "ever"; + else + valid_str = format_timespan(valid_buf, FORMAT_TIMESPAN_MAX, + address->cinfo.ifa_valid * USEC_PER_SEC, + USEC_PER_SEC); } + existing = link_get_equal_address(link, address); + switch (type) { case RTM_NEWADDR: - if (!address_dropped) - log_debug_link(link, "added address: %s/%u", buf, - address->prefixlen); - else - log_debug_link(link, "updated address: %s/%u", buf, - address->prefixlen); + if (existing) { + log_link_debug(link, "Updating address: %s/%u (valid for %s)", buf, address->prefixlen, valid_str); + + + existing->scope = address->scope; + existing->flags = address->flags; + existing->cinfo = address->cinfo; - LIST_PREPEND(addresses, link->addresses, address); - address = NULL; + } else { + log_link_debug(link, "Adding address: %s/%u (valid for %s)", buf, address->prefixlen, valid_str); - link_save(link); + LIST_PREPEND(addresses, link->addresses, address); + address_establish(address, link); + + address = NULL; + + link_save(link); + } break; + case RTM_DELADDR: - if (address_dropped) { - log_debug_link(link, "removed address: %s/%u", buf, - address->prefixlen); - link_save(link); + if (existing) { + log_link_debug(link, "Removing address: %s/%u (valid for %s)", buf, address->prefixlen, valid_str); + address_release(existing, link); + LIST_REMOVE(addresses, link->addresses, existing); + address_free(existing); } else - log_warning_link(link, "removing non-existent address: %s/%u", - buf, address->prefixlen); + log_link_warning(link, "Removing non-existent address: %s/%u (valid for %s)", buf, address->prefixlen, valid_str); break; default: @@ -2233,33 +1669,8 @@ int link_rtnl_process_address(sd_rtnl *rtnl, sd_rtnl_message *message, void *use return 1; } -static int link_get_address_handler(sd_rtnl *rtnl, sd_rtnl_message *m, void *userdata) { - _cleanup_link_unref_ Link *link = userdata; - int r; - - assert(rtnl); - assert(m); - assert(link); - assert(link->manager); - - for (; m; m = sd_rtnl_message_next(m)) { - r = sd_rtnl_message_get_errno(m); - if (r < 0) { - log_debug_link(link, "getting address failed: %s", strerror(-r)); - continue; - } - - r = link_rtnl_process_address(rtnl, m, link->manager); - if (r < 0) - log_warning_link(link, "could not process address: %s", strerror(-r)); - } - - return 1; -} - int link_add(Manager *m, sd_rtnl_message *message, Link **ret) { Link *link; - _cleanup_rtnl_message_unref_ sd_rtnl_message *req = NULL; _cleanup_udev_device_unref_ struct udev_device *device = NULL; char ifindex_str[2 + DECIMAL_STR_MAX(int)]; int r; @@ -2275,30 +1686,21 @@ int link_add(Manager *m, sd_rtnl_message *message, Link **ret) { link = *ret; - 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) - return r; - - r = sd_rtnl_call_async(m->rtnl, req, link_get_address_handler, link, 0, NULL); - if (r < 0) - return r; - - link_ref(link); + log_link_debug(link, "link %d added", link->ifindex); if (detect_container(NULL) <= 0) { /* not in a container, udev will be around */ - sprintf(ifindex_str, "n%"PRIu64, link->ifindex); + sprintf(ifindex_str, "n%d", link->ifindex); device = udev_device_new_from_device_id(m->udev, ifindex_str); if (!device) { - log_warning_link(link, "could not find udev device"); + log_link_warning(link, + "could not find udev device: %m"); return -errno; } if (udev_device_get_is_initialized(device) <= 0) { /* not yet ready */ - log_debug_link(link, "udev initializing link..."); + log_link_debug(link, "link pending udev initialization..."); return 0; } @@ -2317,9 +1719,62 @@ int link_add(Manager *m, sd_rtnl_message *message, Link **ret) { return 0; } +static int link_carrier_gained(Link *link) { + int r; + + assert(link); + + if (link->network) { + r = link_acquire_conf(link); + if (r < 0) { + link_enter_failed(link); + return r; + } + } + + return 0; +} + +static int link_carrier_lost(Link *link) { + int r; + + assert(link); + + r = link_stop_clients(link); + if (r < 0) { + link_enter_failed(link); + return r; + } + + return 0; +} + +int link_carrier_reset(Link *link) { + int r; + + assert(link); + + if (link_has_carrier(link)) { + r = link_carrier_lost(link); + if (r < 0) + return r; + + r = link_carrier_gained(link); + if (r < 0) + return r; + + log_link_info(link, "reset carrier"); + } + + return 0; +} + + int link_update(Link *link, sd_rtnl_message *m) { struct ether_addr mac; - char *ifname; + const char *ifname; + uint32_t mtu; + bool had_carrier, carrier_gained, carrier_lost; int r; assert(link); @@ -2328,13 +1783,13 @@ int link_update(Link *link, sd_rtnl_message *m) { if (link->state == LINK_STATE_LINGER) { link_ref(link); - log_info_link(link, "link readded"); - link->state = LINK_STATE_ENSLAVING; + log_link_info(link, "link readded"); + link_set_state(link, LINK_STATE_ENSLAVING); } 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); + log_link_info(link, "renamed to %s", ifname); free(link->ifname); link->ifname = strdup(ifname); @@ -2342,22 +1797,38 @@ int link_update(Link *link, sd_rtnl_message *m) { 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); + r = sd_rtnl_message_read_u32(m, IFLA_MTU, &mtu); + if (r >= 0 && mtu > 0) { + link->mtu = mtu; + if (!link->original_mtu) { + link->original_mtu = mtu; + log_link_debug(link, "saved original MTU: %" + PRIu32, link->original_mtu); + } + + if (link->dhcp_client) { + r = sd_dhcp_client_set_mtu(link->dhcp_client, + link->mtu); + if (r < 0) { + log_link_warning(link, + "Could not update MTU in DHCP client: %s", + strerror(-r)); + return r; + } + } } /* 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)) { + 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: " + log_link_debug(link, "MAC address: " "%02hhx:%02hhx:%02hhx:%02hhx:%02hhx:%02hhx", mac.ether_addr_octet[0], mac.ether_addr_octet[1], @@ -2369,18 +1840,21 @@ int link_update(Link *link, sd_rtnl_message *m) { 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", + log_link_warning(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); + r = sd_dhcp_client_set_mac(link->dhcp_client, + (const uint8_t *) &link->mac, + sizeof (link->mac), + ARPHRD_ETHER); if (r < 0) { - log_warning_link(link, "Could not update MAC " - "address in DHCP client: %s", + log_link_warning(link, + "Could not update MAC address in DHCP client: %s", strerror(-r)); return r; } @@ -2388,9 +1862,12 @@ int link_update(Link *link, sd_rtnl_message *m) { if (link->dhcp6_client) { r = sd_dhcp6_client_set_mac(link->dhcp6_client, - &link->mac); + (const uint8_t *) &link->mac, + sizeof (link->mac), + ARPHRD_ETHER); if (r < 0) { - log_warning_link(link, "Could not update MAC address in DHCPv6 client: %s", + log_link_warning(link, + "Could not update MAC address in DHCPv6 client: %s", strerror(-r)); return r; } @@ -2398,57 +1875,70 @@ int link_update(Link *link, sd_rtnl_message *m) { } } - return link_update_flags(link, m); -} + had_carrier = link_has_carrier(link); -static void serialize_addresses(FILE *f, const char *key, Address *address) { - Address *ad; + r = link_update_flags(link, m); + if (r < 0) + return r; - assert(f); - assert(key); + carrier_gained = !had_carrier && link_has_carrier(link); + carrier_lost = had_carrier && !link_has_carrier(link); - if (!address) - return; + if (carrier_gained) { + log_link_info(link, "gained carrier"); - fprintf(f, "%s=", key); + r = link_carrier_gained(link); + if (r < 0) + return r; + } else if (carrier_lost) { + log_link_info(link, "lost carrier"); - LIST_FOREACH(addresses, ad, address) { - char buf[INET6_ADDRSTRLEN]; + r = link_carrier_lost(link); + if (r < 0) + return r; - if (inet_ntop(ad->family, &ad->in_addr, buf, INET6_ADDRSTRLEN)) - fprintf(f, "%s%s", buf, (ad->addresses_next) ? " ": ""); } - fputs("\n", f); + return 0; } static void link_update_operstate(Link *link) { - + LinkOperationalState operstate; assert(link); if (link->kernel_operstate == IF_OPER_DORMANT) - link->operstate = LINK_OPERSTATE_DORMANT; - else if (link_has_carrier(link->flags, link->kernel_operstate)) { + operstate = LINK_OPERSTATE_DORMANT; + else if (link_has_carrier(link)) { 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->flags & (IFA_F_TENTATIVE | IFA_F_DEPRECATED)) + continue; + if (address->scope < scope) scope = address->scope; } if (scope < RT_SCOPE_SITE) /* universally accessible addresses found */ - link->operstate = LINK_OPERSTATE_ROUTABLE; + operstate = LINK_OPERSTATE_ROUTABLE; else if (scope < RT_SCOPE_HOST) /* only link or site local addresses found */ - link->operstate = LINK_OPERSTATE_DEGRADED; + operstate = LINK_OPERSTATE_DEGRADED; else /* no useful addresses found */ - link->operstate = LINK_OPERSTATE_CARRIER; - } else - link->operstate = LINK_OPERSTATE_UNKNOWN; + operstate = LINK_OPERSTATE_CARRIER; + } else if (link->flags & IFF_UP) + operstate = LINK_OPERSTATE_NO_CARRIER; + else + operstate = LINK_OPERSTATE_OFF; + + if (link->operstate != operstate) { + link->operstate = operstate; + link_send_changed(link, "OperationalState", NULL); + } } int link_save(Link *link) { @@ -2481,56 +1971,143 @@ int link_save(Link *link) { r = fopen_temporary(link->state_file, &f, &temp_path); if (r < 0) - goto finish; + return r; fchmod(fileno(f), 0644); fprintf(f, "# This is private data. Do not parse.\n" "ADMIN_STATE=%s\n" - "OPER_STATE=%s\n" - "FLAGS=%u\n", - admin_state, oper_state, link->flags); + "OPER_STATE=%s\n", + admin_state, oper_state); if (link->network) { - serialize_addresses(f, "DNS", link->network->dns); - serialize_addresses(f, "NTP", link->network->ntp); + char **address, **domain; + bool space; + + fprintf(f, "NETWORK_FILE=%s\n", link->network->filename); + + fputs("DNS=", f); + space = false; + STRV_FOREACH(address, link->network->dns) { + if (space) + fputc(' ', f); + fputs(*address, f); + space = true; + } + + if (link->network->dhcp_dns && + link->dhcp_lease) { + const struct in_addr *addresses; + + r = sd_dhcp_lease_get_dns(link->dhcp_lease, &addresses); + if (r > 0) { + if (space) + fputc(' ', f); + serialize_in_addrs(f, addresses, r); + } + } + + fputs("\n", f); + + fprintf(f, "NTP="); + space = false; + STRV_FOREACH(address, link->network->ntp) { + if (space) + fputc(' ', f); + fputs(*address, f); + space = true; + } + + if (link->network->dhcp_ntp && + link->dhcp_lease) { + const struct in_addr *addresses; + + r = sd_dhcp_lease_get_ntp(link->dhcp_lease, &addresses); + if (r > 0) { + if (space) + fputc(' ', f); + serialize_in_addrs(f, addresses, r); + } + } + + fputs("\n", f); + + fprintf(f, "DOMAINS="); + space = false; + STRV_FOREACH(domain, link->network->domains) { + if (space) + fputc(' ', f); + fputs(*domain, f); + space = true; + } + + if (link->network->dhcp_domains && + link->dhcp_lease) { + const char *domainname; + + r = sd_dhcp_lease_get_domainname(link->dhcp_lease, &domainname); + if (r >= 0) { + if (space) + fputc(' ', f); + fputs(domainname, f); + } + } + + fputs("\n", f); + + fprintf(f, "WILDCARD_DOMAIN=%s\n", + yes_no(link->network->wildcard_domain)); + + fprintf(f, "LLMNR=%s\n", + llmnr_support_to_string(link->network->llmnr)); } if (link->dhcp_lease) { assert(link->network); - r = dhcp_lease_save(link->dhcp_lease, link->lease_file); + r = sd_dhcp_lease_save(link->dhcp_lease, link->lease_file); if (r < 0) - goto finish; + goto fail; 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)); + "DHCP_LEASE=%s\n", + link->lease_file); } else unlink(link->lease_file); - fflush(f); + if (link->lldp) { + assert(link->network); - if (ferror(f) || rename(temp_path, link->state_file) < 0) { - r = -errno; - unlink(link->state_file); - unlink(temp_path); - } + r = sd_lldp_save(link->lldp, link->lldp_file); + if (r < 0) + goto fail; + + fprintf(f, + "LLDP_FILE=%s\n", + link->lldp_file); + } else + unlink(link->lldp_file); -finish: + r = fflush_and_check(f); if (r < 0) - log_error_link(link, "Failed to save link data to %s: %s", link->state_file, strerror(-r)); + goto fail; + + if (rename(temp_path, link->state_file) < 0) { + r = -errno; + goto fail; + } + return 0; +fail: + log_link_error(link, "Failed to save link data to %s: %s", link->state_file, strerror(-r)); + unlink(link->state_file); + unlink(temp_path); return r; } static const char* const link_state_table[_LINK_STATE_MAX] = { - [LINK_STATE_INITIALIZING] = "initializing", + [LINK_STATE_PENDING] = "pending", [LINK_STATE_ENSLAVING] = "configuring", [LINK_STATE_SETTING_ADDRESSES] = "configuring", [LINK_STATE_SETTING_ROUTES] = "configuring", @@ -2543,7 +2120,8 @@ 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_OFF] = "off", + [LINK_OPERSTATE_NO_CARRIER] = "no-carrier", [LINK_OPERSTATE_DORMANT] = "dormant", [LINK_OPERSTATE_CARRIER] = "carrier", [LINK_OPERSTATE_DEGRADED] = "degraded", @@ -2551,55 +2129,3 @@ static const char* const link_operstate_table[_LINK_OPERSTATE_MAX] = { }; DEFINE_STRING_TABLE_LOOKUP(link_operstate, LinkOperationalState); - -static const char* const dhcp_support_table[_DHCP_SUPPORT_MAX] = { - [DHCP_SUPPORT_NONE] = "none", - [DHCP_SUPPORT_BOTH] = "both", - [DHCP_SUPPORT_V4] = "v4", - [DHCP_SUPPORT_V6] = "v6", -}; - -DEFINE_STRING_TABLE_LOOKUP(dhcp_support, DHCPSupport); - -int config_parse_dhcp( - const char* unit, - const char *filename, - unsigned line, - const char *section, - unsigned section_line, - const char *lvalue, - int ltype, - const char *rvalue, - void *data, - void *userdata) { - - DHCPSupport *dhcp = data; - int k; - - assert(filename); - assert(lvalue); - assert(rvalue); - assert(data); - - /* Our enum shall be a superset of booleans, hence first try - * to parse as boolean, and then as enum */ - - k = parse_boolean(rvalue); - if (k > 0) - *dhcp = DHCP_SUPPORT_BOTH; - else if (k == 0) - *dhcp = DHCP_SUPPORT_NONE; - else { - DHCPSupport s; - - s = dhcp_support_from_string(rvalue); - if (s < 0){ - log_syntax(unit, LOG_ERR, filename, line, -s, "Failed to parse DHCP option, ignoring: %s", rvalue); - return 0; - } - - *dhcp = s; - } - - return 0; -}