]> git.ipfire.org Git - thirdparty/systemd.git/commitdiff
network: disable link local addressing on ipip, gre, sit, and vti netdevs
authorYu Watanabe <watanabe.yu+github@gmail.com>
Sun, 12 May 2019 21:51:54 +0000 (06:51 +0900)
committerYu Watanabe <watanabe.yu+github@gmail.com>
Wed, 15 May 2019 20:53:41 +0000 (05:53 +0900)
Closes #12547.

src/network/networkd-link.c

index 2398ef79366f00760af3dd841e744506e945d0a8..f8ee48802cb4edc082e583fb82c66271d69c4a77 100644 (file)
@@ -121,7 +121,7 @@ bool link_ipv4ll_enabled(Link *link) {
         if (!link->network)
                 return false;
 
-        if (STRPTR_IN_SET(link->kind, "vrf", "wireguard"))
+        if (STRPTR_IN_SET(link->kind, "vrf", "wireguard", "ipip", "gre", "ip6gre", "ip6tnl", "sit", "vti", "vti6"))
                 return false;
 
         if (link->network->bond)
@@ -139,7 +139,7 @@ bool link_ipv4ll_fallback_enabled(Link *link) {
         if (!link->network)
                 return false;
 
-        if (STRPTR_IN_SET(link->kind, "vrf", "wireguard"))
+        if (STRPTR_IN_SET(link->kind, "vrf", "wireguard", "ipip", "gre", "ip6gre", "ip6tnl", "sit", "vti", "vti6"))
                 return false;
 
         if (link->network->bond)
@@ -160,7 +160,7 @@ static bool link_ipv6ll_enabled(Link *link) {
         if (!link->network)
                 return false;
 
-        if (STRPTR_IN_SET(link->kind, "vrf", "wireguard"))
+        if (STRPTR_IN_SET(link->kind, "vrf", "wireguard", "ipip", "gre", "sit", "vti"))
                 return false;
 
         if (link->network->bond)