From 23577246994748b8dcb37dec7832e0aca88fa29d Mon Sep 17 00:00:00 2001 From: Yu Watanabe Date: Wed, 1 Aug 2018 01:18:57 +0900 Subject: [PATCH] basic: use FAMILY_ADDRESS_SIZE() macro in hash_ops for in_addr_data --- src/basic/in-addr-util.c | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) diff --git a/src/basic/in-addr-util.c b/src/basic/in-addr-util.c index b9d3572baf..a21aa149f5 100644 --- a/src/basic/in-addr-util.c +++ b/src/basic/in-addr-util.c @@ -576,11 +576,7 @@ void in_addr_data_hash_func(const void *p, struct siphash *state) { const struct in_addr_data *a = p; siphash24_compress(&a->family, sizeof(a->family), state); - - if (a->family == AF_INET) - siphash24_compress(&a->address.in, sizeof(a->address.in), state); - else if (a->family == AF_INET6) - siphash24_compress(&a->address.in6, sizeof(a->address.in6), state); + siphash24_compress(&a->address, FAMILY_ADDRESS_SIZE(a->family), state); } int in_addr_data_compare_func(const void *a, const void *b) { @@ -589,13 +585,7 @@ int in_addr_data_compare_func(const void *a, const void *b) { if (x->family != y->family) return x->family - y->family; - if (x->family == AF_INET) - return memcmp(&x->address.in.s_addr, &y->address.in.s_addr, sizeof(struct in_addr)); - - if (x->family == AF_INET6) - return memcmp(&x->address.in6.s6_addr, &y->address.in6.s6_addr, sizeof(struct in6_addr)); - - return trivial_compare_func(a, b); + return memcmp(&x->address, &y->address, FAMILY_ADDRESS_SIZE(x->family)); } const struct hash_ops in_addr_data_hash_ops = {