X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;f=src%2Fsubnet.c;h=63d169fe2e4abac6ec263827b6e11b536b401be4;hb=86c2990327fdf7ec1197aa73cb2b9a926a734db4;hp=3c7ccc536eecfea2e7ab52bbd4d4d35d192e9916;hpb=ab7c61b06f6c6e991225f2fcc32d02b8e1084aee;p=meshlink diff --git a/src/subnet.c b/src/subnet.c index 3c7ccc53..63d169fe 100644 --- a/src/subnet.c +++ b/src/subnet.c @@ -1,6 +1,6 @@ /* subnet.c -- handle subnet lookups and lists - Copyright (C) 2000-2009 Guus Sliepen , + Copyright (C) 2000-2010 Guus Sliepen , 2000-2005 Ivo Timmermans This program is free software; you can redistribute it and/or modify @@ -20,7 +20,8 @@ #include "system.h" -#include "avl_tree.h" +#include "splay_tree.h" +#include "control_common.h" #include "device.h" #include "logger.h" #include "net.h" @@ -33,7 +34,7 @@ /* lists type of subnet */ -avl_tree_t *subnet_tree; +splay_tree_t *subnet_tree; /* Subnet lookup cache */ @@ -47,18 +48,23 @@ static subnet_t *cache_ipv6_subnet[2]; static bool cache_ipv6_valid[2]; static int cache_ipv6_slot; -void subnet_cache_flush() { +static mac_t cache_mac_address[2]; +static subnet_t *cache_mac_subnet[2]; +static bool cache_mac_valid[2]; +static int cache_mac_slot; + +void subnet_cache_flush(void) { cache_ipv4_valid[0] = cache_ipv4_valid[1] = false; cache_ipv6_valid[0] = cache_ipv6_valid[1] = false; + cache_mac_valid[0] = cache_mac_valid[1] = false; } /* Subnet comparison */ -static int subnet_compare_mac(const subnet_t *a, const subnet_t *b) -{ +static int subnet_compare_mac(const subnet_t *a, const subnet_t *b) { int result; - result = memcmp(&a->net.mac.address, &b->net.mac.address, sizeof(mac_t)); + result = memcmp(&a->net.mac.address, &b->net.mac.address, sizeof a->net.mac.address); if(result) return result; @@ -71,8 +77,7 @@ static int subnet_compare_mac(const subnet_t *a, const subnet_t *b) return strcmp(a->owner->name, b->owner->name); } -static int subnet_compare_ipv4(const subnet_t *a, const subnet_t *b) -{ +static int subnet_compare_ipv4(const subnet_t *a, const subnet_t *b) { int result; result = b->net.ipv4.prefixlength - a->net.ipv4.prefixlength; @@ -93,8 +98,7 @@ static int subnet_compare_ipv4(const subnet_t *a, const subnet_t *b) return strcmp(a->owner->name, b->owner->name); } -static int subnet_compare_ipv6(const subnet_t *a, const subnet_t *b) -{ +static int subnet_compare_ipv6(const subnet_t *a, const subnet_t *b) { int result; result = b->net.ipv6.prefixlength - a->net.ipv6.prefixlength; @@ -115,8 +119,7 @@ static int subnet_compare_ipv6(const subnet_t *a, const subnet_t *b) return strcmp(a->owner->name, b->owner->name); } -int subnet_compare(const subnet_t *a, const subnet_t *b) -{ +int subnet_compare(const subnet_t *a, const subnet_t *b) { int result; result = a->type - b->type; @@ -132,9 +135,8 @@ int subnet_compare(const subnet_t *a, const subnet_t *b) case SUBNET_IPV6: return subnet_compare_ipv6(a, b); default: - logger(LOG_ERR, _("subnet_compare() was called with unknown subnet type %d, exitting!"), + logger(DEBUG_ALWAYS, LOG_ERR, "subnet_compare() was called with unknown subnet type %d, exitting!", a->type); - cp_trace(); exit(0); } @@ -143,86 +145,59 @@ int subnet_compare(const subnet_t *a, const subnet_t *b) /* Initialising trees */ -void init_subnets(void) -{ - cp(); - - subnet_tree = avl_alloc_tree((avl_compare_t) subnet_compare, (avl_action_t) free_subnet); +void init_subnets(void) { + subnet_tree = splay_alloc_tree((splay_compare_t) subnet_compare, (splay_action_t) free_subnet); subnet_cache_flush(); } -void exit_subnets(void) -{ - cp(); - - avl_delete_tree(subnet_tree); +void exit_subnets(void) { + splay_delete_tree(subnet_tree); } -avl_tree_t *new_subnet_tree(void) -{ - cp(); - - return avl_alloc_tree((avl_compare_t) subnet_compare, NULL); +splay_tree_t *new_subnet_tree(void) { + return splay_alloc_tree((splay_compare_t) subnet_compare, NULL); } -void free_subnet_tree(avl_tree_t *subnet_tree) -{ - cp(); - - avl_delete_tree(subnet_tree); +void free_subnet_tree(splay_tree_t *subnet_tree) { + splay_delete_tree(subnet_tree); } /* Allocating and freeing space for subnets */ -subnet_t *new_subnet(void) -{ - cp(); - +subnet_t *new_subnet(void) { return xmalloc_and_zero(sizeof(subnet_t)); } -void free_subnet(subnet_t *subnet) -{ - cp(); - +void free_subnet(subnet_t *subnet) { free(subnet); } /* Adding and removing subnets */ -void subnet_add(node_t *n, subnet_t *subnet) -{ - cp(); - +void subnet_add(node_t *n, subnet_t *subnet) { subnet->owner = n; - avl_insert(subnet_tree, subnet); - avl_insert(n->subnet_tree, subnet); + splay_insert(subnet_tree, subnet); + splay_insert(n->subnet_tree, subnet); subnet_cache_flush(); } -void subnet_del(node_t *n, subnet_t *subnet) -{ - cp(); - - avl_delete(n->subnet_tree, subnet); - avl_delete(subnet_tree, subnet); +void subnet_del(node_t *n, subnet_t *subnet) { + splay_delete(n->subnet_tree, subnet); + splay_delete(subnet_tree, subnet); subnet_cache_flush(); } /* Ascii representation of subnets */ -bool str2net(subnet_t *subnet, const char *subnetstr) -{ +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#%d", &x[0], &x[1], &x[2], &x[3], &l, &weight) >= 5) { if(l < 0 || l > 32) @@ -294,15 +269,84 @@ bool str2net(subnet_t *subnet, const char *subnetstr) return true; } + // IPv6 short form + if(strstr(subnetstr, "::")) { + const char *p; + char *q; + int colons = 0; + + // Count number of colons + for(p = subnetstr; *p; p++) + if(*p == ':') + colons++; + + if(colons > 7) + return false; + + // Scan numbers before the double colon + p = subnetstr; + for(i = 0; i < colons; i++) { + if(*p == ':') + break; + x[i] = strtoul(p, &q, 0x10); + if(!q || p == q || *q != ':') + return false; + p = ++q; + } + + p++; + colons -= i; + if(!i) { + p++; + colons--; + } + + if(!*p || *p == '/' || *p == '#') + colons--; + + // Fill in the blanks + for(; i < 8 - colons; i++) + x[i] = 0; + + // Scan the remaining numbers + for(; i < 8; i++) { + x[i] = strtoul(p, &q, 0x10); + if(!q || p == q) + return false; + if(i == 7) { + p = q; + break; + } + if(*q != ':') + return false; + p = ++q; + } + + l = 128; + if(*p == '/') + sscanf(p, "/%d#%d", &l, &weight); + else if(*p == '#') + sscanf(p, "#%d", &weight); + + 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]); + + return true; + } + return false; } -bool net2str(char *netstr, int len, const subnet_t *subnet) -{ - cp(); - +bool net2str(char *netstr, int len, const subnet_t *subnet) { if(!netstr || !subnet) { - logger(LOG_ERR, _("net2str() was called with netstr=%p, subnet=%p!\n"), netstr, subnet); + logger(DEBUG_ALWAYS, LOG_ERR, "net2str() was called with netstr=%p, subnet=%p!", netstr, subnet); return false; } @@ -343,10 +387,9 @@ bool net2str(char *netstr, int len, const subnet_t *subnet) break; default: - logger(LOG_ERR, - _("net2str() was called with unknown subnet type %d, exiting!"), + logger(DEBUG_ALWAYS, LOG_ERR, + "net2str() was called with unknown subnet type %d, exiting!", subnet->type); - cp_trace(); exit(0); } @@ -355,36 +398,56 @@ bool net2str(char *netstr, int len, const subnet_t *subnet) /* Subnet lookup routines */ -subnet_t *lookup_subnet(const node_t *owner, const subnet_t *subnet) -{ - cp(); - - return avl_search(owner->subnet_tree, subnet); +subnet_t *lookup_subnet(const node_t *owner, const subnet_t *subnet) { + return splay_search(owner->subnet_tree, subnet); } -subnet_t *lookup_subnet_mac(const mac_t *address) -{ - subnet_t *p, subnet = {0}; +subnet_t *lookup_subnet_mac(const node_t *owner, const mac_t *address) { + subnet_t *p, *r = NULL; + splay_node_t *n; + int i; - cp(); + // Check if this address is cached - subnet.type = SUBNET_MAC; - subnet.net.mac.address = *address; - subnet.owner = NULL; + for(i = 0; i < 2; i++) { + if(!cache_mac_valid[i]) + continue; + if(owner && cache_mac_subnet[i] && cache_mac_subnet[i]->owner != owner) + continue; + if(!memcmp(address, &cache_mac_address[i], sizeof *address)) + return cache_mac_subnet[i]; + } - p = avl_search(subnet_tree, &subnet); + // Search all subnets for a matching one - return p; + for(n = owner ? owner->subnet_tree->head : subnet_tree->head; n; n = n->next) { + p = n->data; + + if(!p || p->type != SUBNET_MAC) + continue; + + if(!memcmp(address, &p->net.mac.address, sizeof *address)) { + r = p; + if(p->owner->status.reachable) + break; + } + } + + // Cache the result + + cache_mac_slot = !cache_mac_slot; + memcpy(&cache_mac_address[cache_mac_slot], address, sizeof *address); + cache_mac_subnet[cache_mac_slot] = r; + cache_mac_valid[cache_mac_slot] = true; + + return r; } -subnet_t *lookup_subnet_ipv4(const ipv4_t *address) -{ - subnet_t *p, *r = NULL, subnet = {0}; - avl_node_t *n; +subnet_t *lookup_subnet_ipv4(const ipv4_t *address) { + subnet_t *p, *r = NULL; + splay_node_t *n; int i; - cp(); - // Check if this address is cached for(i = 0; i < 2; i++) { @@ -396,15 +459,10 @@ subnet_t *lookup_subnet_ipv4(const ipv4_t *address) // Search all subnets for a matching one - subnet.type = SUBNET_IPV4; - subnet.net.ipv4.address = *address; - subnet.net.ipv4.prefixlength = 32; - subnet.owner = NULL; - for(n = subnet_tree->head; n; n = n->next) { p = n->data; - if(!p || p->type != subnet.type) + if(!p || p->type != SUBNET_IPV4) continue; if(!maskcmp(address, &p->net.ipv4.address, p->net.ipv4.prefixlength)) { @@ -424,14 +482,11 @@ subnet_t *lookup_subnet_ipv4(const ipv4_t *address) return r; } -subnet_t *lookup_subnet_ipv6(const ipv6_t *address) -{ - subnet_t *p, *r = NULL, subnet = {0}; - avl_node_t *n; +subnet_t *lookup_subnet_ipv6(const ipv6_t *address) { + subnet_t *p, *r = NULL; + splay_node_t *n; int i; - cp(); - // Check if this address is cached for(i = 0; i < 2; i++) { @@ -443,15 +498,10 @@ subnet_t *lookup_subnet_ipv6(const ipv6_t *address) // Search all subnets for a matching one - subnet.type = SUBNET_IPV6; - subnet.net.ipv6.address = *address; - subnet.net.ipv6.prefixlength = 128; - subnet.owner = NULL; - for(n = subnet_tree->head; n; n = n->next) { p = n->data; - if(!p || p->type != subnet.type) + if(!p || p->type != SUBNET_IPV6) continue; if(!maskcmp(address, &p->net.ipv6.address, p->net.ipv6.prefixlength)) { @@ -472,9 +522,9 @@ subnet_t *lookup_subnet_ipv6(const ipv6_t *address) } void subnet_update(node_t *owner, subnet_t *subnet, bool up) { - avl_node_t *node; + splay_node_t *node; int i; - char *envp[9] = {0}; + char *envp[9] = {NULL}; char netstr[MAXNETSTR]; char *name, *address, *port; char empty[] = ""; @@ -491,6 +541,8 @@ void subnet_update(node_t *owner, subnet_t *subnet, bool up) { // 4 and 5 are reserved for SUBNET and WEIGHT xasprintf(&envp[6], "REMOTEADDRESS=%s", address); xasprintf(&envp[7], "REMOTEPORT=%s", port); + free(port); + free(address); } name = up ? "subnet-up" : "subnet-down"; @@ -501,7 +553,7 @@ void subnet_update(node_t *owner, subnet_t *subnet, bool up) { if(!net2str(netstr, sizeof netstr, subnet)) continue; // Strip the weight from the subnet, and put it in its own environment variable - char *weight = strchr(netstr + 7, '#'); + char *weight = strchr(netstr, '#'); if(weight) *weight++ = 0; else @@ -518,9 +570,9 @@ void subnet_update(node_t *owner, subnet_t *subnet, bool up) { execute_script(name, envp); } } else { - if(net2str(netstr + 7, sizeof netstr - 7, subnet)) { + if(net2str(netstr, sizeof netstr, subnet)) { // Strip the weight from the subnet, and put it in its own environment variable - char *weight = strchr(netstr + 7, '#'); + char *weight = strchr(netstr, '#'); if(weight) *weight++ = 0; else @@ -534,26 +586,23 @@ void subnet_update(node_t *owner, subnet_t *subnet, bool up) { } } - for(i = 0; envp[i] && i < 9; i++) + for(i = 0; envp[i] && i < 8; i++) free(envp[i]); } -void dump_subnets(void) -{ +bool dump_subnets(connection_t *c) { char netstr[MAXNETSTR]; subnet_t *subnet; - avl_node_t *node; - - cp(); - - logger(LOG_DEBUG, _("Subnet list:")); + splay_node_t *node; for(node = subnet_tree->head; node; node = node->next) { subnet = node->data; if(!net2str(netstr, sizeof netstr, subnet)) continue; - logger(LOG_DEBUG, _(" %s owner %s"), netstr, subnet->owner->name); + send_request(c, "%d %d %s owner %s", + CONTROL, REQ_DUMP_SUBNETS, + netstr, subnet->owner->name); } - logger(LOG_DEBUG, _("End of subnet list.")); + return send_request(c, "%d %d", CONTROL, REQ_DUMP_SUBNETS); }