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=5ab7aa7d19f7000b2329d5cbba8497581d37694e;hp=f496978cbae6e64744548f1d3dbc2300f61eac02;hb=4138fb2c7936758da709eaed3f6b4f3df1d04eff;hpb=4f561e8e4364e36345940d4376a9750a829f382f diff --git a/src/network/networkd-link.c b/src/network/networkd-link.c index f496978cb..5ab7aa7d1 100644 --- a/src/network/networkd-link.c +++ b/src/network/networkd-link.c @@ -112,6 +112,11 @@ static void link_free(Link *link) { 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); @@ -120,6 +125,8 @@ static void link_free(Link *link) { sd_ipv4ll_unref(link->ipv4ll); + sd_dhcp6_client_unref(link->dhcp6_client); + hashmap_remove(link->manager->links, &link->ifindex); free(link->ifname); @@ -228,6 +235,16 @@ static int link_stop_clients(Link *link) { } } + if (link->network->dhcp6) { + assert(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; + } + } + return r; } @@ -246,6 +263,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 +299,42 @@ static int link_enter_configured(Link *link) { assert(link->network); assert(link->state == LINK_STATE_SETTING_ROUTES); - if (link->network->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; + + /* 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 " @@ -1211,6 +1289,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; @@ -1245,6 +1421,18 @@ static int link_acquire_conf(Link *link) { } } + if (link->network->dhcp6) { + 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; } @@ -1492,7 +1680,7 @@ static int enslave_handler(sd_rtnl *rtnl, sd_rtnl_message *m, void *userdata) { } static int link_enter_enslave(Link *link) { - NetDev *vlan, *macvlan; + NetDev *vlan, *macvlan, *vxlan; Iterator i; int r; @@ -1508,7 +1696,8 @@ static int link_enter_enslave(Link *link) { !link->network->bond && !link->network->tunnel && hashmap_isempty(link->network->vlans) && - hashmap_isempty(link->network->macvlans)) + hashmap_isempty(link->network->macvlans) && + hashmap_isempty(link->network->vxlans)) return link_enslaved(link); if (link->network->bond) { @@ -1625,6 +1814,27 @@ 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'", + IFNAMSIZ, + link->ifname, vxlan->ifname, NETDEV(vxlan), NULL); + + r = netdev_enslave(vxlan, link, &enslave_handler); + if (r < 0) { + log_struct_link(LOG_WARNING, link, + "MESSAGE=%*s: could not enslave by '%s': %s", + IFNAMSIZ, + link->ifname, vxlan->ifname, strerror(-r), + NETDEV(vxlan), NULL); + link_enter_failed(link); + return r; + } + + link_ref(link); + link->enslaving ++; + } + return 0; } @@ -1696,8 +1906,6 @@ static int link_configure(Link *link) { } if (link->network->dhcp_server) { - Address *address; - r = sd_dhcp_server_new(&link->dhcp_server, link->ifindex); if (r < 0) return r; @@ -1705,44 +1913,35 @@ 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 (link->network->dhcp6) { + 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; @@ -2083,6 +2282,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; + } + } } }