projects
/
tinc
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
free() request strings when deleting past requests from the tree.
[tinc]
/
src
/
subnet.c
diff --git
a/src/subnet.c
b/src/subnet.c
index
525c14e
..
5e09625
100644
(file)
--- a/
src/subnet.c
+++ b/
src/subnet.c
@@
-17,7
+17,7
@@
along with this program; if not, write to the Free Software
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
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.3
2 2002/03/11 11:23:0
4 guus Exp $
+ $Id: subnet.c,v 1.1.2.3
3 2002/03/12 14:20:4
4 guus Exp $
*/
#include "config.h"
*/
#include "config.h"
@@
-42,10
+42,6
@@
#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 */
avl_tree_t *subnet_tree;
/* lists type of subnet */
avl_tree_t *subnet_tree;
@@
-154,20
+150,11
@@
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)
{
cp
subnet->owner = n;
void subnet_add(node_t *n, subnet_t *subnet)
{
cp
subnet->owner = n;
- cache_invalidate();
-
avl_insert(subnet_tree, subnet);
cp
avl_insert(n->subnet_tree, subnet);
avl_insert(subnet_tree, subnet);
cp
avl_insert(n->subnet_tree, subnet);
@@
-177,8
+164,6
@@
cp
void subnet_del(node_t *n, subnet_t *subnet)
{
cp
void subnet_del(node_t *n, subnet_t *subnet)
{
cp
- cache_invalidate();
-
avl_delete(n->subnet_tree, subnet);
cp
avl_delete(subnet_tree, subnet);
avl_delete(n->subnet_tree, subnet);
cp
avl_delete(subnet_tree, subnet);
@@
-304,27
+289,20
@@
cp
subnet_t *lookup_subnet_mac(mac_t *address)
{
subnet_t *lookup_subnet_mac(mac_t *address)
{
- s
tatic s
ubnet_t subnet, *p;
+ 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;
memcpy(&subnet.net.mac.address, address, sizeof(mac_t));
p = (subnet_t *)avl_search(subnet_tree, &subnet);
subnet.type = SUBNET_MAC;
memcpy(&subnet.net.mac.address, address, sizeof(mac_t));
p = (subnet_t *)avl_search(subnet_tree, &subnet);
- cache_mac_valid = 1;
cp
return p;
}
subnet_t *lookup_subnet_ipv4(ipv4_t *address)
{
cp
return p;
}
subnet_t *lookup_subnet_ipv4(ipv4_t *address)
{
- s
tatic s
ubnet_t subnet, *p;
+ 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;
memcpy(&subnet.net.ipv4.address, address, sizeof(ipv4_t));
subnet.net.ipv4.masklength = 32;
subnet.type = SUBNET_IPV4;
memcpy(&subnet.net.ipv4.address, address, sizeof(ipv4_t));
subnet.net.ipv4.masklength = 32;
@@
-356,20
+334,14
@@
cp
}
}
} while (p);
}
}
} while (p);
-
- memcpy(&subnet.net.ipv4.address, address, sizeof(ipv4_t));
- cache_ipv4_valid = 1;
cp
return p;
}
subnet_t *lookup_subnet_ipv6(ipv6_t *address)
{
cp
return p;
}
subnet_t *lookup_subnet_ipv6(ipv6_t *address)
{
- s
tatic s
ubnet_t subnet, *p;
+ 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;
memcpy(&subnet.net.ipv6.address, address, sizeof(ipv6_t));
subnet.net.ipv6.masklength = 128;
subnet.type = SUBNET_IPV6;
memcpy(&subnet.net.ipv6.address, address, sizeof(ipv6_t));
subnet.net.ipv6.masklength = 128;
@@
-399,9
+371,6
@@
cp
}
}
} while (p);
}
}
} while (p);
-
- memcpy(&subnet.net.ipv6.address, address, sizeof(ipv6_t));
- cache_ipv6_valid = 1;
cp
return p;
}
cp
return p;
}