]> git.ipfire.org Git - location/libloc.git/commitdiff
addresses: Use loc_address_family which is now available
authorMichael Tremer <michael.tremer@ipfire.org>
Mon, 7 Mar 2022 11:55:59 +0000 (11:55 +0000)
committerMichael Tremer <michael.tremer@ipfire.org>
Mon, 7 Mar 2022 11:55:59 +0000 (11:55 +0000)
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
src/libloc/address.h

index f40a4f4cc624407cd809a2e99a682cdd56ceed4f..d8880ded40133d8b798ebca65b3e486e5ac9b103 100644 (file)
@@ -200,9 +200,8 @@ static inline int __loc_address4_sub(struct in6_addr* result,
 
 static inline int loc_address_sub(struct in6_addr* result,
                const struct in6_addr* address1, const struct in6_addr* address2) {
-       // XXX should be using loc_address_family
-       int family1 = IN6_IS_ADDR_V4MAPPED(address1) ? AF_INET : AF_INET6;
-       int family2 = IN6_IS_ADDR_V4MAPPED(address2) ? AF_INET : AF_INET6;
+       int family1 = loc_address_family(address1);
+       int family2 = loc_address_family(address2);
 
        // Address family must match
        if (family1 != family2) {