projects
/
tinc
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' into 1.1
[tinc]
/
src
/
subnet.c
diff --git
a/src/subnet.c
b/src/subnet.c
index
9547829
..
75fe31f
100644
(file)
--- a/
src/subnet.c
+++ b/
src/subnet.c
@@
-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 lookup cache */
/* Subnet lookup cache */
@@
-60,7
+60,7
@@
static int subnet_compare_mac(const subnet_t *a, const subnet_t *b)
{
int result;
{
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;
if(result)
return result;
@@
-149,7
+149,7
@@
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);
subnet_cache_flush();
}
subnet_cache_flush();
}
@@
-158,21
+158,21
@@
void exit_subnets(void)
{
cp();
{
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 */
@@
-199,8
+199,8
@@
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);
subnet_cache_flush();
}
subnet_cache_flush();
}
@@
-209,8
+209,8
@@
void subnet_del(node_t *n, subnet_t *subnet)
{
cp();
{
cp();
-
avl
_delete(n->subnet_tree, subnet);
-
avl
_delete(subnet_tree, subnet);
+
splay
_delete(n->subnet_tree, subnet);
+
splay
_delete(subnet_tree, subnet);
subnet_cache_flush();
}
subnet_cache_flush();
}
@@
-361,7
+361,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)
@@
-374,7
+374,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;
}
@@
-382,7
+382,7
@@
subnet_t *lookup_subnet_mac(const mac_t *address)
subnet_t *lookup_subnet_ipv4(const ipv4_t *address)
{
subnet_t *p, *r = NULL, subnet = {0};
subnet_t *lookup_subnet_ipv4(const ipv4_t *address)
{
subnet_t *p, *r = NULL, subnet = {0};
-
avl
_node_t *n;
+
splay
_node_t *n;
int i;
cp();
int i;
cp();
@@
-429,7
+429,7
@@
subnet_t *lookup_subnet_ipv4(const ipv4_t *address)
subnet_t *lookup_subnet_ipv6(const ipv6_t *address)
{
subnet_t *p, *r = NULL, subnet = {0};
subnet_t *lookup_subnet_ipv6(const ipv6_t *address)
{
subnet_t *p, *r = NULL, subnet = {0};
-
avl
_node_t *n;
+
splay
_node_t *n;
int i;
cp();
int i;
cp();
@@
-474,7
+474,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=";
@@
-519,22
+519,22
@@
void subnet_update(node_t *owner, subnet_t *subnet, bool up) {
}
}
}
}
-
void dump_subnets(void
)
+
int dump_subnets(struct evbuffer *out
)
{
char netstr[MAXNETSTR];
subnet_t *subnet;
{
char netstr[MAXNETSTR];
subnet_t *subnet;
-
avl
_node_t *node;
+
splay
_node_t *node;
cp();
cp();
- logger(LOG_DEBUG, _("Subnet list:"));
-
for(node = subnet_tree->head; node; node = node->next) {
subnet = node->data;
if(!net2str(netstr, sizeof netstr, subnet))
continue;
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);
+ if(evbuffer_add_printf(out, _(" %s owner %s\n"),
+ netstr, subnet->owner->name) == -1)
+ return errno;
}
}
-
logger(LOG_DEBUG, _("End of subnet list."))
;
+
return 0
;
}
}