X-Git-Url: https://www.tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=src%2Fsubnet.c;h=8e50646261efd609aeaf4adafe46f7a9c7174c68;hp=fbcfba7f3c9f9fd0a0900bbbac90ffc1cef81e2e;hb=3a6200c1e39b61b249db3d1f9bcffa77351863bd;hpb=9c2f805255fa36b05e8fe9391f639581d938b653 diff --git a/src/subnet.c b/src/subnet.c index fbcfba7f..8e506462 100644 --- a/src/subnet.c +++ b/src/subnet.c @@ -17,91 +17,130 @@ 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.14 2000/11/20 22:13:13 guus Exp $ */ #include "config.h" -#include -#include -#include "subnet.h" +#include +#include + +#include "conf.h" #include "net.h" +#include "connection.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 */ + +rbltree_t *subnet_tree; + +void init_subnets(void) { cp - return (subnet_t *)xmalloc(sizeof(subnet_t)); + subnet_tree = new_rbltree((rbl_compare_t)subnet_compare, (rbl_action_t)free_subnet); +cp } -void free_subnet(subnet_t *subnet) +/* Subnet comparison */ + +int subnet_compare_mac(subnet_t *a, subnet_t *b) { cp - free(subnet); + return memcmp(&a->net.mac.address, &b->net.mac.address, sizeof(mac_t)); } -/* Linked list management */ - -void subnet_add(conn_list_t *cl, subnet_t *subnet) +int subnet_compare_ipv4(subnet_t *a, subnet_t *b) { - subnet_t *p = NULL; - subnet_t *q = NULL; cp - subnet->owner = cl; - - /* Sort on size of subnet mask (IPv4 only at the moment!) - - Three cases: cl->subnets = NULL -> just add this subnet - insert before first -> add it in front of list - rest: insert after another subnet + /* 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; - if(cl->subnets) - { - p = q = cl->subnets; + return a->net.ipv4.address - b->net.ipv4.address; +} - for(; p; p = p->next) - { - if(subnet->net.ipv4.mask >= p->net.ipv4.mask) - break; +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)); +} - 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 */ +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; } +} - if(subnet->next) - subnet->next->prev = subnet; +/* Allocating and freeing space for subnets */ + +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); +} + +/* Linked list management */ - if(subnet->next) - subnet->next->prev = subnet->prev; +void subnet_add(connection_t *cl, subnet_t *subnet) +{ +cp + subnet->owner = cl; + rbl_insert(subnet_tree, subnet); + rbl_insert(cl->subnet_tree, subnet); +cp +} - free_subnet(subnet); +void subnet_del(subnet_t *subnet) +{ +cp + rbl_delete(subnet->owner->subnet_tree, subnet); + rbl_delete(subnet_tree, subnet); cp } @@ -114,9 +153,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 +201,6 @@ cp return NULL; } break; - break; default: free_subnet(subnet); return NULL; @@ -190,7 +228,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 +247,7 @@ cp subnet->net.ipv6.mask.x[7]); break; default: - netstr = NULL; + asprintf(&netstr, _("unknown")); } cp return netstr; @@ -217,50 +255,49 @@ cp /* Subnet lookup routines */ -subnet_t *lookup_subnet_mac(subnet_t *subnets, mac_t address) +subnet_t *lookup_subnet_mac(mac_t address) { - subnet_t *subnet; + subnet_t subnet; 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; - } -cp - return subnet; + subnet.type = SUBNET_MAC; + subnet.net.mac.address = address; + return (subnet_t *)rbl_search_closest(subnet_tree, &subnet); } -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; cp - for(subnet = subnets; subnet != NULL; subnet = subnet->next) - { - if(subnet->type == SUBNET_IPV4) - 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; + return (subnet_t *)rbl_search_closest(subnet_tree, &subnet); +} + +subnet_t *lookup_subnet_ipv6(ipv6_t address) +{ + subnet_t subnet; cp - return subnet; + 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 *lookup_subnet_ipv6(subnet_t *subnets, ipv6_t address) +void dump_subnet_list(void) { + char *netstr; subnet_t *subnet; - int i; + rbl_t *rbl; cp - for(subnet = subnets; subnet != NULL; subnet = subnet->next) + syslog(LOG_DEBUG, _("Subnet list:")); + RBL_FOREACH(subnet_tree, rbl) { - 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 *)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 - return subnet; }