X-Git-Url: https://tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=src%2Fsubnet.c;h=6745e2f4766790f0be304aa3a017715952bab7ac;hp=9fceea8e0fe386b086257d4edc53f0dd34e8dac2;hb=1c34ba7fb8580949f3bd3a0d804747bbaea28e36;hpb=5065ea32c32e27478d93c00a1bba0c812b7a2b8c diff --git a/src/subnet.c b/src/subnet.c index 9fceea8e..6745e2f4 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-2002 Guus Sliepen , + 2000-2002 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,123 +17,166 @@ 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.29 2002/02/10 21:57:54 guus Exp $ */ #include "config.h" #include #include +#include +#include +#include +#include +#include #include "conf.h" #include "net.h" +#include "node.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; -/* Allocating and freeing space for subnets */ +/* Subnet comparison */ -subnet_t *new_subnet(void) +int subnet_compare_mac(subnet_t *a, subnet_t *b) { cp - return (subnet_t *)xmalloc(sizeof(subnet_t)); + return memcmp(&a->net.mac.address, &b->net.mac.address, sizeof(mac_t)); } -void free_subnet(subnet_t *subnet) +int subnet_compare_ipv4(subnet_t *a, subnet_t *b) { cp - free(subnet); + /* 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 0; } -/* Linked list management */ - -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; - - /* 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; + /* Same as ipv4 case, but with nasty 128 bit addresses */ - /* And now add it to the global subnet list (sorted) */ + 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: 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 0; +} - q = p; - } - } +int subnet_compare(subnet_t *a, subnet_t *b) +{ + int x; 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 */ + x = a->type - b->type; + if(x) + return x; + + switch(a->type) { - /* 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, exitting!"), a->type); + cp_trace(); + exit(0); } + + return 0; +} + +/* Initialising trees */ + +void init_subnets(void) +{ cp - if(subnet->global_next) - subnet->global_next->global_prev = subnet; + subnet_tree = avl_alloc_tree((avl_compare_t)subnet_compare, (avl_action_t)free_subnet); cp } -void subnet_del(subnet_t *subnet) +void exit_subnets(void) { cp - /* Remove it from owner's list */ + avl_delete_tree(subnet_tree); +cp +} - if(subnet->prev) - subnet->prev->next = subnet->next; - else - subnet->owner->subnets = subnet->next; +avl_tree_t *new_subnet_tree(void) +{ +cp + return avl_alloc_tree((avl_compare_t)subnet_compare, NULL); +cp +} - if(subnet->next) - subnet->next->prev = subnet->prev; +void free_subnet_tree(avl_tree_t *subnet_tree) +{ +cp + avl_delete_tree(subnet_tree); +cp +} - /* 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; +/* Allocating and freeing space for subnets */ - if(subnet->global_next) - subnet->global_next->global_prev = subnet->global_prev; - - free_subnet(subnet); +subnet_t *new_subnet(void) +{ +cp + return (subnet_t *)xmalloc(sizeof(subnet_t)); +} + +void free_subnet(subnet_t *subnet) +{ +cp + free(subnet); +} + +/* Adding and removing subnets */ + +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 } @@ -141,65 +184,108 @@ 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[6]; cp subnet = new_subnet(); cp - switch(type) + if(sscanf(subnetstr, "%hu.%hu.%hu.%hu/%d", + &x[0], + &x[1], + &x[2], + &x[3], + &subnet->net.ipv4.masklength) == 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.address = (((((x[0] << 8) + x[1]) << 8) + x[2]) << 8) + x[3]; + subnet->net.ipv4.mask = ~((1 << (32 - subnet->net.ipv4.masklength)) - 1); + return subnet; } -cp - return subnet; + + if(sscanf(subnetstr, "%hx:%hx:%hx:%hx:%hx:%hx:%hx:%hx/%d", + &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.masklength) == 9) + { + subnet->type = SUBNET_IPV6; + for(l = subnet->net.ipv6.masklength, i = 0; i < 8; l -= 16, i++) + { + subnet->net.ipv6.address.x[i] = htons(subnet->net.ipv6.address.x[i]); + if(l >= 16) + subnet->net.ipv6.mask.x[i] = 65535; + else if (l > 0) + subnet->net.ipv6.mask.x[i] = htons(65536 - (1 << l)); + else + subnet->net.ipv6.mask.x[i] = 0; + } + 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.address = (((((x[0] << 8) + x[1]) << 8) + x[2]) << 8) + x[3]; + subnet->net.ipv4.mask = ~0; + subnet->net.ipv4.masklength = 32; + return subnet; + } + + if(sscanf(subnetstr, "%hx:%hx:%hx:%hx:%hx:%hx:%hx:%hx", + &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]) == 8) + { + subnet->type = SUBNET_IPV6; + subnet->net.ipv6.masklength = 128; + for(l = subnet->net.ipv6.masklength, i = 0; i < 8; l -= 16, i++) + { + subnet->net.ipv6.address.x[i] = htons(subnet->net.ipv6.address.x[i]); + if(l >= 16) + subnet->net.ipv6.mask.x[i] = 65535; + else if (l > 0) + subnet->net.ipv6.mask.x[i] = htons(65536 - (1 << l)); + else + subnet->net.ipv6.mask.x[i] = 0; + } + 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; + subnet->net.mac.address.x[0] = x[0]; + subnet->net.mac.address.x[1] = x[1]; + subnet->net.mac.address.x[2] = x[2]; + subnet->net.mac.address.x[3] = x[3]; + subnet->net.mac.address.x[4] = x[4]; + subnet->net.mac.address.x[5] = x[5]; + return subnet; + } + + free(subnet); + return NULL; } char *net2str(subnet_t *subnet) @@ -209,7 +295,7 @@ cp 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], @@ -218,29 +304,27 @@ cp 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", + (unsigned short int)((subnet->net.ipv4.address >> 24) & 255), + (unsigned short int)((subnet->net.ipv4.address >> 16) & 255), + (unsigned short int)((subnet->net.ipv4.address >> 8) & 255), + (unsigned short int)(subnet->net.ipv4.address & 255), + 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->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")); + asprintf(&netstr, _("unknown subnet type")); } cp return netstr; @@ -248,63 +332,90 @@ cp /* 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.x, address, sizeof(ipv6_t)); + memset(subnet.net.ipv6.mask.x, 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 }