From 5c97932f09ede1bac54ffb30c8bfe0d205957dc2 Mon Sep 17 00:00:00 2001 From: Yu Watanabe Date: Thu, 6 May 2021 16:11:33 +0900 Subject: [PATCH] network: use in6_addr_is_link_local() or friends --- src/network/networkd-address.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/network/networkd-address.c b/src/network/networkd-address.c index 724b0f95d3..03e33ca644 100644 --- a/src/network/networkd-address.c +++ b/src/network/networkd-address.c @@ -150,7 +150,7 @@ static bool address_may_have_broadcast(const Address *a) { * See https://tools.ietf.org/html/rfc3021 */ return a->family == AF_INET && - in_addr_is_null(AF_INET, &a->in_addr_peer) && + in4_addr_is_null(&a->in_addr_peer.in) && a->prefixlen <= 30; } @@ -406,7 +406,7 @@ static int address_update(Address *address, const Address *src) { } if (address->family == AF_INET6 && - in_addr_is_link_local(AF_INET6, &address->in_addr) > 0 && + in6_addr_is_link_local(&address->in_addr.in6) > 0 && in6_addr_is_null(&address->link->ipv6ll_address)) { r = link_ipv6ll_gained(address->link, &address->in_addr.in6); @@ -706,7 +706,7 @@ int link_drop_foreign_addresses(Link *link) { SET_FOREACH(address, link->addresses_foreign) { /* we consider IPv6LL addresses to be managed by the kernel */ - if (address->family == AF_INET6 && in_addr_is_link_local(AF_INET6, &address->in_addr) == 1 && link_ipv6ll_enabled(link)) + if (address->family == AF_INET6 && in6_addr_is_link_local(&address->in_addr.in6) == 1 && link_ipv6ll_enabled(link)) continue; if (link_address_is_dynamic(link, address)) { @@ -769,7 +769,7 @@ int link_drop_addresses(Link *link) { SET_FOREACH(address, link->addresses) { /* we consider IPv6LL addresses to be managed by the kernel */ - if (address->family == AF_INET6 && in_addr_is_link_local(AF_INET6, &address->in_addr) == 1 && link_ipv6ll_enabled(link)) + if (address->family == AF_INET6 && in6_addr_is_link_local(&address->in_addr.in6) == 1 && link_ipv6ll_enabled(link)) continue; k = address_remove(address, link, remove_static_address_handler); -- 2.25.1