/*
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-2002 Guus Sliepen <guus@sliepen.warande.net>,
+ 2000-2002 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.14 2000/11/20 22:13:13 guus Exp $
+ $Id: subnet.c,v 1.1.2.32 2002/03/11 11:23:04 guus Exp $
*/
#include "config.h"
#include <stdio.h>
#include <syslog.h>
+#include <string.h>
+#include <errno.h>
+#include <fcntl.h>
+#include <netdb.h>
+#include <netinet/in.h>
+
+#include <utils.h>
+#include <xalloc.h>
+#include <avl_tree.h>
#include "conf.h"
#include "net.h"
-#include "connection.h"
+#include "node.h"
#include "subnet.h"
+#include "netutl.h"
+
#include "system.h"
-#include <utils.h>
-#include <xalloc.h>
-#include <rbl.h>
+int cache_mac_valid = 0;
+int cache_ipv4_valid = 0;
+int cache_ipv6_valid = 0;
/* lists type of subnet */
-rbltree_t *subnet_tree;
-
-void init_subnets(void)
-{
-cp
- subnet_tree = new_rbltree((rbl_compare_t)subnet_compare, (rbl_action_t)free_subnet);
-cp
-}
+avl_tree_t *subnet_tree;
/* Subnet comparison */
int subnet_compare_ipv4(subnet_t *a, subnet_t *b)
{
+ int result;
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.
- */
-
- if(a->net.ipv4.mask > b->net.ipv4.mask)
- if((a->net.ipv4.address & b->net.ipv4.mask) == b->net.ipv4.address)
- return -1;
+ result = memcmp(&a->net.ipv4.address, &b->net.ipv4.address, sizeof(ipv4_t));
+
+ if(result)
+ return result;
- return a->net.ipv4.address - b->net.ipv4.address;
+ return a->net.ipv4.masklength - b->net.ipv4.masklength;
}
int subnet_compare_ipv6(subnet_t *a, subnet_t *b)
{
+ int result;
cp
- /* Same as ipv4 case, but with nasty 128 bit addresses */
-
- if(memcmp(&a->net.ipv6.mask, &b->net.ipv6.mask, sizeof(ipv6_t)) > 0)
- if((a->net.ipv6.address.x[0] & b->net.ipv6.mask.x[0]) == b->net.ipv6.address.x[0] &&
- (a->net.ipv6.address.x[1] & b->net.ipv6.mask.x[1]) == b->net.ipv6.address.x[1] &&
- (a->net.ipv6.address.x[2] & b->net.ipv6.mask.x[2]) == b->net.ipv6.address.x[2] &&
- (a->net.ipv6.address.x[3] & b->net.ipv6.mask.x[3]) == b->net.ipv6.address.x[3] &&
- (a->net.ipv6.address.x[4] & b->net.ipv6.mask.x[4]) == b->net.ipv6.address.x[4] &&
- (a->net.ipv6.address.x[5] & b->net.ipv6.mask.x[5]) == b->net.ipv6.address.x[5] &&
- (a->net.ipv6.address.x[6] & b->net.ipv6.mask.x[6]) == b->net.ipv6.address.x[6] &&
- (a->net.ipv6.address.x[7] & b->net.ipv6.mask.x[7]) == b->net.ipv6.address.x[7])
- return -1;
+ result = memcmp(&a->net.ipv6.address, &b->net.ipv6.address, sizeof(ipv6_t));
- return memcmp(&a->net.ipv6.address, &b->net.ipv6.address, sizeof(ipv6_t));
+ if(result)
+ return result;
+
+ return a->net.ipv6.masklength - b->net.ipv6.masklength;
}
int subnet_compare(subnet_t *a, subnet_t *b)
{
- int x;
+ int result;
cp
- x = a->type - b->type;
- if(x)
- return x;
+ result = a->type - b->type;
+
+ if(result)
+ return result;
switch(a->type)
{
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;
+ syslog(LOG_ERR, _("subnet_compare() was called with unknown subnet type %d, exitting!"), a->type);
+ cp_trace();
+ exit(0);
}
+
+ return 0;
+}
+
+/* Initialising trees */
+
+void init_subnets(void)
+{
+cp
+ subnet_tree = avl_alloc_tree((avl_compare_t)subnet_compare, (avl_action_t)free_subnet);
+cp
+}
+
+void exit_subnets(void)
+{
+cp
+ avl_delete_tree(subnet_tree);
+cp
+}
+
+avl_tree_t *new_subnet_tree(void)
+{
+cp
+ return avl_alloc_tree((avl_compare_t)subnet_compare, NULL);
+cp
+}
+
+void free_subnet_tree(avl_tree_t *subnet_tree)
+{
+cp
+ avl_delete_tree(subnet_tree);
+cp
}
/* Allocating and freeing space for subnets */
free(subnet);
}
-/* Linked list management */
+/* Adding and removing subnets */
-void subnet_add(connection_t *cl, subnet_t *subnet)
+void cache_invalidate(void)
+{
+ cache_mac_valid = 0;
+ cache_ipv4_valid = 0;
+ cache_ipv6_valid = 0;
+}
+
+void subnet_add(node_t *n, subnet_t *subnet)
{
cp
- subnet->owner = cl;
- rbl_insert(subnet_tree, subnet);
- rbl_insert(cl->subnet_tree, subnet);
+ subnet->owner = n;
+
+ cache_invalidate();
+
+ avl_insert(subnet_tree, subnet);
+cp
+ avl_insert(n->subnet_tree, subnet);
cp
}
-void subnet_del(subnet_t *subnet)
+void subnet_del(node_t *n, subnet_t *subnet)
{
cp
- rbl_delete(subnet->owner->subnet_tree, subnet);
- rbl_delete(subnet_tree, subnet);
+ cache_invalidate();
+
+ avl_delete(n->subnet_tree, subnet);
+cp
+ avl_delete(subnet_tree, subnet);
cp
}
subnet_t *str2net(char *subnetstr)
{
- int type;
+ int i, l;
subnet_t *subnet;
-cp
- if(sscanf(subnetstr, "%d,", &type) != 1)
- return NULL;
+ unsigned short int x[8];
cp
subnet = new_subnet();
cp
- switch(type)
+ if(sscanf(subnetstr, "%hu.%hu.%hu.%hu/%d",
+ &x[0], &x[1], &x[2], &x[3],
+ &l) == 5)
{
- case SUBNET_MAC:
- if(sscanf(subnetstr, "%d,%hhx:%hhx:%hhx:%hhx:%hhx:%hhx", &subnet->type,
- &subnet->net.mac.address.x[0],
- &subnet->net.mac.address.x[1],
- &subnet->net.mac.address.x[2],
- &subnet->net.mac.address.x[3],
- &subnet->net.mac.address.x[4],
- &subnet->net.mac.address.x[5]) != 7)
- {
- free_subnet(subnet);
- return NULL;
- }
- break;
- case SUBNET_IPV4:
- if(sscanf(subnetstr, "%d,%lx/%lx", &subnet->type, &subnet->net.ipv4.address, &subnet->net.ipv4.mask) != 3)
- {
- free_subnet(subnet);
- return NULL;
- }
- break;
- case SUBNET_IPV6:
- if(sscanf(subnetstr, "%d,%hx:%hx:%hx:%hx:%hx:%hx:%hx:%hx/%hx:%hx:%hx:%hx:%hx:%hx:%hx:%hx", &subnet->type,
- &subnet->net.ipv6.address.x[0],
- &subnet->net.ipv6.address.x[1],
- &subnet->net.ipv6.address.x[2],
- &subnet->net.ipv6.address.x[3],
- &subnet->net.ipv6.address.x[4],
- &subnet->net.ipv6.address.x[5],
- &subnet->net.ipv6.address.x[6],
- &subnet->net.ipv6.address.x[7],
- &subnet->net.ipv6.mask.x[0],
- &subnet->net.ipv6.mask.x[1],
- &subnet->net.ipv6.mask.x[2],
- &subnet->net.ipv6.mask.x[3],
- &subnet->net.ipv6.mask.x[4],
- &subnet->net.ipv6.mask.x[5],
- &subnet->net.ipv6.mask.x[6],
- &subnet->net.ipv6.mask.x[7]) != 17)
- {
- free_subnet(subnet);
- return NULL;
- }
- break;
- default:
- free_subnet(subnet);
- return NULL;
+ subnet->type = SUBNET_IPV4;
+ subnet->net.ipv4.masklength = l;
+ for(i = 0; i < 4; i++)
+ subnet->net.ipv4.address.x[i] = x[i];
+ return subnet;
}
-cp
- return subnet;
+
+ if(sscanf(subnetstr, "%hx:%hx:%hx:%hx:%hx:%hx:%hx:%hx/%d",
+ &x[0], &x[1], &x[2], &x[3], &x[4], &x[5], &x[6], &x[7],
+ &l) == 9)
+ {
+ subnet->type = SUBNET_IPV6;
+ subnet->net.ipv6.masklength = l;
+ for(i = 0; i < 8; i++)
+ subnet->net.ipv6.address.x[i] = htons(x[i]);
+ return subnet;
+ }
+
+ if(sscanf(subnetstr, "%hu.%hu.%hu.%hu",
+ &x[0], &x[1], &x[2], &x[3]) == 4)
+ {
+ subnet->type = SUBNET_IPV4;
+ subnet->net.ipv4.masklength = 32;
+ for(i = 0; i < 4; i++)
+ subnet->net.ipv4.address.x[i] = x[i];
+ return subnet;
+ }
+
+ if(sscanf(subnetstr, "%hx:%hx:%hx:%hx:%hx:%hx:%hx:%hx",
+ &x[0], &x[1], &x[2], &x[3], &x[4], &x[5], &x[6], &x[7]) == 8)
+ {
+ subnet->type = SUBNET_IPV6;
+ subnet->net.ipv6.masklength = 128;
+ for(i = 0; i < 8; i++)
+ subnet->net.ipv6.address.x[i] = htons(x[i]);
+ return subnet;
+ }
+
+ if(sscanf(subnetstr, "%hx:%hx:%hx:%hx:%hx:%hx",
+ &x[0], &x[1], &x[2], &x[3], &x[4], &x[5]) == 6)
+ {
+ subnet->type = SUBNET_MAC;
+ for(i = 0; i < 6; i++)
+ subnet->net.mac.address.x[i] = x[i];
+ return subnet;
+ }
+
+ free(subnet);
+ return NULL;
}
char *net2str(subnet_t *subnet)
switch(subnet->type)
{
case SUBNET_MAC:
- asprintf(&netstr, "%d,%hhx:%hhx:%hhx:%hhx:%hhx:%hhx", subnet->type,
+ asprintf(&netstr, "%hx:%hx:%hx:%hx:%hx:%hx",
subnet->net.mac.address.x[0],
subnet->net.mac.address.x[1],
subnet->net.mac.address.x[2],
subnet->net.mac.address.x[5]);
break;
case SUBNET_IPV4:
- asprintf(&netstr, "%d,%lx/%lx", subnet->type, subnet->net.ipv4.address, subnet->net.ipv4.mask);
+ asprintf(&netstr, "%hu.%hu.%hu.%hu/%d",
+ subnet->net.ipv4.address.x[0],
+ subnet->net.ipv4.address.x[1],
+ subnet->net.ipv4.address.x[2],
+ subnet->net.ipv4.address.x[3],
+ subnet->net.ipv4.masklength);
break;
case SUBNET_IPV6:
- asprintf(&netstr, "%d,%hx:%hx:%hx:%hx:%hx:%hx:%hx:%hx/%hx:%hx:%hx:%hx:%hx:%hx:%hx:%hx", subnet->type,
- subnet->net.ipv6.address.x[0],
- subnet->net.ipv6.address.x[1],
- subnet->net.ipv6.address.x[2],
- subnet->net.ipv6.address.x[3],
- subnet->net.ipv6.address.x[4],
- subnet->net.ipv6.address.x[5],
- subnet->net.ipv6.address.x[6],
- subnet->net.ipv6.address.x[7],
- subnet->net.ipv6.mask.x[0],
- subnet->net.ipv6.mask.x[1],
- subnet->net.ipv6.mask.x[2],
- subnet->net.ipv6.mask.x[3],
- subnet->net.ipv6.mask.x[4],
- subnet->net.ipv6.mask.x[5],
- subnet->net.ipv6.mask.x[6],
- subnet->net.ipv6.mask.x[7]);
+ asprintf(&netstr, "%hx:%hx:%hx:%hx:%hx:%hx:%hx:%hx/%d",
+ ntohs(subnet->net.ipv6.address.x[0]),
+ ntohs(subnet->net.ipv6.address.x[1]),
+ ntohs(subnet->net.ipv6.address.x[2]),
+ ntohs(subnet->net.ipv6.address.x[3]),
+ ntohs(subnet->net.ipv6.address.x[4]),
+ ntohs(subnet->net.ipv6.address.x[5]),
+ ntohs(subnet->net.ipv6.address.x[6]),
+ ntohs(subnet->net.ipv6.address.x[7]),
+ subnet->net.ipv6.masklength);
break;
default:
- asprintf(&netstr, _("unknown"));
+ syslog(LOG_ERR, _("net2str() was called with unknown subnet type %d, exitting!"), subnet->type);
+ cp_trace();
+ exit(0);
}
cp
return netstr;
/* Subnet lookup routines */
-subnet_t *lookup_subnet_mac(mac_t address)
+subnet_t *lookup_subnet(node_t *owner, subnet_t *subnet)
+{
+cp
+ return avl_search(owner->subnet_tree, subnet);
+}
+
+subnet_t *lookup_subnet_mac(mac_t *address)
{
- subnet_t subnet;
+ static subnet_t subnet, *p;
cp
+ if(cache_mac_valid && !memcmp(&subnet.net.mac.address, address, sizeof(mac_t)))
+ return p;
+
subnet.type = SUBNET_MAC;
- subnet.net.mac.address = address;
- return (subnet_t *)rbl_search_closest(subnet_tree, &subnet);
+ memcpy(&subnet.net.mac.address, address, sizeof(mac_t));
+
+ p = (subnet_t *)avl_search(subnet_tree, &subnet);
+ cache_mac_valid = 1;
+cp
+ return p;
}
-subnet_t *lookup_subnet_ipv4(ipv4_t address)
+subnet_t *lookup_subnet_ipv4(ipv4_t *address)
{
- subnet_t subnet;
+ static subnet_t subnet, *p;
cp
+ if(cache_ipv4_valid && !memcmp(&subnet.net.ipv4.address, address, sizeof(ipv4_t)))
+ return p;
+
subnet.type = SUBNET_IPV4;
- subnet.net.ipv4.address = address;
- subnet.net.ipv4.mask = 0xFFFFFFFF;
- return (subnet_t *)rbl_search_closest(subnet_tree, &subnet);
+ memcpy(&subnet.net.ipv4.address, address, sizeof(ipv4_t));
+ subnet.net.ipv4.masklength = 32;
+
+ do
+ {
+ /* Go find subnet */
+
+ p = (subnet_t *)avl_search_closest_smaller(subnet_tree, &subnet);
+
+ /* Check if the found subnet REALLY matches */
+cp
+ if(p)
+ {
+ if(p->type != SUBNET_IPV4)
+ {
+ p = NULL;
+ break;
+ }
+
+ if (!maskcmp((char *)address, (char *)&p->net.ipv4.address, p->net.ipv4.masklength, sizeof(ipv4_t)))
+ break;
+ else
+ {
+ /* Otherwise, see if there is a bigger enclosing subnet */
+
+ subnet.net.ipv4.masklength = p->net.ipv4.masklength - 1;
+ maskcpy((char *)&subnet.net.ipv4.address, (char *)&p->net.ipv4.address, subnet.net.ipv4.masklength, sizeof(ipv4_t));
+ }
+ }
+ } while (p);
+
+ memcpy(&subnet.net.ipv4.address, address, sizeof(ipv4_t));
+ cache_ipv4_valid = 1;
+cp
+ return p;
}
-subnet_t *lookup_subnet_ipv6(ipv6_t address)
+subnet_t *lookup_subnet_ipv6(ipv6_t *address)
{
- subnet_t subnet;
+ static subnet_t subnet, *p;
cp
+ if(cache_ipv6_valid && !memcmp(&subnet.net.ipv6.address, address, sizeof(ipv6_t)))
+ return p;
+
subnet.type = SUBNET_IPV6;
- subnet.net.ipv6.address = address;
- memset(&subnet.net.ipv6.mask, 0xFF, 16);
- return (subnet_t *)rbl_search_closest(subnet_tree, &subnet);
+ memcpy(&subnet.net.ipv6.address, address, sizeof(ipv6_t));
+ subnet.net.ipv6.masklength = 128;
+
+ do
+ {
+ /* Go find subnet */
+
+ p = (subnet_t *)avl_search_closest_smaller(subnet_tree, &subnet);
+
+ /* Check if the found subnet REALLY matches */
+
+cp
+ if(p)
+ {
+ if(p->type != SUBNET_IPV6)
+ return NULL;
+
+ if (!maskcmp((char *)address, (char *)&p->net.ipv6.address, p->net.ipv6.masklength, sizeof(ipv6_t)))
+ break;
+ else
+ {
+ /* Otherwise, see if there is a bigger enclosing subnet */
+
+ subnet.net.ipv6.masklength = p->net.ipv6.masklength - 1;
+ maskcpy((char *)&subnet.net.ipv6.address, (char *)&p->net.ipv6.address, subnet.net.ipv6.masklength, sizeof(ipv6_t));
+ }
+ }
+ } while (p);
+
+ memcpy(&subnet.net.ipv6.address, address, sizeof(ipv6_t));
+ cache_ipv6_valid = 1;
+cp
+ return p;
}
-void dump_subnet_list(void)
+void dump_subnets(void)
{
char *netstr;
subnet_t *subnet;
- rbl_t *rbl;
+ avl_node_t *node;
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);
+ syslog(LOG_DEBUG, _(" %s owner %s"), netstr, subnet->owner->name);
free(netstr);
}
syslog(LOG_DEBUG, _("End of subnet list."));
projects / tinc / blobdiff