X-Git-Url: https://www.tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=src%2Fsubnet.c;h=fff384ff26e59c639fc6db78472de7e11883c19a;hp=fbcfba7f3c9f9fd0a0900bbbac90ffc1cef81e2e;hb=66067cc9c1347fb2de35660d531fdd4be8aede6a;hpb=9c2f805255fa36b05e8fe9391f639581d938b653 diff --git a/src/subnet.c b/src/subnet.c index fbcfba7f..fff384ff 100644 --- a/src/subnet.c +++ b/src/subnet.c @@ -1,7 +1,7 @@ /* subnet.c -- handle subnet lookups and lists - Copyright (C) 2000 Guus Sliepen , - 2000 Ivo Timmermans + Copyright (C) 2000,2001 Guus Sliepen , + 2000,2001 Ivo Timmermans 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,91 +17,143 @@ 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.5 2000/10/24 15:46:18 guus Exp $ + $Id: subnet.c,v 1.1.2.26 2001/10/27 13:13:35 guus Exp $ */ #include "config.h" -#include -#include -#include "subnet.h" +#include +#include +#include + +#include "conf.h" #include "net.h" +#include "node.h" +#include "subnet.h" +#include "system.h" -/* Allocating and freeing space for subnets */ +#include +#include +#include -subnet_t *new_subnet(void) +/* lists type of subnet */ + +avl_tree_t *subnet_tree; + +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; + + return strcmp(a->owner->name, b->owner->name); } -/* Linked list management */ +int subnet_compare_ipv4(subnet_t *a, subnet_t *b) +{ +cp + /* 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); +} -void subnet_add(conn_list_t *cl, subnet_t *subnet) +int subnet_compare_ipv6(subnet_t *a, subnet_t *b) { - subnet_t *p = NULL; - subnet_t *q = NULL; + int result; cp - subnet->owner = cl; + /* 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)); + + 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: cl->subnets = NULL -> just add this subnet - insert before first -> add it in front of list - rest: insert after another subnet - */ + if(result) + return result; - if(cl->subnets) - { - p = q = cl->subnets; - - for(; p; p = p->next) - { - if(subnet->net.ipv4.mask >= p->net.ipv4.mask) - break; - - q = p; - } - } - - if(!cl->subnets || p == cl->subnets) /* First two cases */ - { - /* Insert in front */ - subnet->next = cl->subnets; - subnet->prev = NULL; - cl->subnets = subnet; - } - else /* Third case */ + return strcmp(a->owner->name, b->owner->name); +} + +int subnet_compare(subnet_t *a, subnet_t *b) +{ + int x; +cp + x = a->type - b->type; + if(x) + return x; + + switch(a->type) { - /* Insert after q */ - subnet->next = q->next; - subnet->prev = q; - q->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 */ - if(subnet->next) - subnet->next->prev = subnet; +subnet_t *new_subnet(void) +{ cp + return (subnet_t *)xmalloc(sizeof(subnet_t)); } -void subnet_del(subnet_t *subnet) +void free_subnet(subnet_t *subnet) { cp - if(subnet->prev) - subnet->prev->next = subnet->next; - else - subnet->owner->subnets = subnet->next; + free(subnet); +} - if(subnet->next) - subnet->next->prev = subnet->prev; +/* Linked list management */ - free_subnet(subnet); +void subnet_add(node_t *n, subnet_t *subnet) +{ +cp + subnet->owner = n; + + avl_insert(subnet_tree, subnet); +cp + avl_insert(n->subnet_tree, subnet); +cp +} + +void subnet_del(node_t *n, subnet_t *subnet) +{ +cp + avl_delete(n->subnet_tree, subnet); +cp + avl_delete(subnet_tree, subnet); cp } @@ -114,9 +166,9 @@ subnet_t *str2net(char *subnetstr) cp if(sscanf(subnetstr, "%d,", &type) != 1) return NULL; - +cp subnet = new_subnet(); - +cp switch(type) { case SUBNET_MAC: @@ -162,7 +214,6 @@ cp return NULL; } break; - break; default: free_subnet(subnet); return NULL; @@ -190,7 +241,7 @@ cp 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", + 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], @@ -209,7 +260,7 @@ cp subnet->net.ipv6.mask.x[7]); break; default: - netstr = NULL; + asprintf(&netstr, _("unknown subnet type")); } cp return netstr; @@ -217,50 +268,90 @@ cp /* Subnet lookup routines */ -subnet_t *lookup_subnet_mac(subnet_t *subnets, 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 = subnets; subnet != NULL; subnet = subnet->next) - { - if(subnet->type == SUBNET_MAC) - 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(subnet_t *subnets, ipv4_t address) +subnet_t *lookup_subnet_ipv4(ipv4_t *address) { - subnet_t *subnet; + subnet_t subnet, *p; cp - for(subnet = subnets; subnet != NULL; subnet = subnet->next) - { - if(subnet->type == SUBNET_IPV4) - if((address & subnet->net.ipv4.mask) == subnet->net.ipv4.address) + 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 + 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 subnet, *p; + int i; 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; } -subnet_t *lookup_subnet_ipv6(subnet_t *subnets, ipv6_t address) +void dump_subnets(void) { + char *netstr; subnet_t *subnet; - int i; + avl_node_t *node; cp - for(subnet = subnets; subnet != NULL; subnet = subnet->next) + syslog(LOG_DEBUG, _("Subnet list:")); + for(node = subnet_tree->head; node; node = node->next) { - if(subnet->type == SUBNET_IPV6) - { - 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; - } + subnet = (subnet_t *)node->data; + netstr = net2str(subnet); + syslog(LOG_DEBUG, " %s owner %s", netstr, subnet->owner->name); + free(netstr); } + syslog(LOG_DEBUG, _("End of subnet list.")); cp - return subnet; }