X-Git-Url: https://www.tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=src%2Fsubnet.c;h=cb9cbb75e345e12952f5ac384e1008d859733226;hp=9fceea8e0fe386b086257d4edc53f0dd34e8dac2;hb=8b5e4211304aaa5d39bc95f04398bd5ecaa887d8;hpb=5065ea32c32e27478d93c00a1bba0c812b7a2b8c diff --git a/src/subnet.c b/src/subnet.c index 9fceea8e..cb9cbb75 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,25 +17,110 @@ 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.9 2000/11/03 22:35:12 zarq Exp $ + $Id: subnet.c,v 1.1.2.24 2001/08/28 20:52:39 guus Exp $ */ #include "config.h" #include #include +#include #include "conf.h" #include "net.h" +#include "connection.h" #include "subnet.h" #include "system.h" #include #include +#include /* lists type of subnet */ -subnet_t *subnet_list[SUBNET_TYPES] = { NULL }; +avl_tree_t *subnet_tree; + +void init_subnets(void) +{ +cp + subnet_tree = avl_alloc_tree((avl_compare_t)subnet_compare, (avl_action_t)free_subnet); +cp +} + +/* Subnet comparison */ + +int subnet_compare_mac(subnet_t *a, subnet_t *b) +{ +cp + return memcmp(&a->net.mac.address, &b->net.mac.address, sizeof(mac_t)); +} + +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) + { + if(a->net.ipv4.mask < b->net.ipv4.mask) + return -1; + else if(a->net.ipv4.mask > b->net.ipv4.mask) + return 1; + else + return 0; + } + else + { + if(a->net.ipv4.address < b->net.ipv4.address) + return -1; + else if(a->net.ipv4.address > b->net.ipv4.address) + return 1; + else + return 0; + } +} + +int subnet_compare_ipv6(subnet_t *a, 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 subnet_compare(subnet_t *a, 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; + } +} /* Allocating and freeing space for subnets */ @@ -53,87 +138,39 @@ cp /* Linked list management */ -void subnet_add(conn_list_t *cl, subnet_t *subnet) +void subnet_add(connection_t *cl, subnet_t *subnet) { - subnet_t *p = NULL; - subnet_t *q = NULL; cp subnet->owner = cl; - /* Link it into the owners list of subnets (unsorted) */ - - subnet->next = cl->subnets; - subnet->prev = NULL; - if(subnet->next) - subnet->next->prev = subnet; - cl->subnets = subnet; - - /* And now add it to the global subnet list (sorted) */ - - /* Sort on size of subnet mask (IPv4 only at the moment!) - - 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]) + while(!avl_insert(subnet_tree, subnet)) { - p = q = subnet_list[subnet->type]; + subnet_t *old; + + old = (subnet_t *)avl_search(subnet_tree, subnet); - for(; p; p = p->global_next) + if(debug_lvl >= DEBUG_PROTOCOL) { - if(subnet->net.ipv4.mask >= p->net.ipv4.mask) - break; - - q = p; + char *subnetstr; + subnetstr = net2str(subnet); + syslog(LOG_WARNING, _("Duplicate subnet %s for %s (%s), previous owner %s (%s)!"), + subnetstr, cl->name, cl->hostname, old->owner->name, old->owner->hostname); + free(subnetstr); } - } -cp - if(p == subnet_list[subnet->type]) /* First two cases */ - { - /* 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; + + subnet_del(old); } -cp - if(subnet->global_next) - subnet->global_next->global_prev = subnet; + + avl_insert(cl->subnet_tree, subnet); cp } void subnet_del(subnet_t *subnet) { cp - /* Remove it from owner's list */ - - if(subnet->prev) - subnet->prev->next = subnet->next; - else - subnet->owner->subnets = subnet->next; - - if(subnet->next) - subnet->next->prev = subnet->prev; - - /* 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; - - if(subnet->global_next) - subnet->global_next->global_prev = subnet->global_prev; - - free_subnet(subnet); + avl_delete(subnet->owner->subnet_tree, subnet); +cp + avl_delete(subnet_tree, subnet); cp } @@ -221,7 +258,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], @@ -240,7 +277,7 @@ cp subnet->net.ipv6.mask.x[7]); break; default: - asprintf(&netstr, _("unknown")); + asprintf(&netstr, _("unknown subnet type")); } cp return netstr; @@ -248,63 +285,84 @@ cp /* Subnet lookup routines */ -subnet_t *lookup_subnet_mac(mac_t address) +subnet_t *lookup_subnet_mac(mac_t *address) { - subnet_t *subnet; + 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) { - 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 }