j3d1/tinc
1
0
Fork 0
Code Issues 1 Pull requests Releases Wiki Activity

Cache results of lookup_subnet_...().

Browse source
This commit is contained in:
Guus Sliepen 2002-02-20 17:16:15 +00:00
parent e8e69460a7
commit 626d5956d2
1 changed files with 41 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

44
src/subnet.c
View file

@ -17,7 +17,7 @@
along with this program; if not, write to the Free Software along with this program; if not, write to the Free Software
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
$Id: subnet.c,v 1.1.2.30 2002/02/18 16:25:19 guus Exp $ $Id: subnet.c,v 1.1.2.31 2002/02/20 17:16:15 guus Exp $
*/ */
#include "config.h" #include "config.h"
@ -42,6 +42,10 @@
#include "system.h" #include "system.h"
int cache_mac_valid = 0;
int cache_ipv4_valid = 0;
int cache_ipv6_valid = 0;
/* lists type of subnet */ /* lists type of subnet */
avl_tree_t *subnet_tree; avl_tree_t *subnet_tree;
@ -150,11 +154,20 @@ cp
/* Adding and removing subnets */ /* Adding and removing subnets */
void cache_invalidate(void)
{
cache_mac_valid = 0;
cache_ipv4_valid = 0;
cache_ipv6_valid = 0;
}
void subnet_add(node_t *n, subnet_t *subnet) void subnet_add(node_t *n, subnet_t *subnet)
{ {
cp cp
subnet->owner = n; subnet->owner = n;
cache_invalidate();
avl_insert(subnet_tree, subnet); avl_insert(subnet_tree, subnet);
cp cp
avl_insert(n->subnet_tree, subnet); avl_insert(n->subnet_tree, subnet);
@ -164,6 +177,8 @@ cp
void subnet_del(node_t *n, subnet_t *subnet) void subnet_del(node_t *n, subnet_t *subnet)
{ {
cp cp
cache_invalidate();
avl_delete(n->subnet_tree, subnet); avl_delete(n->subnet_tree, subnet);
cp cp
avl_delete(subnet_tree, subnet); avl_delete(subnet_tree, subnet);
@ -289,20 +304,27 @@ cp
subnet_t *lookup_subnet_mac(mac_t *address) subnet_t *lookup_subnet_mac(mac_t *address)
{ {
subnet_t subnet, *p; static subnet_t subnet, *p;
cp cp
if(cache_mac_valid && !memcmp(&subnet.net.mac.address, address, sizeof(mac_t)))
return p;
subnet.type = SUBNET_MAC; subnet.type = SUBNET_MAC;
memcpy(&subnet.net.mac.address, address, sizeof(mac_t)); memcpy(&subnet.net.mac.address, address, sizeof(mac_t));
p = (subnet_t *)avl_search(subnet_tree, &subnet); p = (subnet_t *)avl_search(subnet_tree, &subnet);
cache_mac_valid = 1;
cp cp
return p; return p;
} }
subnet_t *lookup_subnet_ipv4(ipv4_t *address) subnet_t *lookup_subnet_ipv4(ipv4_t *address)
{ {
subnet_t subnet, *p; static subnet_t subnet, *p;
cp cp
if(cache_ipv4_valid && !memcmp(&subnet.net.ipv4.address, address, sizeof(ipv4_t)))
return p;
subnet.type = SUBNET_IPV4; subnet.type = SUBNET_IPV4;
memcpy(&subnet.net.ipv4.address, address, sizeof(ipv4_t)); memcpy(&subnet.net.ipv4.address, address, sizeof(ipv4_t));
subnet.net.ipv4.masklength = 32; subnet.net.ipv4.masklength = 32;
@ -318,7 +340,10 @@ cp
if(p) if(p)
{ {
if(p->type != SUBNET_IPV4) if(p->type != SUBNET_IPV4)
return NULL; {
p = NULL;
break;
}
if (!maskcmp((char *)address, (char *)&p->net.ipv4.address, p->net.ipv4.masklength, sizeof(ipv4_t))) if (!maskcmp((char *)address, (char *)&p->net.ipv4.address, p->net.ipv4.masklength, sizeof(ipv4_t)))
break; break;
@ -332,13 +357,19 @@ cp
} }
} while (p); } while (p);
memcpy(&subnet.net.ipv4.address, address, sizeof(ipv4_t));
cache_ipv4_valid = 1;
cp
return p; return p;
} }
subnet_t *lookup_subnet_ipv6(ipv6_t *address) subnet_t *lookup_subnet_ipv6(ipv6_t *address)
{ {
subnet_t subnet, *p; static subnet_t subnet, *p;
cp cp
if(cache_ipv6_valid && !memcmp(&subnet.net.ipv6.address, address, sizeof(ipv6_t)))
return p;
subnet.type = SUBNET_IPV6; subnet.type = SUBNET_IPV6;
memcpy(&subnet.net.ipv6.address, address, sizeof(ipv6_t)); memcpy(&subnet.net.ipv6.address, address, sizeof(ipv6_t));
subnet.net.ipv6.masklength = 128; subnet.net.ipv6.masklength = 128;
@ -369,6 +400,9 @@ cp
} }
} while (p); } while (p);
memcpy(&subnet.net.ipv6.address, address, sizeof(ipv6_t));
cache_ipv6_valid = 1;
cp
return p; return p;
} }