projects
/
tinc
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Use splay trees instead of AVL trees.
[tinc]
/
src
/
subnet.c
diff --git
a/src/subnet.c
b/src/subnet.c
index
b52dfa5
..
bbf4edd
100644
(file)
--- a/
src/subnet.c
+++ b/
src/subnet.c
@@
-1,7
+1,7
@@
/*
subnet.c -- handle subnet lookups and lists
/*
subnet.c -- handle subnet lookups and lists
- Copyright (C) 2000-200
4
Guus Sliepen <guus@tinc-vpn.org>,
- 2000-200
4 Ivo Timmermans <ivo@tinc-vpn.org>
+ Copyright (C) 2000-200
6
Guus Sliepen <guus@tinc-vpn.org>,
+ 2000-200
5 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
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
@@
-22,7
+22,7
@@
#include "system.h"
#include "system.h"
-#include "
avl
_tree.h"
+#include "
splay
_tree.h"
#include "device.h"
#include "logger.h"
#include "net.h"
#include "device.h"
#include "logger.h"
#include "net.h"
@@
-35,7
+35,7
@@
/* lists type of subnet */
/* lists type of subnet */
-
avl
_tree_t *subnet_tree;
+
splay
_tree_t *subnet_tree;
/* Subnet comparison */
/* Subnet comparison */
@@
-117,28
+117,28
@@
void init_subnets(void)
{
cp();
{
cp();
- subnet_tree =
avl_alloc_tree((avl_compare_t) subnet_compare, (avl
_action_t) free_subnet);
+ subnet_tree =
splay_alloc_tree((splay_compare_t) subnet_compare, (splay
_action_t) free_subnet);
}
void exit_subnets(void)
{
cp();
}
void exit_subnets(void)
{
cp();
-
avl
_delete_tree(subnet_tree);
+
splay
_delete_tree(subnet_tree);
}
}
-
avl
_tree_t *new_subnet_tree(void)
+
splay
_tree_t *new_subnet_tree(void)
{
cp();
{
cp();
- return
avl_alloc_tree((avl
_compare_t) subnet_compare, NULL);
+ return
splay_alloc_tree((splay
_compare_t) subnet_compare, NULL);
}
}
-void free_subnet_tree(
avl
_tree_t *subnet_tree)
+void free_subnet_tree(
splay
_tree_t *subnet_tree)
{
cp();
{
cp();
-
avl
_delete_tree(subnet_tree);
+
splay
_delete_tree(subnet_tree);
}
/* Allocating and freeing space for subnets */
}
/* Allocating and freeing space for subnets */
@@
-165,16
+165,16
@@
void subnet_add(node_t *n, subnet_t *subnet)
subnet->owner = n;
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);
}
void subnet_del(node_t *n, subnet_t *subnet)
{
cp();
}
void subnet_del(node_t *n, subnet_t *subnet)
{
cp();
-
avl
_delete(n->subnet_tree, subnet);
-
avl
_delete(subnet_tree, subnet);
+
splay
_delete(n->subnet_tree, subnet);
+
splay
_delete(subnet_tree, subnet);
}
/* Ascii representation of subnets */
}
/* Ascii representation of subnets */
@@
-247,6
+247,11
@@
bool net2str(char *netstr, int len, const subnet_t *subnet)
{
cp();
{
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",
switch (subnet->type) {
case SUBNET_MAC:
snprintf(netstr, len, "%hx:%hx:%hx:%hx:%hx:%hx",
@@
-295,7
+300,7
@@
subnet_t *lookup_subnet(const node_t *owner, const subnet_t *subnet)
{
cp();
{
cp();
- return
avl
_search(owner->subnet_tree, subnet);
+ return
splay
_search(owner->subnet_tree, subnet);
}
subnet_t *lookup_subnet_mac(const mac_t *address)
}
subnet_t *lookup_subnet_mac(const mac_t *address)
@@
-308,7
+313,7
@@
subnet_t *lookup_subnet_mac(const mac_t *address)
subnet.net.mac.address = *address;
subnet.owner = NULL;
subnet.net.mac.address = *address;
subnet.owner = NULL;
- p =
avl
_search(subnet_tree, &subnet);
+ p =
splay
_search(subnet_tree, &subnet);
return p;
}
return p;
}
@@
-327,7
+332,7
@@
subnet_t *lookup_subnet_ipv4(const ipv4_t *address)
do {
/* Go find subnet */
do {
/* Go find subnet */
- p =
avl
_search_closest_smaller(subnet_tree, &subnet);
+ p =
splay
_search_closest_smaller(subnet_tree, &subnet);
/* Check if the found subnet REALLY matches */
/* Check if the found subnet REALLY matches */
@@
-337,7
+342,7
@@
subnet_t *lookup_subnet_ipv4(const ipv4_t *address)
break;
}
break;
}
- if(!maskcmp(address, &p->net.ipv4.address, p->net.ipv4.prefixlength
, sizeof(ipv4_t)
))
+ if(!maskcmp(address, &p->net.ipv4.address, p->net.ipv4.prefixlength))
break;
else {
/* Otherwise, see if there is a bigger enclosing subnet */
break;
else {
/* Otherwise, see if there is a bigger enclosing subnet */
@@
-365,7
+370,7
@@
subnet_t *lookup_subnet_ipv6(const ipv6_t *address)
do {
/* Go find subnet */
do {
/* Go find subnet */
- p =
avl
_search_closest_smaller(subnet_tree, &subnet);
+ p =
splay
_search_closest_smaller(subnet_tree, &subnet);
/* Check if the found subnet REALLY matches */
/* Check if the found subnet REALLY matches */
@@
-373,7
+378,7
@@
subnet_t *lookup_subnet_ipv6(const ipv6_t *address)
if(p->type != SUBNET_IPV6)
return NULL;
if(p->type != SUBNET_IPV6)
return NULL;
- if(!maskcmp(address, &p->net.ipv6.address, p->net.ipv6.prefixlength
, sizeof(ipv6_t)
))
+ if(!maskcmp(address, &p->net.ipv6.address, p->net.ipv6.prefixlength))
break;
else {
/* Otherwise, see if there is a bigger enclosing subnet */
break;
else {
/* Otherwise, see if there is a bigger enclosing subnet */
@@
-388,7
+393,7
@@
subnet_t *lookup_subnet_ipv6(const ipv6_t *address)
}
void subnet_update(node_t *owner, subnet_t *subnet, bool up) {
}
void subnet_update(node_t *owner, subnet_t *subnet, bool up) {
-
avl
_node_t *node;
+
splay
_node_t *node;
int i;
char *envp[8];
char netstr[MAXNETSTR + 7] = "SUBNET=";
int i;
char *envp[8];
char netstr[MAXNETSTR + 7] = "SUBNET=";
@@
-424,9
+429,6
@@
void subnet_update(node_t *owner, subnet_t *subnet, bool up) {
execute_script(name, envp);
}
execute_script(name, envp);
}
- net2str(netstr, sizeof netstr, subnet);
- envp[6] = envp[7] = NULL;
-
for(i = 0; i < (owner != myself ? 6 : 4); i++)
free(envp[i]);
for(i = 0; i < (owner != myself ? 6 : 4); i++)
free(envp[i]);
@@
-440,7
+442,7
@@
void dump_subnets(void)
{
char netstr[MAXNETSTR];
subnet_t *subnet;
{
char netstr[MAXNETSTR];
subnet_t *subnet;
-
avl
_node_t *node;
+
splay
_node_t *node;
cp();
cp();