From 8b5e4211304aaa5d39bc95f04398bd5ecaa887d8 Mon Sep 17 00:00:00 2001 From: Guus Sliepen Date: Tue, 28 Aug 2001 20:52:39 +0000 Subject: [PATCH] Fix signed comparison bug in lookup_subnet_ipv4(). --- src/subnet.c | 20 +++++++++++++++++--- 1 file changed, 17 insertions(+), 3 deletions(-) diff --git a/src/subnet.c b/src/subnet.c index ade47657..cb9cbb75 100644 --- a/src/subnet.c +++ b/src/subnet.c @@ -17,7 +17,7 @@ along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - $Id: subnet.c,v 1.1.2.23 2001/06/29 13:09:55 guus Exp $ + $Id: subnet.c,v 1.1.2.24 2001/08/28 20:52:39 guus Exp $ */ #include "config.h" @@ -61,9 +61,23 @@ cp /* We compare as if a subnet is a number that equals (address << 32 + netmask). */ if(a->net.ipv4.address == b->net.ipv4.address) - return a->net.ipv4.mask - b->net.ipv4.mask; + { + if(a->net.ipv4.mask < b->net.ipv4.mask) + return -1; + else if(a->net.ipv4.mask > b->net.ipv4.mask) + return 1; + else + return 0; + } else - return a->net.ipv4.address - b->net.ipv4.address; + { + if(a->net.ipv4.address < b->net.ipv4.address) + return -1; + else if(a->net.ipv4.address > b->net.ipv4.address) + return 1; + else + return 0; + } } int subnet_compare_ipv6(subnet_t *a, subnet_t *b) -- 2.20.1