/*
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-2003 Guus Sliepen <guus@sliepen.eu.org>,
+ 2000-2003 Ivo Timmermans <ivo@o2w.nl>
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.12 2000/11/20 19:12:17 guus Exp $
+ $Id: subnet.c,v 1.1.2.51 2003/11/17 15:30:18 guus Exp $
*/
-#include "config.h"
-
-#include <stdio.h>
-#include <syslog.h>
+#include "system.h"
-#include "conf.h"
+#include "avl_tree.h"
+#include "logger.h"
#include "net.h"
-#include "connection.h"
+#include "netutl.h"
+#include "node.h"
#include "subnet.h"
-#include "system.h"
-
-#include <utils.h>
-#include <xalloc.h>
-#include <rbl.h>
+#include "utils.h"
+#include "xalloc.h"
/* lists type of subnet */
-rbltree_t _subnet_tree = { NULL };
-rbltree_t *subnet_tree = &_subnet_tree;
+avl_tree_t *subnet_tree;
/* Subnet comparison */
-int subnet_compare_mac(subnet_t *a, subnet_t *b)
+static int subnet_compare_mac(const subnet_t *a, const subnet_t *b)
{
-cp
- return memcmp(&a->net.mac.address, &b->net.mac.address, sizeof(mac_t));
+ int result;
+
+ result = memcmp(&a->net.mac.address, &b->net.mac.address, sizeof(mac_t));
+
+ if(result || !a->owner || !b->owner)
+ return result;
+
+ return strcmp(a->owner->name, b->owner->name);
}
-int subnet_compare_ipv4(subnet_t *a, subnet_t *b)
+static int subnet_compare_ipv4(const subnet_t *a, const 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.
- */
-
- 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;
+ int result;
+
+ result = memcmp(&a->net.ipv4.address, &b->net.ipv4.address, sizeof(ipv4_t));
+
+ if(result)
+ return result;
+
+ result = a->net.ipv4.prefixlength - b->net.ipv4.prefixlength;
+
+ if(result || !a->owner || !b->owner)
+ return result;
+
+ return strcmp(a->owner->name, b->owner->name);
}
-int subnet_compare_ipv6(subnet_t *a, subnet_t *b)
+static int subnet_compare_ipv6(const subnet_t *a, const subnet_t *b)
{
-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;
-
- return memcmp(&a->net.ipv6.address, &b->net.ipv6.address, sizeof(ipv6_t));
+ int result;
+
+ result = memcmp(&a->net.ipv6.address, &b->net.ipv6.address, sizeof(ipv6_t));
+
+ if(result)
+ return result;
+
+ result = a->net.ipv6.prefixlength - b->net.ipv6.prefixlength;
+
+ if(result || !a->owner || !b->owner)
+ return result;
+
+ return strcmp(a->owner->name, b->owner->name);
}
-int subnet_compare(subnet_t *a, subnet_t *b)
+int subnet_compare(const subnet_t *a, const subnet_t *b)
{
- int x;
-cp
- x = a->type - b->type;
- if(x)
- return x;
-
- switch(a->type)
- {
- 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;
- }
+ int result;
+
+ result = a->type - b->type;
+
+ if(result)
+ return result;
+
+ switch (a->type) {
+ 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:
+ logger(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);
+}
+
+void exit_subnets(void)
+{
+ cp();
+
+ avl_delete_tree(subnet_tree);
+}
+
+avl_tree_t *new_subnet_tree(void)
+{
+ cp();
+
+ return avl_alloc_tree((avl_compare_t) subnet_compare, NULL);
+}
+
+void free_subnet_tree(avl_tree_t *subnet_tree)
+{
+ cp();
+
+ avl_delete_tree(subnet_tree);
}
/* Allocating and freeing space for subnets */
subnet_t *new_subnet(void)
{
-cp
- return (subnet_t *)xmalloc(sizeof(subnet_t));
+ cp();
+
+ return xmalloc_and_zero(sizeof(subnet_t));
}
void free_subnet(subnet_t *subnet)
{
-cp
- free(subnet);
+ cp();
+
+ free(subnet);
}
-/* Linked list management */
+/* Adding and removing subnets */
-void subnet_add(connection_t *cl, subnet_t *subnet)
+void subnet_add(node_t *n, subnet_t *subnet)
{
-cp
- rbl_insert(subnet_tree, subnet);
- rbl_insert(cl->subnet_tree, subnet);
-cp
+ cp();
+
+ subnet->owner = n;
+
+ avl_insert(subnet_tree, subnet);
+ avl_insert(n->subnet_tree, subnet);
}
-void subnet_del(subnet_t *subnet)
+void subnet_del(node_t *n, subnet_t *subnet)
{
-cp
- free_rbl(rbl_unlink(subnet->owner->subnet_tree, subnet));
- rbl_delete(subnet_tree, subnet);
-cp
+ cp();
+
+ avl_delete(n->subnet_tree, subnet);
+ avl_delete(subnet_tree, subnet);
}
/* Ascii representation of subnets */
-subnet_t *str2net(char *subnetstr)
+subnet_t *str2net(const char *subnetstr)
{
- int type;
- subnet_t *subnet;
-cp
- if(sscanf(subnetstr, "%d,", &type) != 1)
- return NULL;
-cp
- subnet = new_subnet();
-cp
- switch(type)
- {
- 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;
- }
-cp
- return subnet;
+ int i, l;
+ subnet_t *subnet;
+ uint16_t x[8];
+
+ cp();
+
+ subnet = new_subnet();
+
+ if(sscanf(subnetstr, "%hu.%hu.%hu.%hu/%d",
+ &x[0], &x[1], &x[2], &x[3], &l) == 5) {
+ subnet->type = SUBNET_IPV4;
+ subnet->net.ipv4.prefixlength = l;
+
+ 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/%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.prefixlength = 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.prefixlength = 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.prefixlength = 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)
+char *net2str(const subnet_t *subnet)
{
- char *netstr;
-cp
- switch(subnet->type)
- {
- case SUBNET_MAC:
- asprintf(&netstr, "%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]);
- break;
- case SUBNET_IPV4:
- asprintf(&netstr, "%d,%lx/%lx", subnet->type, subnet->net.ipv4.address, subnet->net.ipv4.mask);
- 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]);
- break;
- default:
- asprintf(&netstr, _("unknown"));
- }
-cp
- return netstr;
+ char *netstr;
+
+ cp();
+
+ switch (subnet->type) {
+ case SUBNET_MAC:
+ 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[3],
+ subnet->net.mac.address.x[4], subnet->net.mac.address.x[5]);
+ break;
+
+ case SUBNET_IPV4:
+ 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.prefixlength);
+ break;
+
+ case SUBNET_IPV6:
+ 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.prefixlength);
+ break;
+
+ default:
+ logger(LOG_ERR,
+ _("net2str() was called with unknown subnet type %d, exiting!"),
+ subnet->type);
+ cp_trace();
+ exit(0);
+ }
+
+ return netstr;
}
/* Subnet lookup routines */
-subnet_t *lookup_subnet_mac(mac_t address)
+subnet_t *lookup_subnet(const node_t *owner, const subnet_t *subnet)
{
- subnet_t subnet;
-cp
- subnet.type = SUBNET_MAC;
- subnet.net.mac.address = address;
- return (subnet_t *)rbl_search_closest(subnet_tree, &subnet);
+ cp();
+
+ return avl_search(owner->subnet_tree, subnet);
}
-subnet_t *lookup_subnet_ipv4(ipv4_t address)
+subnet_t *lookup_subnet_mac(const mac_t *address)
{
- subnet_t subnet;
-cp
- subnet.type = SUBNET_IPV4;
- subnet.net.ipv4.address = address;
- subnet.net.ipv4.mask = 0xFFFFFFFF;
- return (subnet_t *)rbl_search_closest(subnet_tree, &subnet);
+ subnet_t *p, subnet = {0};
+
+ cp();
+
+ subnet.type = SUBNET_MAC;
+ subnet.net.mac.address = *address;
+ subnet.owner = NULL;
+
+ p = avl_search(subnet_tree, &subnet);
+
+ return p;
}
-subnet_t *lookup_subnet_ipv6(ipv6_t address)
+subnet_t *lookup_subnet_ipv4(const ipv4_t *address)
{
- subnet_t subnet;
-cp
- 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);
+ subnet_t *p, subnet = {0};
+
+ cp();
+
+ subnet.type = SUBNET_IPV4;
+ subnet.net.ipv4.address = *address;
+ subnet.net.ipv4.prefixlength = 32;
+ subnet.owner = NULL;
+
+ do {
+ /* Go find subnet */
+
+ p = avl_search_closest_smaller(subnet_tree, &subnet);
+
+ /* Check if the found subnet REALLY matches */
+
+ if(p) {
+ if(p->type != SUBNET_IPV4) {
+ p = NULL;
+ break;
+ }
+
+ if(!maskcmp(address, &p->net.ipv4.address, p->net.ipv4.prefixlength, sizeof(ipv4_t)))
+ break;
+ else {
+ /* Otherwise, see if there is a bigger enclosing subnet */
+
+ subnet.net.ipv4.prefixlength = p->net.ipv4.prefixlength - 1;
+ maskcpy(&subnet.net.ipv4.address, &p->net.ipv4.address, subnet.net.ipv4.prefixlength, sizeof(ipv4_t));
+ }
+ }
+ } while(p);
+
+ return p;
+}
+
+subnet_t *lookup_subnet_ipv6(const ipv6_t *address)
+{
+ subnet_t *p, subnet = {0};
+
+ cp();
+
+ subnet.type = SUBNET_IPV6;
+ subnet.net.ipv6.address = *address;
+ subnet.net.ipv6.prefixlength = 128;
+ subnet.owner = NULL;
+
+ do {
+ /* Go find subnet */
+
+ p = avl_search_closest_smaller(subnet_tree, &subnet);
+
+ /* Check if the found subnet REALLY matches */
+
+ if(p) {
+ if(p->type != SUBNET_IPV6)
+ return NULL;
+
+ if(!maskcmp(address, &p->net.ipv6.address, p->net.ipv6.prefixlength, sizeof(ipv6_t)))
+ break;
+ else {
+ /* Otherwise, see if there is a bigger enclosing subnet */
+
+ subnet.net.ipv6.prefixlength = p->net.ipv6.prefixlength - 1;
+ maskcpy(&subnet.net.ipv6.address, &p->net.ipv6.address, subnet.net.ipv6.prefixlength, sizeof(ipv6_t));
+ }
+ }
+ } while(p);
+
+ return p;
}
-void dump_subnet_list(void)
+void dump_subnets(void)
{
- char *netstr;
- subnet_t *subnet;
- rbl_t *rbl;
-cp
- syslog(LOG_DEBUG, _("Subnet list:"));
- RBL_FOREACH(subnet_tree, rbl)
- {
- subnet = (subnet_t *)rbl->data;
- netstr = net2str(subnet);
- syslog(LOG_DEBUG, " %s owner %s", netstr, subnet->owner->name);
- free(netstr);
- }
- syslog(LOG_DEBUG, _("End of subnet list."));
-cp
+ char *netstr;
+ subnet_t *subnet;
+ avl_node_t *node;
+
+ cp();
+
+ logger(LOG_DEBUG, _("Subnet list:"));
+
+ for(node = subnet_tree->head; node; node = node->next) {
+ subnet = node->data;
+ netstr = net2str(subnet);
+ logger(LOG_DEBUG, _(" %s owner %s"), netstr, subnet->owner->name);
+ free(netstr);
+ }
+
+ logger(LOG_DEBUG, _("End of subnet list."));
}
projects / tinc / blobdiff