j3d1/tinc
1
0
Fork 0
Code Issues 1 Pull requests Releases Wiki Activity

Fix subnet_lookup() for overlapping subnets. Needs rethinking.

Browse source
This commit is contained in:
Guus Sliepen 2001-06-01 08:02:09 +00:00
parent 7db1b999c8
commit 0a3c8cefd4
1 changed files with 26 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

41
src/subnet.c
View file

@ -17,7 +17,7 @@
along with this program; if not, write to the Free Software along with this program; if not, write to the Free Software
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
$Id: subnet.c,v 1.1.2.18 2001/01/07 20:19:08 guus Exp $ $Id: subnet.c,v 1.1.2.19 2001/06/01 08:02:09 guus Exp $
*/ */
#include "config.h" #include "config.h"
@ -57,16 +57,12 @@ cp
int subnet_compare_ipv4(subnet_t *a, subnet_t *b) int subnet_compare_ipv4(subnet_t *a, subnet_t *b)
{ {
cp cp
/* If the subnet of a falls within the range of subnet b, /* We compare as if a subnet is a number that equals (address << 32 + netmask). */
then we consider a smaller then b.
Otherwise, the addresses alone (and not the subnet masks) will be compared.
*/
if(a->net.ipv4.mask > b->net.ipv4.mask) if(a->net.ipv4.address == b->net.ipv4.address)
if((a->net.ipv4.address & b->net.ipv4.mask) == b->net.ipv4.address) return a->net.ipv4.mask - b->net.ipv4.mask;
return -1; else
return a->net.ipv4.address - b->net.ipv4.address;
return a->net.ipv4.address - b->net.ipv4.address;
} }
int subnet_compare_ipv6(subnet_t *a, subnet_t *b) int subnet_compare_ipv6(subnet_t *a, subnet_t *b)
@ -276,14 +272,29 @@ cp
subnet.net.ipv4.address = *address; subnet.net.ipv4.address = *address;
subnet.net.ipv4.mask = 0xFFFFFFFF; subnet.net.ipv4.mask = 0xFFFFFFFF;
p = (subnet_t *)avl_search_closest_greater(subnet_tree, &subnet); do
{
/* Go find subnet */
p = (subnet_t *)avl_search_closest_smaller(subnet_tree, &subnet);
/* Check if the found subnet REALLY matches */ /* Check if the found subnet REALLY matches */
cp cp
if(p && ((*address & p->net.ipv4.mask) == p->net.ipv4.address)) if(p)
return p; {
else if ((*address & p->net.ipv4.mask) == p->net.ipv4.address)
return NULL; break;
else
{
/* Otherwise, see if there is a bigger enclosing subnet */
subnet.net.ipv4.mask = p->net.ipv4.mask << 1;
subnet.net.ipv4.address &= subnet.net.ipv4.mask;
}
}
} while (p);
return p;
} }
subnet_t *lookup_subnet_ipv6(ipv6_t *address) subnet_t *lookup_subnet_ipv6(ipv6_t *address)