From badd49288d54d33d1c89eec51a40dc3a774741c1 Mon Sep 17 00:00:00 2001 From: Yu Watanabe Date: Fri, 14 Aug 2020 17:44:02 +0900 Subject: [PATCH] util: expose in6_addr_{hash,compare}_func() --- src/basic/in-addr-util.c | 4 ++-- src/basic/in-addr-util.h | 3 +++ 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/src/basic/in-addr-util.c b/src/basic/in-addr-util.c index f0ce6900ef1..8783ab3c9b0 100644 --- a/src/basic/in-addr-util.c +++ b/src/basic/in-addr-util.c @@ -755,13 +755,13 @@ static int in_addr_data_compare_func(const struct in_addr_data *x, const struct DEFINE_HASH_OPS(in_addr_data_hash_ops, struct in_addr_data, in_addr_data_hash_func, in_addr_data_compare_func); -static void in6_addr_hash_func(const struct in6_addr *addr, struct siphash *state) { +void in6_addr_hash_func(const struct in6_addr *addr, struct siphash *state) { assert(addr); siphash24_compress(addr, sizeof(*addr), state); } -static int in6_addr_compare_func(const struct in6_addr *a, const struct in6_addr *b) { +int in6_addr_compare_func(const struct in6_addr *a, const struct in6_addr *b) { return memcmp(a, b, sizeof(*a)); } diff --git a/src/basic/in-addr-util.h b/src/basic/in-addr-util.h index 6ce0bef5781..e5df2a8058b 100644 --- a/src/basic/in-addr-util.h +++ b/src/basic/in-addr-util.h @@ -80,5 +80,8 @@ static inline size_t FAMILY_ADDRESS_SIZE(int family) { * See also oss-fuzz#11344. */ #define IN_ADDR_NULL ((union in_addr_union) { .in6 = {} }) +void in6_addr_hash_func(const struct in6_addr *addr, struct siphash *state); +int in6_addr_compare_func(const struct in6_addr *a, const struct in6_addr *b); + extern const struct hash_ops in_addr_data_hash_ops; extern const struct hash_ops in6_addr_hash_ops; -- 2.47.3