From 90fcbffa798f86afddc2645803f113d937d94035 Mon Sep 17 00:00:00 2001 From: Vsevolod Stakhov Date: Thu, 12 Mar 2015 14:20:02 +0000 Subject: [PATCH] Use opaque inet_address. --- src/libutil/radix.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/src/libutil/radix.c b/src/libutil/radix.c index a7ef12375..17b73b6cc 100644 --- a/src/libutil/radix.c +++ b/src/libutil/radix.c @@ -870,17 +870,17 @@ radix_destroy_compressed (radix_compressed_t *tree) uintptr_t radix_find_compressed_addr (radix_compressed_t *tree, rspamd_inet_addr_t *addr) { + guchar *key; + guint klen = 0; + if (addr == NULL) { return RADIX_NO_VALUE; } - if (addr->af == AF_INET) { - return radix_find_compressed (tree, (guint8 *)&addr->addr.s4.sin_addr, - sizeof (addr->addr.s4.sin_addr)); - } - else if (addr->af == AF_INET6) { - return radix_find_compressed (tree, (guint8 *)&addr->addr.s6.sin6_addr, - sizeof (addr->addr.s6.sin6_addr)); + key = rspamd_inet_address_get_radix_key (addr, &klen); + + if (key && klen) { + return radix_find_compressed (tree, key, klen); } return RADIX_NO_VALUE; -- 2.39.5