picnoir
/
Systemd
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

network: compare with peer address if it is specified 

Follow-ups for dfef713f3e.
This commit is contained in:
Yu Watanabe 2020-07-22 01:03:16 +09:00 committed by Zbigniew Jędrzejewski-Szmek
parent 01b92946c5
commit 6f5d73aba6
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/network/networkd-link.c
View File

@ -1297,7 +1297,10 @@ static int link_request_set_addresses(Link *link) {
LIST_FOREACH(addresses, ad, link->network->static_addresses) {
bool update;
update = address_get(link, ad->family, &ad->in_addr, ad->prefixlen, NULL) > 0;
if (ad->family == AF_INET6 && !in_addr_is_null(ad->family, &ad->in_addr_peer))
update = address_get(link, ad->family, &ad->in_addr_peer, ad->prefixlen, NULL) > 0;
else
update = address_get(link, ad->family, &ad->in_addr, ad->prefixlen, NULL) > 0;
r = address_configure(ad, link, address_handler, update);
if (r < 0)
@ -2603,6 +2606,9 @@ static bool link_is_static_address_configured(Link *link, Address *address) {
LIST_FOREACH(addresses, net_address, link->network->static_addresses)
if (address_equal(net_address, address))
return true;
else if (address->family == AF_INET6 && net_address->family == AF_INET6 &&
in_addr_equal(AF_INET6, &address->in_addr, &net_address->in_addr_peer) > 0)
return true;
return false;
}