X-Git-Url: https://tinc-vpn.org/git/browse?a=blobdiff_plain;f=src%2Fsubnet.c;h=9d84ec2b946427b60d36d03cfd89a6e35198fded;hb=6eaefb4dbce240334e35f67d9f3db5d4f44e49c9;hp=984cc7f8ece644ff2f2ec80cd6054366efe3fba1;hpb=c46f56a8b8bb865dd8951441b5acf4701b5b5b09;p=tinc diff --git a/src/subnet.c b/src/subnet.c index 984cc7f8..9d84ec2b 100644 --- a/src/subnet.c +++ b/src/subnet.c @@ -1,7 +1,7 @@ /* subnet.c -- handle subnet lookups and lists - Copyright (C) 2000-2004 Guus Sliepen , - 2000-2004 Ivo Timmermans + Copyright (C) 2000-2006 Guus Sliepen , + 2000-2005 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 @@ -22,7 +22,7 @@ #include "system.h" -#include "avl_tree.h" +#include "splay_tree.h" #include "device.h" #include "logger.h" #include "net.h" @@ -35,7 +35,7 @@ /* lists type of subnet */ -avl_tree_t *subnet_tree; +splay_tree_t *subnet_tree; /* Subnet comparison */ @@ -117,28 +117,28 @@ void init_subnets(void) { 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(); - 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(); - 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(); - avl_delete_tree(subnet_tree); + splay_delete_tree(subnet_tree); } /* Allocating and freeing space for subnets */ @@ -165,16 +165,16 @@ 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); } 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 */ @@ -247,6 +247,11 @@ bool net2str(char *netstr, int len, const subnet_t *subnet) { 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", @@ -295,7 +300,7 @@ subnet_t *lookup_subnet(const node_t *owner, const subnet_t *subnet) { cp(); - return avl_search(owner->subnet_tree, subnet); + return splay_search(owner->subnet_tree, subnet); } 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; - p = avl_search(subnet_tree, &subnet); + p = splay_search(subnet_tree, &subnet); return p; } @@ -327,7 +332,7 @@ subnet_t *lookup_subnet_ipv4(const ipv4_t *address) 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 */ @@ -337,7 +342,7 @@ subnet_t *lookup_subnet_ipv4(const ipv4_t *address) 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 */ @@ -365,7 +370,7 @@ subnet_t *lookup_subnet_ipv6(const ipv6_t *address) 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 */ @@ -373,7 +378,7 @@ subnet_t *lookup_subnet_ipv6(const ipv6_t *address) 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 */ @@ -388,7 +393,7 @@ 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[8]; char netstr[MAXNETSTR + 7] = "SUBNET="; @@ -398,6 +403,7 @@ void subnet_update(node_t *owner, subnet_t *subnet, bool up) { asprintf(&envp[1], "DEVICE=%s", device ? : ""); asprintf(&envp[2], "INTERFACE=%s", iface ? : ""); asprintf(&envp[3], "NODE=%s", owner->name); + if(owner != myself) { sockaddr2str(&owner->address, &address, &port); asprintf(&envp[4], "REMOTEADDRESS=%s", address); @@ -423,32 +429,31 @@ void subnet_update(node_t *owner, subnet_t *subnet, bool up) { 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]); - free(address); - free(port); + if(owner != myself) { + free(address); + free(port); + } } -void dump_subnets(void) +int dump_subnets(struct evbuffer *out) { char netstr[MAXNETSTR]; subnet_t *subnet; - avl_node_t *node; + splay_node_t *node; 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; - 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; }