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=7a0f30bdf51b68837097760acbca61ecdf06d85a;hp=7c738fe81c5f977cfc4c50ba93af22ae7a2caaba;hb=ca4e095ab9e970cb8fa472ae69ea1f0648041722;hpb=326cb4061a7d6ec4107f298b6f947d645512ad76 diff --git a/src/network/networkd-link.c b/src/network/networkd-link.c index 7c738fe81..7a0f30bdf 100644 --- a/src/network/networkd-link.c +++ b/src/network/networkd-link.c @@ -21,14 +21,17 @@ #include #include +#include #include "networkd.h" +#include "networkd-netdev.h" #include "libudev-private.h" #include "udev-util.h" #include "util.h" #include "virt.h" #include "bus-util.h" #include "network-internal.h" +#include "conf-parser.h" #include "network-util.h" #include "dhcp-lease-internal.h" @@ -39,7 +42,7 @@ static bool ipv4ll_is_bound(sd_ipv4ll *ll); 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); @@ -77,7 +80,7 @@ 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) - return r; + log_debug_link(link, "MAC address not found for new device, continuing without"); r = asprintf(&link->state_file, "/run/systemd/netif/links/%"PRIu64, link->ifindex); @@ -105,13 +108,16 @@ static void link_free(Link *link) { if (!link) return; - assert(link->manager); - while ((address = link->addresses)) { LIST_REMOVE(addresses, link->addresses, address); address_free(address); } + while ((address = link->pool_addresses)) { + LIST_REMOVE(addresses, link->pool_addresses, address); + address_free(address); + } + sd_dhcp_client_unref(link->dhcp_client); sd_dhcp_lease_unref(link->dhcp_lease); @@ -119,8 +125,11 @@ static void link_free(Link *link) { free(link->lease_file); sd_ipv4ll_unref(link->ipv4ll); + sd_dhcp6_client_unref(link->dhcp6_client); + sd_icmp6_nd_unref(link->icmp6_router_discovery); - hashmap_remove(link->manager->links, &link->ifindex); + if (link->manager) + hashmap_remove(link->manager->links, &link->ifindex); free(link->ifname); @@ -198,7 +207,7 @@ static int link_stop_clients(Link *link) { if (!link->network) return 0; - if (link->network->dhcp) { + if (IN_SET(link->network->dhcp, DHCP_SUPPORT_BOTH, DHCP_SUPPORT_V6)) { assert(link->dhcp_client); k = sd_dhcp_client_stop(link->dhcp_client); @@ -228,6 +237,24 @@ static int link_stop_clients(Link *link) { } } + if (IN_SET(link->network->dhcp, DHCP_SUPPORT_BOTH, DHCP_SUPPORT_V6)) { + assert(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)); + 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)); + r = k; + } + } + return r; } @@ -246,6 +273,35 @@ static void link_enter_failed(Link *link) { link_save(link); } +static Address* link_find_dhcp_server_address(Link *link) { + Address *address; + + assert(link); + assert(link->network); + + /* The 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)) + continue; + + return address; + } + + /* If that didn't work, find a suitable address we got from the pool */ + LIST_FOREACH(addresses, address, link->pool_addresses) { + if (address->family != AF_INET) + continue; + + return address; + } + + return NULL; +} + static int link_enter_configured(Link *link) { int r; @@ -253,10 +309,43 @@ static int link_enter_configured(Link *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; + } - if (link->network->dhcp_server) { 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; + + /* TODO: + r = sd_dhcp_server_set_router(link->dhcp_server, + &main_address->in_addr.in); + if (r < 0) + return r; + + r = sd_dhcp_server_set_prefixlen(link->dhcp_server, + main_address->prefixlen); + if (r < 0) + return r; + */ + r = sd_dhcp_server_start(link->dhcp_server); if (r < 0) { log_warning_link(link, "could not start DHCPv4 server " @@ -278,7 +367,7 @@ static int link_enter_configured(Link *link) { } static int route_handler(sd_rtnl *rtnl, sd_rtnl_message *m, void *userdata) { - Link *link = userdata; + _cleanup_link_unref_ Link *link = userdata; int r; assert(link->route_messages > 0); @@ -288,10 +377,8 @@ static int route_handler(sd_rtnl *rtnl, sd_rtnl_message *m, void *userdata) { link->route_messages --; - if (IN_SET(LINK_STATE_FAILED, LINK_STATE_LINGER)) { - link_unref(link); + if (IN_SET(LINK_STATE_FAILED, LINK_STATE_LINGER)) return 1; - } r = sd_rtnl_message_get_errno(m); if (r < 0 && r != -EEXIST) @@ -309,11 +396,51 @@ static int route_handler(sd_rtnl *rtnl, sd_rtnl_message *m, void *userdata) { link_enter_configured(link); } - link_unref(link); - return 1; } +static int link_set_dhcp_routes(Link *link) { + struct sd_dhcp_route *static_routes; + int r, n, i; + + assert(link); + + n = sd_dhcp_lease_get_routes(link->dhcp_lease, &static_routes); + if (n < 0) { + if (n != -ENOENT) + log_warning_link(link, "DHCP error: could not get routes: %s", strerror(-n)); + return n; + } + + for (i = 0; i < n; 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_ROUTE_METRIC; + + r = route_configure(route, link, &route_handler); + if (r < 0) { + log_warning_link(link, + "could not set host route: %s", strerror(-r)); + return r; + } + + link->route_messages ++; + } + + return 0; +} + static int link_enter_set_routes(Link *link) { Route *rt; int r; @@ -339,7 +466,6 @@ static int link_enter_set_routes(Link *link) { return r; } - link_ref(link); link->route_messages ++; } @@ -364,7 +490,7 @@ static int link_enter_set_routes(Link *link) { route->family = AF_INET; route->scope = RT_SCOPE_LINK; - route->metrics = 99; + route->metrics = IPV4LL_ROUTE_METRIC; r = route_configure(route, link, &route_handler); if (r < 0) { @@ -374,7 +500,6 @@ static int link_enter_set_routes(Link *link) { return r; } - link_ref(link); link->route_messages ++; } } @@ -386,7 +511,8 @@ static int link_enter_set_routes(Link *link) { r = sd_dhcp_lease_get_router(link->dhcp_lease, &gateway); if (r < 0 && r != -ENOENT) { - log_warning_link(link, "DHCP error: %s", strerror(-r)); + log_warning_link(link, "DHCP error: could not get gateway: %s", + strerror(-r)); return r; } @@ -412,6 +538,7 @@ static int link_enter_set_routes(Link *link) { route_gw->dst_addr.in = gateway; route_gw->dst_prefixlen = 32; route_gw->scope = RT_SCOPE_LINK; + route_gw->metrics = DHCP_ROUTE_METRIC; r = route_configure(route_gw, link, &route_handler); if (r < 0) { @@ -420,11 +547,11 @@ static int link_enter_set_routes(Link *link) { return r; } - link_ref(link); link->route_messages ++; route->family = AF_INET; route->in_addr.in = gateway; + route->metrics = DHCP_ROUTE_METRIC; r = route_configure(route, link, &route_handler); if (r < 0) { @@ -434,9 +561,11 @@ static int link_enter_set_routes(Link *link) { return r; } - link_ref(link); link->route_messages ++; } + + if (link->network->dhcp_routes) + link_set_dhcp_routes(link); } if (link->route_messages == 0) { @@ -447,17 +576,15 @@ static int link_enter_set_routes(Link *link) { } static int route_drop_handler(sd_rtnl *rtnl, sd_rtnl_message *m, void *userdata) { - Link *link = 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)) { - link_unref(link); + if (IN_SET(link->state, LINK_STATE_FAILED, LINK_STATE_LINGER)) return 1; - } r = sd_rtnl_message_get_errno(m); if (r < 0 && r != -ESRCH) @@ -468,15 +595,38 @@ static int route_drop_handler(sd_rtnl *rtnl, sd_rtnl_message *m, void *userdata) "ERRNO=%d", -r, NULL); - link_unref(link); + return 1; +} - return 0; +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; } static int address_handler(sd_rtnl *rtnl, sd_rtnl_message *m, void *userdata) { - Link *link = userdata; + _cleanup_link_unref_ Link *link = userdata; int r; + assert(rtnl); assert(m); assert(link); assert(link->ifname); @@ -486,10 +636,8 @@ static int address_handler(sd_rtnl *rtnl, sd_rtnl_message *m, void *userdata) { link->addr_messages --; - if (IN_SET(link->state, LINK_STATE_FAILED, LINK_STATE_LINGER)) { - link_unref(link); + 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) @@ -499,20 +647,24 @@ static int address_handler(sd_rtnl *rtnl, sd_rtnl_message *m, void *userdata) { link->ifname, strerror(-r), "ERRNO=%d", -r, NULL); + else if (r >= 0) { + /* calling handler directly so take a ref */ + link_ref(link); + link_get_address_handler(rtnl, m, link); + } if (link->addr_messages == 0) { log_debug_link(link, "addresses set"); link_enter_set_routes(link); } - link_unref(link); - return 1; } 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); @@ -535,7 +687,6 @@ static int link_enter_set_addresses(Link *link) { return r; } - link_ref(link); link->addr_messages ++; } @@ -571,7 +722,6 @@ static int link_enter_set_addresses(Link *link) { return r; } - link_ref(link); link->addr_messages ++; } } @@ -589,6 +739,16 @@ static int link_enter_set_addresses(Link *link) { 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", @@ -607,10 +767,14 @@ static int link_enter_set_addresses(Link *link) { 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 = address_configure(address, link, &address_handler); + /* 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); if (r < 0) { log_warning_link(link, "could not set addresses: %s", strerror(-r)); @@ -618,7 +782,6 @@ static int link_enter_set_addresses(Link *link) { return r; } - link_ref(link); link->addr_messages ++; } @@ -626,17 +789,15 @@ static int link_enter_set_addresses(Link *link) { } static int address_update_handler(sd_rtnl *rtnl, sd_rtnl_message *m, void *userdata) { - Link *link = 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)) { - link_unref(link); + if (IN_SET(link->state, LINK_STATE_FAILED, LINK_STATE_LINGER)) return 1; - } r = sd_rtnl_message_get_errno(m); if (r < 0 && r != -ENOENT) @@ -647,23 +808,19 @@ static int address_update_handler(sd_rtnl *rtnl, sd_rtnl_message *m, void *userd "ERRNO=%d", -r, NULL); - link_unref(link); - - return 0; + return 1; } static int address_drop_handler(sd_rtnl *rtnl, sd_rtnl_message *m, void *userdata) { - Link *link = 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)) { - link_unref(link); + if (IN_SET(link->state, LINK_STATE_FAILED, LINK_STATE_LINGER)) return 1; - } r = sd_rtnl_message_get_errno(m); if (r < 0 && r != -EADDRNOTAVAIL) @@ -674,28 +831,22 @@ static int address_drop_handler(sd_rtnl *rtnl, sd_rtnl_message *m, void *userdat "ERRNO=%d", -r, NULL); - link_unref(link); - - return 0; + return 1; } static int set_hostname_handler(sd_bus *bus, sd_bus_message *m, void *userdata, sd_bus_error *ret_error) { - Link *link = userdata; + _cleanup_link_unref_ Link *link = userdata; int r; assert(link); - if (IN_SET(link->state, LINK_STATE_FAILED, LINK_STATE_LINGER)) { - link_unref(link); + if (IN_SET(link->state, LINK_STATE_FAILED, LINK_STATE_LINGER)) return 1; - } r = sd_bus_message_get_errno(m); if (r < 0) log_warning_link(link, "Could not set hostname: %s", strerror(-r)); - link_unref(link); - return 1; } @@ -729,26 +880,26 @@ static int link_set_hostname(Link *link, const char *hostname) { return r; r = sd_bus_call_async(link->manager->bus, NULL, m, set_hostname_handler, link, 0); - if (r < 0) + if (r < 0) { log_error_link(link, "Could not set transient hostname: %s", strerror(-r)); + return r; + } link_ref(link); - return r; + return 0; } static int set_mtu_handler(sd_rtnl *rtnl, sd_rtnl_message *m, void *userdata) { - Link *link = 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)) { - link_unref(link); + if (IN_SET(link->state, LINK_STATE_FAILED, LINK_STATE_LINGER)) return 1; - } r = sd_rtnl_message_get_errno(m); if (r < 0) @@ -758,8 +909,6 @@ static int set_mtu_handler(sd_rtnl *rtnl, sd_rtnl_message *m, void *userdata) { "ERRNO=%d", -r, NULL); - link_unref(link); - return 1; } @@ -793,15 +942,13 @@ static int link_set_mtu(Link *link, uint32_t mtu) { return r; } - link_unref(link); + link_ref(link); return 0; } 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; @@ -813,10 +960,35 @@ static int dhcp_lease_lost(Link *link) { log_warning_link(link, "DHCP lease lost"); + if (link->network->dhcp_routes) { + struct sd_dhcp_route *routes; + int n, i; + + n = sd_dhcp_lease_get_routes(link->dhcp_lease, &routes); + if (n >= 0) { + for (i = 0; i < n; i++) { + _cleanup_route_free_ Route *route = NULL; + + 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; + + route_drop(route, link, &route_drop_handler); + } + } + } + } + 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; @@ -825,7 +997,6 @@ static int dhcp_lease_lost(Link *link) { route_gw->scope = RT_SCOPE_LINK; route_drop(route_gw, link, &route_drop_handler); - link_ref(link); } r = route_new_dynamic(&route); @@ -834,7 +1005,6 @@ static int dhcp_lease_lost(Link *link) { route->in_addr.in = gateway; route_drop(route, link, &route_drop_handler); - link_ref(link); } } @@ -847,7 +1017,6 @@ static int dhcp_lease_lost(Link *link) { address->prefixlen = prefixlen; address_drop(address, link, &address_drop_handler); - link_ref(link); } if (link->network->dhcp_mtu) { @@ -880,6 +1049,25 @@ static int dhcp_lease_lost(Link *link) { return 0; } +static int dhcp_lease_renew(sd_dhcp_client *client, Link *link) { + sd_dhcp_lease *lease; + 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; + } + + sd_dhcp_lease_unref(link->dhcp_lease); + link->dhcp_lease = lease; + + link_enter_set_addresses(link); + + return 0; +} + static int dhcp_lease_acquired(sd_dhcp_client *client, Link *link) { sd_dhcp_lease *lease; struct in_addr address; @@ -916,7 +1104,8 @@ static int dhcp_lease_acquired(sd_dhcp_client *client, Link *link) { r = sd_dhcp_lease_get_router(lease, &gateway); if (r < 0 && r != -ENOENT) { - log_warning_link(link, "DHCP error: %s", strerror(-r)); + log_warning_link(link, "DHCP error: could not get gateway: %s", + strerror(-r)); return r; } @@ -1030,6 +1219,13 @@ static void dhcp_handler(sd_dhcp_client *client, int event, void *userdata) { } } + 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); @@ -1050,7 +1246,7 @@ static void dhcp_handler(sd_dhcp_client *client, int event, void *userdata) { break; default: if (event < 0) - log_warning_link(link, "DHCP error: %s", strerror(-event)); + log_warning_link(link, "DHCP error: client failed: %s", strerror(-event)); else log_warning_link(link, "DHCP unknown event: %d", event); break; @@ -1087,7 +1283,6 @@ static int ipv4ll_address_update(Link *link, bool deprecate) { address->broadcast.s_addr = address->in_addr.in.s_addr | htonl(0xfffffffflu >> address->prefixlen); address_update(address, link, &address_update_handler); - link_ref(link); } return 0; @@ -1120,7 +1315,6 @@ static int ipv4ll_address_lost(Link *link) { address->scope = RT_SCOPE_LINK; address_drop(address, link, &address_drop_handler); - link_ref(link); r = route_new_dynamic(&route); if (r < 0) { @@ -1134,7 +1328,6 @@ static int ipv4ll_address_lost(Link *link) { route->metrics = 99; route_drop(route, link, &route_drop_handler); - link_ref(link); } return 0; @@ -1211,6 +1404,104 @@ static void ipv4ll_handler(sd_ipv4ll *ll, int event, void *userdata){ } } +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; + } +} + +static void icmp6_router_handler(sd_icmp6_nd *nd, int event, void *userdata) { + 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; + + 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; + } + + r = sd_dhcp6_client_set_index(link->dhcp6_client, link->ifindex); + if (r < 0) { + link->dhcp6_client = sd_dhcp6_client_unref(link->dhcp6_client); + return; + } + + r = sd_dhcp6_client_set_callback(link->dhcp6_client, dhcp6_handler, + link); + 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; @@ -1232,7 +1523,7 @@ static int link_acquire_conf(Link *link) { } } - if (link->network->dhcp) { + if (IN_SET(link->network->dhcp, DHCP_SUPPORT_BOTH, DHCP_SUPPORT_V4)) { assert(link->dhcp_client); log_debug_link(link, "acquiring DHCPv4 lease"); @@ -1245,6 +1536,18 @@ static int link_acquire_conf(Link *link) { } } + 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 (r < 0) { + log_warning_link(link, "could not start IPv6 router discovery"); + return r; + } + } + return 0; } @@ -1369,15 +1672,13 @@ static int link_update_flags(Link *link, sd_rtnl_message *m) { } static int link_up_handler(sd_rtnl *rtnl, sd_rtnl_message *m, void *userdata) { - Link *link = userdata; + _cleanup_link_unref_ Link *link = userdata; int r; assert(link); - if (IN_SET(link->state, LINK_STATE_FAILED, LINK_STATE_LINGER)) { - link_unref(link); + if (IN_SET(link->state, LINK_STATE_FAILED, LINK_STATE_LINGER)) return 1; - } r = sd_rtnl_message_get_errno(m); if (r < 0) { @@ -1391,8 +1692,6 @@ static int link_up_handler(sd_rtnl *rtnl, sd_rtnl_message *m, void *userdata) { NULL); } - link_unref(link); - return 1; } @@ -1431,13 +1730,15 @@ 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, "joined netdev"); + if (!(link->flags & IFF_UP)) { r = link_up(link); if (r < 0) { @@ -1446,14 +1747,11 @@ static int link_enslaved(Link *link) { } } - if (!link->network->dhcp && !link->network->ipv4ll) - return link_enter_set_addresses(link); - - return 0; + return link_enter_set_addresses(link); } -static int enslave_handler(sd_rtnl *rtnl, sd_rtnl_message *m, void *userdata) { - Link *link = 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); @@ -1463,35 +1761,28 @@ static int enslave_handler(sd_rtnl *rtnl, sd_rtnl_message *m, void *userdata) { link->enslaving --; - if (IN_SET(link->state, LINK_STATE_FAILED, LINK_STATE_LINGER)) { - link_unref(link); + if (IN_SET(link->state, LINK_STATE_FAILED, LINK_STATE_LINGER)) return 1; - } r = sd_rtnl_message_get_errno(m); - if (r < 0) { + if (r < 0 && r != -EEXIST) { log_struct_link(LOG_ERR, link, - "MESSAGE=%-*s: could not enslave: %s", + "MESSAGE=%-*s: could not join netdev: %s", IFNAMSIZ, link->ifname, strerror(-r), "ERRNO=%d", -r, NULL); link_enter_failed(link); - link_unref(link); return 1; } - log_debug_link(link, "enslaved"); - - if (link->enslaving == 0) - link_enslaved(link); - - link_unref(link); + if (link->enslaving <= 0) + link_joined(link); return 1; } -static int link_enter_enslave(Link *link) { +static int link_enter_join_netdev(Link *link) { NetDev *vlan, *macvlan, *vxlan; Iterator i; int r; @@ -1510,7 +1801,7 @@ static int link_enter_enslave(Link *link) { hashmap_isempty(link->network->vlans) && hashmap_isempty(link->network->macvlans) && hashmap_isempty(link->network->vxlans)) - return link_enslaved(link); + return link_joined(link); if (link->network->bond) { log_struct_link(LOG_DEBUG, link, @@ -1520,10 +1811,10 @@ static int link_enter_enslave(Link *link) { NETDEV(link->network->bond), NULL); - r = netdev_enslave(link->network->bond, 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", + "MESSAGE=%-*s: could not join netdev '%s': %s", IFNAMSIZ, link->ifname, link->network->bond->ifname, strerror(-r), NETDEV(link->network->bond), @@ -1532,7 +1823,6 @@ static int link_enter_enslave(Link *link) { return r; } - link_ref(link); link->enslaving ++; } @@ -1544,10 +1834,10 @@ static int link_enter_enslave(Link *link) { NETDEV(link->network->bridge), NULL); - r = netdev_enslave(link->network->bridge, 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", + "MESSAGE=%-*s: could not join netdev '%s': %s", IFNAMSIZ, link->ifname, link->network->bridge->ifname, strerror(-r), NETDEV(link->network->bridge), @@ -1556,7 +1846,6 @@ static int link_enter_enslave(Link *link) { return r; } - link_ref(link); link->enslaving ++; } @@ -1568,10 +1857,10 @@ static int link_enter_enslave(Link *link) { NETDEV(link->network->tunnel), NULL); - r = netdev_enslave(link->network->tunnel, link, &enslave_handler); + r = netdev_join(link->network->tunnel, link, &netdev_join_handler); if (r < 0) { log_struct_link(LOG_WARNING, link, - "MESSAGE=%-*s: could not enslave by '%s': %s", + "MESSAGE=%-*s: could not join netdev '%s': %s", IFNAMSIZ, link->ifname, link->network->tunnel->ifname, strerror(-r), NETDEV(link->network->tunnel), @@ -1580,7 +1869,6 @@ static int link_enter_enslave(Link *link) { return r; } - link_ref(link); link->enslaving ++; } @@ -1590,10 +1878,10 @@ static int link_enter_enslave(Link *link) { IFNAMSIZ, link->ifname, vlan->ifname, NETDEV(vlan), NULL); - r = netdev_enslave(vlan, link, &enslave_handler); + r = netdev_join(vlan, link, &netdev_join_handler); if (r < 0) { log_struct_link(LOG_WARNING, link, - "MESSAGE=%-*s: could not enslave by '%s': %s", + "MESSAGE=%-*s: could not join netdev '%s': %s", IFNAMSIZ, link->ifname, vlan->ifname, strerror(-r), NETDEV(vlan), NULL); @@ -1601,7 +1889,6 @@ static int link_enter_enslave(Link *link) { return r; } - link_ref(link); link->enslaving ++; } @@ -1611,10 +1898,10 @@ static int link_enter_enslave(Link *link) { IFNAMSIZ, link->ifname, macvlan->ifname, NETDEV(macvlan), NULL); - r = netdev_enslave(macvlan, link, &enslave_handler); + r = netdev_join(macvlan, link, &netdev_join_handler); if (r < 0) { log_struct_link(LOG_WARNING, link, - "MESSAGE=%-*s: could not enslave by '%s': %s", + "MESSAGE=%-*s: could not join netdev '%s': %s", IFNAMSIZ, link->ifname, macvlan->ifname, strerror(-r), NETDEV(macvlan), NULL); @@ -1622,7 +1909,6 @@ static int link_enter_enslave(Link *link) { return r; } - link_ref(link); link->enslaving ++; } @@ -1632,10 +1918,10 @@ static int link_enter_enslave(Link *link) { IFNAMSIZ, link->ifname, vxlan->ifname, NETDEV(vxlan), NULL); - r = netdev_enslave(vxlan, link, &enslave_handler); + r = netdev_join(vxlan, link, &netdev_join_handler); if (r < 0) { log_struct_link(LOG_WARNING, link, - "MESSAGE=%*s: could not enslave by '%s': %s", + "MESSAGE=%*s: could not join netdev '%s': %s", IFNAMSIZ, link->ifname, vxlan->ifname, strerror(-r), NETDEV(vxlan), NULL); @@ -1643,7 +1929,6 @@ static int link_enter_enslave(Link *link) { return r; } - link_ref(link); link->enslaving ++; } @@ -1689,7 +1974,7 @@ static int link_configure(Link *link) { return r; } - if (link->network->dhcp) { + 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; @@ -1710,16 +1995,46 @@ static int link_configure(Link *link) { if (r < 0) return r; + r = sd_dhcp_client_set_request_broadcast(link->dhcp_client, link->network->dhcp_broadcast); + 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_vendor_class_identifier) { + r = sd_dhcp_client_set_vendor_class_identifier(link->dhcp_client, + link->network->dhcp_vendor_class_identifier); + if (r < 0) + return r; + } } if (link->network->dhcp_server) { - Address *address; - r = sd_dhcp_server_new(&link->dhcp_server, link->ifindex); if (r < 0) return r; @@ -1727,54 +2042,45 @@ static int link_configure(Link *link) { r = sd_dhcp_server_attach_event(link->dhcp_server, NULL, 0); if (r < 0) return r; + } - LIST_FOREACH(addresses, address, - link->network->static_addresses) { - struct in_addr pool_start; - - if (address->family != AF_INET) - continue; - - /* currently this is picked essentially at random */ - r = sd_dhcp_server_set_address(link->dhcp_server, - &address->in_addr.in); - if (r < 0) - 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; - /* 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; + r = sd_icmp6_nd_attach_event(link->icmp6_router_discovery, + NULL, 0); + if (r < 0) + return r; - break; - } + r = sd_icmp6_nd_set_mac(link->icmp6_router_discovery, + &link->mac); + if (r < 0) + return r; - /* TODO: - r = sd_dhcp_server_set_router(link->dhcp_server, - &main_address->in_addr.in); + r = sd_icmp6_nd_set_index(link->icmp6_router_discovery, + link->ifindex); if (r < 0) return r; - r = sd_dhcp_server_set_prefixlen(link->dhcp_server, - main_address->prefixlen); + r = sd_icmp6_nd_set_callback(link->icmp6_router_discovery, + icmp6_router_handler, link); if (r < 0) return r; - */ } - if (link_has_carrier(link->flags, link->operstate)) { + if (link_has_carrier(link->flags, link->kernel_operstate)) { r = link_acquire_conf(link); if (r < 0) return r; } - 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) { - Link *link = userdata; + _cleanup_link_unref_ Link *link = userdata; Network *network; int r; @@ -1783,14 +2089,14 @@ static int link_initialized_and_synced(sd_rtnl *rtnl, sd_rtnl_message *m, void * assert(link->manager); if (link->state != LINK_STATE_INITIALIZING) - return 0; + return 1; log_debug_link(link, "link state is up-to-date"); r = network_get(link->manager, link->udev_device, link->ifname, &link->mac, &network); if (r == -ENOENT) { link_enter_unmanaged(link); - return 0; + return 1; } else if (r < 0) return r; @@ -1802,7 +2108,7 @@ static int link_initialized_and_synced(sd_rtnl *rtnl, sd_rtnl_message *m, void * if (r < 0) return r; - return 0; + return 1; } int link_initialized(Link *link, struct udev_device *device) { @@ -1817,6 +2123,9 @@ int link_initialized(Link *link, struct udev_device *device) { if (link->state != LINK_STATE_INITIALIZING) return 0; + if (link->udev_device) + return 0; + log_debug_link(link, "udev initialized link"); link->udev_device = udev_device_ref(device); @@ -1834,6 +2143,8 @@ int link_initialized(Link *link, struct udev_device *device) { if (r < 0) return r; + link_ref(link); + return 0; } @@ -1871,7 +2182,7 @@ int link_rtnl_process_address(sd_rtnl *rtnl, sd_rtnl_message *message, void *use r = address_new_dynamic(&address); if (r < 0) - return 0; + return r; r = sd_rtnl_message_addr_get_family(message, &address->family); if (r < 0 || !IN_SET(address->family, AF_INET, AF_INET6)) { @@ -1935,7 +2246,10 @@ int link_rtnl_process_address(sd_rtnl *rtnl, sd_rtnl_message *message, void *use case RTM_NEWADDR: if (!address_dropped) log_debug_link(link, "added address: %s/%u", buf, - address->prefixlen); + address->prefixlen); + else + log_debug_link(link, "updated address: %s/%u", buf, + address->prefixlen); LIST_PREPEND(addresses, link->addresses, address); address = NULL; @@ -1946,10 +2260,12 @@ int link_rtnl_process_address(sd_rtnl *rtnl, sd_rtnl_message *message, void *use case RTM_DELADDR: if (address_dropped) { log_debug_link(link, "removed address: %s/%u", buf, - address->prefixlen); + address->prefixlen); link_save(link); - } + } else + log_warning_link(link, "removing non-existent address: %s/%u", + buf, address->prefixlen); break; default: @@ -1959,29 +2275,6 @@ 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) { - Link *link = userdata; - int r; - - assert(rtnl); - assert(m); - assert(link); - - 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; @@ -2010,6 +2303,8 @@ int link_add(Manager *m, sd_rtnl_message *message, Link **ret) { if (r < 0) return r; + link_ref(link); + if (detect_container(NULL) <= 0) { /* not in a container, udev will be around */ sprintf(ifindex_str, "n%"PRIu64, link->ifindex); @@ -2029,6 +2324,9 @@ int link_add(Manager *m, sd_rtnl_message *message, Link **ret) { if (r < 0) return r; } else { + /* we are calling a callback directly, so must take a ref */ + link_ref(link); + r = link_initialized_and_synced(m->rtnl, NULL, link); if (r < 0) return r; @@ -2039,7 +2337,7 @@ int link_add(Manager *m, sd_rtnl_message *message, Link **ret) { int link_update(Link *link, sd_rtnl_message *m) { struct ether_addr mac; - char *ifname; + const char *ifname; int r; assert(link); @@ -2105,6 +2403,16 @@ int link_update(Link *link, sd_rtnl_message *m) { return r; } } + + if (link->dhcp6_client) { + r = sd_dhcp6_client_set_mac(link->dhcp6_client, + &link->mac); + if (r < 0) { + log_warning_link(link, "Could not update MAC address in DHCPv6 client: %s", + strerror(-r)); + return r; + } + } } } @@ -2198,9 +2506,8 @@ int link_save(Link *link) { 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); @@ -2261,3 +2568,55 @@ 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; +}