Merge pull request #8006 from zx2c4-forks/jd/no-wg-ll

networkd: assume no link local addresses for where it isn't used
This commit is contained in:
Yu Watanabe 2018-01-27 17:31:02 +09:00 committed by GitHub
commit f359fb92da
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 1 deletions

2
NEWS
View file

@ -154,7 +154,7 @@ CHANGES WITH 237 in spe:
Ptashnick, Shawn Landden, Susant Sahani, Sylvain Plantefève, Thomas
Huth, Tomasz Bachorski, Vladislav Vishnyakov, Wieland Hoffmann, Yu
Watanabe, Zachary Winnerman, Zbigniew Jędrzejewski-Szmek, Дамјан
Георгиевски, Дилян Палаузов
Георгиевски, Дилян Палаузов, Jason A. Donenfeld
— Berlin, 2018-XX-XX

View file

@ -92,6 +92,9 @@ static bool link_ipv4ll_enabled(Link *link) {
if (!link->network)
return false;
if (streq_ptr(link->kind, "wireguard"))
return false;
return link->network->link_local & ADDRESS_FAMILY_IPV4;
}
@ -107,6 +110,9 @@ static bool link_ipv6ll_enabled(Link *link) {
if (!link->network)
return false;
if (streq_ptr(link->kind, "wireguard"))
return false;
return link->network->link_local & ADDRESS_FAMILY_IPV6;
}