/*
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
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.10 2000/11/04 11:49:58 guus Exp $
+ $Id: subnet.c,v 1.1.2.26 2001/10/27 13:13:35 guus Exp $
*/
#include "config.h"
#include <stdio.h>
#include <syslog.h>
+#include <string.h>
#include "conf.h"
#include "net.h"
+#include "node.h"
#include "subnet.h"
#include "system.h"
#include <utils.h>
#include <xalloc.h>
+#include <avl_tree.h>
/* lists type of subnet */
-subnet_t *subnet_list[SUBNET_TYPES] = { NULL };
+avl_tree_t *subnet_tree;
-/* Allocating and freeing space for subnets */
-
-subnet_t *new_subnet(void)
+void init_subnets(void)
{
cp
- return (subnet_t *)xmalloc(sizeof(subnet_t));
+ subnet_tree = avl_alloc_tree((avl_compare_t)subnet_compare, (avl_action_t)free_subnet);
+cp
}
-void free_subnet(subnet_t *subnet)
+/* Subnet comparison */
+
+int subnet_compare_mac(subnet_t *a, subnet_t *b)
{
+ int result;
cp
- free(subnet);
-}
+ result = memcmp(&a->net.mac.address, &b->net.mac.address, sizeof(mac_t));
+
+ if(result)
+ return result;
-/* Linked list management */
+ return strcmp(a->owner->name, b->owner->name);
+}
-void subnet_add(conn_list_t *cl, subnet_t *subnet)
+int subnet_compare_ipv4(subnet_t *a, subnet_t *b)
{
- subnet_t *p = NULL;
- subnet_t *q = NULL;
cp
- subnet->owner = cl;
-
- /* Link it into the owners list of subnets (unsorted) */
+ /* We compare as if a subnet is a number that equals (address << 32 + netmask). */
+
+ if(a->net.ipv4.address < b->net.ipv4.address)
+ return -1;
+ else if(a->net.ipv4.address > b->net.ipv4.address)
+ return 1;
+
+ if(a->net.ipv4.mask < b->net.ipv4.mask)
+ return -1;
+ else if(a->net.ipv4.mask > b->net.ipv4.mask)
+ return 1;
+
+ return strcmp(a->owner->name, b->owner->name);
+}
- subnet->next = cl->subnets;
- subnet->prev = NULL;
- if(subnet->next)
- subnet->next->prev = subnet;
- cl->subnets = subnet;
+int subnet_compare_ipv6(subnet_t *a, subnet_t *b)
+{
+ int result;
+cp
+ /* Same as ipv4 case, but with nasty 128 bit addresses */
+
+ result = memcmp(a->net.ipv6.address.x, b->net.ipv6.address.x, sizeof(ipv6_t));
- /* And now add it to the global subnet list (sorted) */
+ if(result)
+ return result;
- /* Sort on size of subnet mask (IPv4 only at the moment!)
+ result = memcmp(a->net.ipv6.mask.x, b->net.ipv6.mask.x, sizeof(ipv6_t));
- Three cases: subnet_list[] = NULL -> just add this subnet
- insert before first -> add it in front of list
- rest: insert after another subnet
- */
-cp
- if(subnet_list[subnet->type])
- {
- p = q = subnet_list[subnet->type];
+ if(result)
+ return result;
- for(; p; p = p->global_next)
- {
- if(subnet->net.ipv4.mask >= p->net.ipv4.mask)
- break;
+ return strcmp(a->owner->name, b->owner->name);
+}
- q = p;
- }
- }
+int subnet_compare(subnet_t *a, subnet_t *b)
+{
+ int x;
cp
- if(p == subnet_list[subnet->type]) /* First two cases */
+ x = a->type - b->type;
+ if(x)
+ return x;
+
+ switch(a->type)
{
- /* Insert in front */
- subnet->global_next = subnet_list[subnet->type];
- subnet->global_prev = NULL;
- subnet_list[subnet->type] = subnet;
- }
- else /* Third case */
- {
- /* Insert after q */
- subnet->global_next = q->global_next;
- subnet->global_prev = q;
- q->global_next = subnet;
+ case SUBNET_MAC:
+ return subnet_compare_mac(a, b);
+ case SUBNET_IPV4:
+ return subnet_compare_ipv4(a, b);
+ case SUBNET_IPV6:
+ return subnet_compare_ipv6(a, b);
+ default:
+ syslog(LOG_ERR, _("subnet_compare() was called with unknown subnet type %d, restarting!"), a->type);
+ sighup = 1;
+ return 0;
}
+}
+
+/* Allocating and freeing space for subnets */
+
+subnet_t *new_subnet(void)
+{
cp
- if(subnet->global_next)
- subnet->global_next->global_prev = subnet;
-cp
+ return (subnet_t *)xmalloc(sizeof(subnet_t));
}
-void subnet_del(subnet_t *subnet)
+void free_subnet(subnet_t *subnet)
{
cp
- /* Remove it from owner's list */
+ free(subnet);
+}
- if(subnet->prev)
- subnet->prev->next = subnet->next;
- else
- subnet->owner->subnets = subnet->next;
+/* Linked list management */
- if(subnet->next)
- subnet->next->prev = subnet->prev;
+void subnet_add(node_t *n, subnet_t *subnet)
+{
+cp
+ subnet->owner = n;
- /* Remove it from the global list */
-
- if(subnet->global_prev)
- subnet->global_prev->global_next = subnet->global_next;
- else
- subnet_list[subnet->type] = subnet->global_next;
+ avl_insert(subnet_tree, subnet);
+cp
+ avl_insert(n->subnet_tree, subnet);
+cp
+}
- if(subnet->global_next)
- subnet->global_next->global_prev = subnet->global_prev;
-
- free_subnet(subnet);
+void subnet_del(node_t *n, subnet_t *subnet)
+{
+cp
+ avl_delete(n->subnet_tree, subnet);
+cp
+ avl_delete(subnet_tree, subnet);
cp
}
subnet->net.ipv6.mask.x[7]);
break;
default:
- asprintf(&netstr, _("unknown"));
+ asprintf(&netstr, _("unknown subnet type"));
}
cp
return netstr;
/* Subnet lookup routines */
-subnet_t *lookup_subnet_mac(mac_t address)
+subnet_t *lookup_subnet(node_t *owner, subnet_t *subnet)
{
- subnet_t *subnet;
+cp
+ return avl_search(owner->subnet_tree, subnet);
+}
+
+subnet_t *lookup_subnet_mac(mac_t *address)
+{
+ subnet_t subnet, *p;
cp
- for(subnet = subnet_list[SUBNET_MAC]; subnet != NULL; subnet = subnet->global_next)
- {
- if(memcmp(&address, &subnet->net.mac.address, sizeof(address)) == 0)
- break;
- }
+ subnet.type = SUBNET_MAC;
+ memcpy(&subnet.net.mac.address, address, sizeof(mac_t));
+
+ p = (subnet_t *)avl_search(subnet_tree, &subnet);
cp
- return subnet;
+ return p;
}
-subnet_t *lookup_subnet_ipv4(ipv4_t address)
+subnet_t *lookup_subnet_ipv4(ipv4_t *address)
{
- subnet_t *subnet;
+ subnet_t subnet, *p;
cp
- for(subnet = subnet_list[SUBNET_IPV4]; subnet != NULL; subnet = subnet->global_next)
- {
- if((address & subnet->net.ipv4.mask) == subnet->net.ipv4.address)
- break;
- }
+ subnet.type = SUBNET_IPV4;
+ subnet.net.ipv4.address = *address;
+ subnet.net.ipv4.mask = 0xFFFFFFFF;
+
+ do
+ {
+ /* Go find subnet */
+
+ p = (subnet_t *)avl_search_closest_smaller(subnet_tree, &subnet);
+
+ /* Check if the found subnet REALLY matches */
cp
- return subnet;
+ 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 = p->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
- for(subnet = subnet_list[SUBNET_IPV6]; subnet != NULL; subnet = subnet->global_next)
- {
- for(i=0; i<8; i++)
- if((address.x[i] & subnet->net.ipv6.mask.x[i]) != subnet->net.ipv6.address.x[i])
- break;
- if(i == 8)
- break;
- }
-cp
- return subnet;
+ subnet.type = SUBNET_IPV6;
+ memcpy(&subnet.net.ipv6.address, address, sizeof(ipv6_t));
+ memset(&subnet.net.ipv6.mask, 0xFF, 16);
+
+ 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 p;
}
-void dump_subnet_list(void)
+void dump_subnets(void)
{
- subnet_t *subnet;
char *netstr;
+ subnet_t *subnet;
+ avl_node_t *node;
cp
syslog(LOG_DEBUG, _("Subnet list:"));
-
- for(subnet = subnet_list[SUBNET_IPV4]; subnet != NULL; subnet = subnet->global_next)
+ for(node = subnet_tree->head; node; node = node->next)
{
+ subnet = (subnet_t *)node->data;
netstr = net2str(subnet);
- syslog(LOG_DEBUG, " %s owner %s", netstr, subnet->owner->name);
+ syslog(LOG_DEBUG, " %s owner %s", netstr, subnet->owner->name);
free(netstr);
}
-
syslog(LOG_DEBUG, _("End of subnet list."));
cp
}
projects / tinc / blobdiff