projects
/
tinc
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix subnet_lookup() for overlapping subnets. Needs rethinking.
[tinc]
/
src
/
subnet.c
diff --git
a/src/subnet.c
b/src/subnet.c
index
574e7a0
..
51b1cd7
100644
(file)
--- a/
src/subnet.c
+++ b/
src/subnet.c
@@
-1,7
+1,7
@@
/*
subnet.c -- handle subnet lookups and lists
/*
subnet.c -- handle subnet lookups and lists
- Copyright (C) 2000 Guus Sliepen <guus@sliepen.warande.net>,
- 2000 Ivo Timmermans <itimmermans@bigfoot.com>
+ Copyright (C) 2000
,2001
Guus Sliepen <guus@sliepen.warande.net>,
+ 2000
,2001
Ivo Timmermans <itimmermans@bigfoot.com>
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@
-17,7
+17,7
@@
along with this program; if not, write to the Free Software
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
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.1
5 2000/11/24 23:13:06
guus Exp $
+ $Id: subnet.c,v 1.1.2.1
9 2001/06/01 08:02:09
guus Exp $
*/
#include "config.h"
*/
#include "config.h"
@@
-33,16
+33,16
@@
#include <utils.h>
#include <xalloc.h>
#include <utils.h>
#include <xalloc.h>
-#include <
rbl
.h>
+#include <
avl_tree
.h>
/* lists type of subnet */
/* lists type of subnet */
-
rbl
tree_t *subnet_tree;
+
avl_
tree_t *subnet_tree;
void init_subnets(void)
{
cp
void init_subnets(void)
{
cp
- subnet_tree =
new_rbltree((rbl_compare_t)subnet_compare, (rb
l_action_t)free_subnet);
+ subnet_tree =
avl_alloc_tree((avl_compare_t)subnet_compare, (av
l_action_t)free_subnet);
cp
}
cp
}
@@
-57,16
+57,12
@@
cp
int subnet_compare_ipv4(subnet_t *a, subnet_t *b)
{
cp
int subnet_compare_ipv4(subnet_t *a, subnet_t *b)
{
cp
- /* If the subnet of a falls within the range of subnet b,
- then we consider a smaller then b.
- Otherwise, the addresses alone (and not the subnet masks) will be compared.
- */
+ /* We compare as if a subnet is a number that equals (address << 32 + netmask). */
- if(a->net.ipv4.mask > b->net.ipv4.mask)
- if((a->net.ipv4.address & b->net.ipv4.mask) == b->net.ipv4.address)
- return -1;
-
- return a->net.ipv4.address - b->net.ipv4.address;
+ if(a->net.ipv4.address == b->net.ipv4.address)
+ return a->net.ipv4.mask - b->net.ipv4.mask;
+ else
+ 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)
@@
-131,17
+127,17
@@
void subnet_add(connection_t *cl, subnet_t *subnet)
{
cp
subnet->owner = cl;
{
cp
subnet->owner = cl;
-
rb
l_insert(subnet_tree, subnet);
-
rb
l_insert(cl->subnet_tree, subnet);
+
av
l_insert(subnet_tree, subnet);
+
av
l_insert(cl->subnet_tree, subnet);
cp
}
void subnet_del(subnet_t *subnet)
{
cp
cp
}
void subnet_del(subnet_t *subnet)
{
cp
-
rb
l_delete(subnet->owner->subnet_tree, subnet);
+
av
l_delete(subnet->owner->subnet_tree, subnet);
cp
cp
-
rb
l_delete(subnet_tree, subnet);
+
av
l_delete(subnet_tree, subnet);
cp
}
cp
}
@@
-256,62
+252,80
@@
cp
/* Subnet lookup routines */
/* Subnet lookup routines */
-subnet_t *lookup_subnet_mac(mac_t address)
+subnet_t *lookup_subnet_mac(mac_t
*
address)
{
subnet_t subnet, *p;
cp
subnet.type = SUBNET_MAC;
{
subnet_t subnet, *p;
cp
subnet.type = SUBNET_MAC;
-
subnet.net.mac.address = address
;
+
memcpy(&subnet.net.mac.address, address, sizeof(mac_t))
;
- p = (subnet_t *)
rbl_search_closest
(subnet_tree, &subnet);
+ p = (subnet_t *)
avl_search
(subnet_tree, &subnet);
cp
cp
- if(p && !memcmp(&address, &p->net.mac.address, sizeof(mac_t)))
- return p;
- else
- return NULL;
+ return p;
}
}
-subnet_t *lookup_subnet_ipv4(ipv4_t address)
+subnet_t *lookup_subnet_ipv4(ipv4_t
*
address)
{
subnet_t subnet, *p;
cp
subnet.type = SUBNET_IPV4;
{
subnet_t subnet, *p;
cp
subnet.type = SUBNET_IPV4;
- subnet.net.ipv4.address = address;
+ subnet.net.ipv4.address =
*
address;
subnet.net.ipv4.mask = 0xFFFFFFFF;
subnet.net.ipv4.mask = 0xFFFFFFFF;
- p = (subnet_t *)rbl_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 */
cp
/* Check if the found subnet REALLY matches */
cp
- if(p && ((address & p->net.ipv4.mask) == p->net.ipv4.address))
- return p;
- else
- return NULL;
+ if(p)
+ {
+ if ((*address & p->net.ipv4.mask) == p->net.ipv4.address)
+ 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)
{
{
- subnet_t subnet;
+ subnet_t subnet, *p;
+ int i;
cp
subnet.type = SUBNET_IPV6;
cp
subnet.type = SUBNET_IPV6;
-
subnet.net.ipv6.address = address
;
+
memcpy(&subnet.net.ipv6.address, address, sizeof(ipv6_t))
;
memset(&subnet.net.ipv6.mask, 0xFF, 16);
memset(&subnet.net.ipv6.mask, 0xFF, 16);
-/* FIXME: check if it REALLY matches */
+ p = (subnet_t *)avl_search_closest_greater(subnet_tree, &subnet);
+
+ if(p)
+ for(i=0; i<8; i++)
+ if((address->x[i] & p->net.ipv6.address.x[i]) != p->net.ipv6.address.x[i])
+ return NULL;
- return
(subnet_t *)rbl_search_closest(subnet_tree, &subnet)
;
+ return
p
;
}
void dump_subnet_list(void)
{
char *netstr;
subnet_t *subnet;
}
void dump_subnet_list(void)
{
char *netstr;
subnet_t *subnet;
-
rbl_t *rbl
;
+
avl_node_t *node
;
cp
syslog(LOG_DEBUG, _("Subnet list:"));
cp
syslog(LOG_DEBUG, _("Subnet list:"));
-
RBL_FOREACH(subnet_tree, rbl
)
+
for(node = subnet_tree->head; node; node = node->next
)
{
{
- subnet = (subnet_t *)
rbl
->data;
+ subnet = (subnet_t *)
node
->data;
netstr = net2str(subnet);
syslog(LOG_DEBUG, " %s owner %s", netstr, subnet->owner->name);
free(netstr);
netstr = net2str(subnet);
syslog(LOG_DEBUG, " %s owner %s", netstr, subnet->owner->name);
free(netstr);