X-Git-Url: https://www.tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=src%2Fsubnet.c;h=334729db255cf18f6d5eb2736a82063791e4c2c2;hp=d5eca5830b72043034d833da8fd8a81298f9bba1;hb=73d77dd416b87b7c4e9b6aa450f64846235cd2b4;hpb=42e01abd54bd36ee84a45a2b646cfa27034de8d1 diff --git a/src/subnet.c b/src/subnet.c index d5eca583..334729db 100644 --- a/src/subnet.c +++ b/src/subnet.c @@ -1,7 +1,7 @@ /* subnet.c -- handle subnet lookups and lists - Copyright (C) 2000-2003 Guus Sliepen , - 2000-2003 Ivo Timmermans + Copyright (C) 2000-2009 Guus Sliepen , + 2000-2005 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,16 +17,18 @@ 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.52 2003/12/12 19:52:25 guus Exp $ + $Id$ */ #include "system.h" #include "avl_tree.h" +#include "device.h" #include "logger.h" #include "net.h" #include "netutl.h" #include "node.h" +#include "process.h" #include "subnet.h" #include "utils.h" #include "xalloc.h" @@ -35,6 +37,23 @@ avl_tree_t *subnet_tree; +/* Subnet lookup cache */ + +static ipv4_t cache_ipv4_address[2]; +static subnet_t *cache_ipv4_subnet[2]; +static bool cache_ipv4_valid[2]; +static int cache_ipv4_slot; + +static ipv6_t cache_ipv6_address[2]; +static subnet_t *cache_ipv6_subnet[2]; +static bool cache_ipv6_valid[2]; +static int cache_ipv6_slot; + +void subnet_cache_flush() { + cache_ipv4_valid[0] = cache_ipv4_valid[1] = false; + cache_ipv6_valid[0] = cache_ipv6_valid[1] = false; +} + /* Subnet comparison */ static int subnet_compare_mac(const subnet_t *a, const subnet_t *b) @@ -43,6 +62,11 @@ static int subnet_compare_mac(const subnet_t *a, const subnet_t *b) result = memcmp(&a->net.mac.address, &b->net.mac.address, sizeof(mac_t)); + if(result) + return result; + + result = a->weight - b->weight; + if(result || !a->owner || !b->owner) return result; @@ -53,12 +77,17 @@ static int subnet_compare_ipv4(const subnet_t *a, const subnet_t *b) { int result; - result = memcmp(&a->net.ipv4.address, &b->net.ipv4.address, sizeof(ipv4_t)); + result = b->net.ipv4.prefixlength - a->net.ipv4.prefixlength; if(result) return result; - result = a->net.ipv4.prefixlength - b->net.ipv4.prefixlength; + result = memcmp(&a->net.ipv4.address, &b->net.ipv4.address, sizeof(ipv4_t)); + + if(result) + return result; + + result = a->weight - b->weight; if(result || !a->owner || !b->owner) return result; @@ -70,12 +99,17 @@ static int subnet_compare_ipv6(const subnet_t *a, const subnet_t *b) { int result; - result = memcmp(&a->net.ipv6.address, &b->net.ipv6.address, sizeof(ipv6_t)); + result = b->net.ipv6.prefixlength - a->net.ipv6.prefixlength; if(result) return result; + + result = memcmp(&a->net.ipv6.address, &b->net.ipv6.address, sizeof(ipv6_t)); - result = a->net.ipv6.prefixlength - b->net.ipv6.prefixlength; + if(result) + return result; + + result = a->weight - b->weight; if(result || !a->owner || !b->owner) return result; @@ -116,6 +150,8 @@ void init_subnets(void) cp(); subnet_tree = avl_alloc_tree((avl_compare_t) subnet_compare, (avl_action_t) free_subnet); + + subnet_cache_flush(); } void exit_subnets(void) @@ -165,6 +201,8 @@ void subnet_add(node_t *n, subnet_t *subnet) avl_insert(subnet_tree, subnet); avl_insert(n->subnet_tree, subnet); + + subnet_cache_flush(); } void subnet_del(node_t *n, subnet_t *subnet) @@ -173,6 +211,8 @@ void subnet_del(node_t *n, subnet_t *subnet) avl_delete(n->subnet_tree, subnet); avl_delete(subnet_tree, subnet); + + subnet_cache_flush(); } /* Ascii representation of subnets */ @@ -181,25 +221,37 @@ bool str2net(subnet_t *subnet, const char *subnetstr) { int i, l; uint16_t x[8]; + int weight = 10; cp(); - if(sscanf(subnetstr, "%hu.%hu.%hu.%hu/%d", - &x[0], &x[1], &x[2], &x[3], &l) == 5) { + if(sscanf(subnetstr, "%hu.%hu.%hu.%hu/%d#%d", + &x[0], &x[1], &x[2], &x[3], &l, &weight) >= 5) { + if(l < 0 || l > 32) + return false; + subnet->type = SUBNET_IPV4; subnet->net.ipv4.prefixlength = l; + subnet->weight = weight; - for(i = 0; i < 4; i++) + for(i = 0; i < 4; i++) { + if(x[i] > 255) + return false; subnet->net.ipv4.address.x[i] = x[i]; + } return true; } - if(sscanf(subnetstr, "%hx:%hx:%hx:%hx:%hx:%hx:%hx:%hx/%d", + if(sscanf(subnetstr, "%hx:%hx:%hx:%hx:%hx:%hx:%hx:%hx/%d#%d", &x[0], &x[1], &x[2], &x[3], &x[4], &x[5], &x[6], &x[7], - &l) == 9) { + &l, &weight) >= 9) { + if(l < 0 || l > 128) + return false; + subnet->type = SUBNET_IPV6; subnet->net.ipv6.prefixlength = l; + subnet->weight = weight; for(i = 0; i < 8; i++) subnet->net.ipv6.address.x[i] = htons(x[i]); @@ -207,20 +259,25 @@ bool str2net(subnet_t *subnet, const char *subnetstr) return true; } - if(sscanf(subnetstr, "%hu.%hu.%hu.%hu", &x[0], &x[1], &x[2], &x[3]) == 4) { + if(sscanf(subnetstr, "%hu.%hu.%hu.%hu#%d", &x[0], &x[1], &x[2], &x[3], &weight) >= 4) { subnet->type = SUBNET_IPV4; subnet->net.ipv4.prefixlength = 32; + subnet->weight = weight; - for(i = 0; i < 4; i++) + for(i = 0; i < 4; i++) { + if(x[i] > 255) + return false; subnet->net.ipv4.address.x[i] = x[i]; + } return true; } - 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) { + 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], &weight) >= 8) { subnet->type = SUBNET_IPV6; subnet->net.ipv6.prefixlength = 128; + subnet->weight = weight; for(i = 0; i < 8; i++) subnet->net.ipv6.address.x[i] = htons(x[i]); @@ -228,9 +285,10 @@ bool str2net(subnet_t *subnet, const char *subnetstr) return true; } - if(sscanf(subnetstr, "%hx:%hx:%hx:%hx:%hx:%hx", - &x[0], &x[1], &x[2], &x[3], &x[4], &x[5]) == 6) { + if(sscanf(subnetstr, "%hx:%hx:%hx:%hx:%hx:%hx#%d", + &x[0], &x[1], &x[2], &x[3], &x[4], &x[5], &weight) >= 6) { subnet->type = SUBNET_MAC; + subnet->weight = weight; for(i = 0; i < 6; i++) subnet->net.mac.address.x[i] = x[i]; @@ -245,26 +303,35 @@ bool net2str(char *netstr, int len, const subnet_t *subnet) { cp(); + if(!netstr || !subnet) { + logger(LOG_ERR, _("net2str() was called with netstr=%p, subnet=%p!\n"), netstr, subnet); + return false; + } + switch (subnet->type) { case SUBNET_MAC: - snprintf(netstr, len, "%hx:%hx:%hx:%hx:%hx:%hx", + snprintf(netstr, len, "%hx:%hx:%hx:%hx:%hx:%hx#%d", 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]); + subnet->net.mac.address.x[4], + subnet->net.mac.address.x[5], + subnet->weight); break; case SUBNET_IPV4: - snprintf(netstr, len, "%hu.%hu.%hu.%hu/%d", + snprintf(netstr, len, "%hu.%hu.%hu.%hu/%d#%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); + subnet->net.ipv4.address.x[3], + subnet->net.ipv4.prefixlength, + subnet->weight); break; case SUBNET_IPV6: - snprintf(netstr, len, "%hx:%hx:%hx:%hx:%hx:%hx:%hx:%hx/%d", + snprintf(netstr, len, "%hx:%hx:%hx:%hx:%hx:%hx:%hx:%hx/%d#%d", ntohs(subnet->net.ipv6.address.x[0]), ntohs(subnet->net.ipv6.address.x[1]), ntohs(subnet->net.ipv6.address.x[2]), @@ -273,7 +340,8 @@ bool net2str(char *netstr, int len, const subnet_t *subnet) 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); + subnet->net.ipv6.prefixlength, + subnet->weight); break; default: @@ -284,7 +352,7 @@ bool net2str(char *netstr, int len, const subnet_t *subnet) exit(0); } - return netstr; + return true; } /* Subnet lookup routines */ @@ -313,76 +381,142 @@ subnet_t *lookup_subnet_mac(const mac_t *address) subnet_t *lookup_subnet_ipv4(const ipv4_t *address) { - subnet_t *p, subnet = {0}; + subnet_t *p, *r = NULL, subnet = {0}; + avl_node_t *n; + int i; cp(); + // Check if this address is cached + + for(i = 0; i < 2; i++) { + if(!cache_ipv4_valid[i]) + continue; + if(!memcmp(address, &cache_ipv4_address[i], sizeof *address)) + return cache_ipv4_subnet[i]; + } + + // Search all subnets for a matching one + 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 */ + for(n = subnet_tree->head; n; n = n->next) { + p = n->data; + + if(!p || p->type != subnet.type) + continue; - if(p) { - if(p->type != SUBNET_IPV4) { - p = NULL; + if(!maskcmp(address, &p->net.ipv4.address, p->net.ipv4.prefixlength)) { + r = p; + if(p->owner->status.reachable) 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 */ + // Cache the result - 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); + cache_ipv4_slot = !cache_ipv4_slot; + memcpy(&cache_ipv4_address[cache_ipv4_slot], address, sizeof *address); + cache_ipv4_subnet[cache_ipv4_slot] = r; + cache_ipv4_valid[cache_ipv4_slot] = true; - return p; + return r; } subnet_t *lookup_subnet_ipv6(const ipv6_t *address) { - subnet_t *p, subnet = {0}; + subnet_t *p, *r = NULL, subnet = {0}; + avl_node_t *n; + int i; cp(); + // Check if this address is cached + + for(i = 0; i < 2; i++) { + if(!cache_ipv6_valid[i]) + continue; + if(!memcmp(address, &cache_ipv6_address[i], sizeof *address)) + return cache_ipv6_subnet[i]; + } + + // Search all subnets for a matching one + subnet.type = SUBNET_IPV6; subnet.net.ipv6.address = *address; subnet.net.ipv6.prefixlength = 128; subnet.owner = NULL; - do { - /* Go find subnet */ + for(n = subnet_tree->head; n; n = n->next) { + p = n->data; + + if(!p || p->type != subnet.type) + continue; - p = avl_search_closest_smaller(subnet_tree, &subnet); + if(!maskcmp(address, &p->net.ipv6.address, p->net.ipv6.prefixlength)) { + r = p; + if(p->owner->status.reachable) + break; + } + } - /* Check if the found subnet REALLY matches */ + // Cache the result - if(p) { - if(p->type != SUBNET_IPV6) - return NULL; + cache_ipv6_slot = !cache_ipv6_slot; + memcpy(&cache_ipv6_address[cache_ipv6_slot], address, sizeof *address); + cache_ipv6_subnet[cache_ipv6_slot] = r; + cache_ipv6_valid[cache_ipv6_slot] = true; - 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 */ + return r; +} - 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)); - } +void subnet_update(node_t *owner, subnet_t *subnet, bool up) { + avl_node_t *node; + int i; + char *envp[8]; + char netstr[MAXNETSTR + 7] = "SUBNET="; + char *name, *address, *port; + + xasprintf(&envp[0], "NETNAME=%s", netname ? : ""); + xasprintf(&envp[1], "DEVICE=%s", device ? : ""); + xasprintf(&envp[2], "INTERFACE=%s", iface ? : ""); + xasprintf(&envp[3], "NODE=%s", owner->name); + + if(owner != myself) { + sockaddr2str(&owner->address, &address, &port); + xasprintf(&envp[4], "REMOTEADDRESS=%s", address); + xasprintf(&envp[5], "REMOTEPORT=%s", port); + envp[6] = netstr; + envp[7] = NULL; + } else { + envp[4] = netstr; + envp[5] = NULL; + } + + name = up ? "subnet-up" : "subnet-down"; + + if(!subnet) { + for(node = owner->subnet_tree->head; node; node = node->next) { + subnet = node->data; + if(!net2str(netstr + 7, sizeof netstr - 7, subnet)) + continue; + execute_script(name, envp); } - } while(p); + } else { + if(net2str(netstr + 7, sizeof netstr - 7, subnet)) + execute_script(name, envp); + } - return p; + for(i = 0; i < (owner != myself ? 6 : 4); i++) + free(envp[i]); + + if(owner != myself) { + free(address); + free(port); + } } void dump_subnets(void)