]> git.ipfire.org Git - thirdparty/systemd.git/commitdiff
network: wireguard: allow to run NDisc and RADV when IPv6LL address is manually confi... 21692/head
authorYu Watanabe <watanabe.yu+github@gmail.com>
Thu, 9 Dec 2021 06:43:57 +0000 (15:43 +0900)
committerYu Watanabe <watanabe.yu+github@gmail.com>
Thu, 9 Dec 2021 06:57:47 +0000 (15:57 +0900)
Fixes #17380.

src/network/networkd-address.c
src/network/networkd-link.c
src/network/networkd-link.h
src/network/networkd-ndisc.c
src/network/networkd-radv.c

index 3712671272508694729cbae9327d4932afb5822e..7cd4d27c074df9fac75046126b9f1f9792a9516f 100644 (file)
@@ -752,7 +752,7 @@ int link_drop_ipv6ll_addresses(Link *link) {
         /* IPv6LL address may be in the tentative state, and in that case networkd has not received it.
          * So, we need to dump all IPv6 addresses. */
 
-        if (link_ipv6ll_enabled(link))
+        if (link_may_have_ipv6ll(link))
                 return 0;
 
         r = sd_rtnl_message_new_addr(link->manager->rtnl, &req, RTM_GETADDR, link->ifindex, AF_INET6);
index 9a2061baec7045cf62b4a650ae961013a55970e1..956e2984bc85a1e4e3aa638262ade48a9dee88e2 100644 (file)
@@ -126,6 +126,43 @@ bool link_ipv6ll_enabled(Link *link) {
         return link->network->link_local & ADDRESS_FAMILY_IPV6;
 }
 
+bool link_may_have_ipv6ll(Link *link) {
+        assert(link);
+
+        /*
+         * This is equivalent to link_ipv6ll_enabled() for non-WireGuard interfaces.
+         *
+         * For WireGuard interface, the kernel does not assign any IPv6LL addresses, but we can assign
+         * it manually. It is necessary to set an IPv6LL address manually to run NDisc or RADV on
+         * WireGuard interface. Note, also Multicast=yes must be set. See #17380.
+         *
+         * TODO: May be better to introduce GenerateIPv6LinkLocalAddress= setting, and use algorithms
+         *       used in networkd-address-generation.c
+         */
+
+        if (link_ipv6ll_enabled(link))
+                return true;
+
+        /* IPv6LL address can be manually assigned on WireGuard interface. */
+        if (streq_ptr(link->kind, "wireguard")) {
+                Address *a;
+
+                if (!link->network)
+                        return false;
+
+                ORDERED_HASHMAP_FOREACH(a, link->network->addresses_by_section) {
+                        if (a->family != AF_INET6)
+                                continue;
+                        if (in6_addr_is_set(&a->in_addr_peer.in6))
+                                continue;
+                        if (in6_addr_is_link_local(&a->in_addr.in6))
+                                return true;
+                }
+        }
+
+        return false;
+}
+
 bool link_ipv6_enabled(Link *link) {
         assert(link);
 
index 5895240674dbd6b6177810d7914f769e64b072a3..4ef86f485bc7ef6ceecd610b64333d4c055509f0 100644 (file)
@@ -215,6 +215,7 @@ bool link_has_carrier(Link *link);
 
 bool link_ipv6_enabled(Link *link);
 bool link_ipv6ll_enabled(Link *link);
+bool link_may_have_ipv6ll(Link *link);
 int link_ipv6ll_gained(Link *link);
 
 bool link_ipv4ll_enabled(Link *link);
index df5e580aeffbbe5590843a9656dbdab0e954776f..32cb536ee5e9d545795fad782a13b146b09b63ca 100644 (file)
@@ -37,7 +37,7 @@ bool link_ipv6_accept_ra_enabled(Link *link) {
         if (!link->network)
                 return false;
 
-        if (!link_ipv6ll_enabled(link))
+        if (!link_may_have_ipv6ll(link))
                 return false;
 
         assert(link->network->ipv6_accept_ra >= 0);
index 6fabd8f5c554c60be70caa4759711af169c24201..59b0922a4c4e4a169bcce0f907d27cf7509e334c 100644 (file)
@@ -54,7 +54,7 @@ void network_adjust_radv(Network *network) {
 bool link_radv_enabled(Link *link) {
         assert(link);
 
-        if (!link_ipv6ll_enabled(link))
+        if (!link_may_have_ipv6ll(link))
                 return false;
 
         return link->network->router_prefix_delegation;