X-Git-Url: https://tinc-vpn.org/git/browse?a=blobdiff_plain;f=src%2Fsubnet.c;h=1cb816390465fda49cc0bf762ee645f05d50167a;hb=7ea85043ac1fb2096baea44f6b0af27ac0d0b2cf;hp=baef115b2ccb85f29e665198a43f868896d552a3;hpb=c217d214f4f071c235bc7c463a1da6124e2570a6;p=tinc

diff --git a/src/subnet.c b/src/subnet.c
index baef115b..1cb81639 100644
--- a/src/subnet.c
+++ b/src/subnet.c
@@ -13,14 +13,14 @@
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
     GNU General Public License for more details.
 
-    You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+    You should have received a copy of the GNU General Public License along
+    with this program; if not, write to the Free Software Foundation, Inc.,
+    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
 
 #include "system.h"
 
-#include "avl_tree.h"
+#include "splay_tree.h"
 #include "device.h"
 #include "logger.h"
 #include "net.h"
@@ -33,7 +33,7 @@
 
 /* lists type of subnet */
 
-avl_tree_t *subnet_tree;
+splay_tree_t *subnet_tree;
 
 /* Subnet lookup cache */
 
@@ -54,11 +54,10 @@ void subnet_cache_flush() {
 
 /* Subnet comparison */
 
-static int subnet_compare_mac(const subnet_t *a, const subnet_t *b)
-{
+static int subnet_compare_mac(const subnet_t *a, const subnet_t *b) {
 	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;
@@ -71,8 +70,7 @@ static int subnet_compare_mac(const subnet_t *a, const subnet_t *b)
 	return strcmp(a->owner->name, b->owner->name);
 }
 
-static int subnet_compare_ipv4(const subnet_t *a, const subnet_t *b)
-{
+static int subnet_compare_ipv4(const subnet_t *a, const subnet_t *b) {
 	int result;
 
 	result = b->net.ipv4.prefixlength - a->net.ipv4.prefixlength;
@@ -93,8 +91,7 @@ static int subnet_compare_ipv4(const subnet_t *a, const subnet_t *b)
 	return strcmp(a->owner->name, b->owner->name);
 }
 
-static int subnet_compare_ipv6(const subnet_t *a, const subnet_t *b)
-{
+static int subnet_compare_ipv6(const subnet_t *a, const subnet_t *b) {
 	int result;
 
 	result = b->net.ipv6.prefixlength - a->net.ipv6.prefixlength;
@@ -115,8 +112,7 @@ static int subnet_compare_ipv6(const subnet_t *a, const subnet_t *b)
 	return strcmp(a->owner->name, b->owner->name);
 }
 
-int subnet_compare(const subnet_t *a, const subnet_t *b)
-{
+int subnet_compare(const subnet_t *a, const subnet_t *b) {
 	int result;
 
 	result = a->type - b->type;
@@ -132,9 +128,8 @@ int subnet_compare(const subnet_t *a, const subnet_t *b)
 	case SUBNET_IPV6:
 		return subnet_compare_ipv6(a, b);
 	default:
-		logger(LOG_ERR, _("subnet_compare() was called with unknown subnet type %d, exitting!"),
+		logger(LOG_ERR, "subnet_compare() was called with unknown subnet type %d, exitting!",
 			   a->type);
-		cp_trace();
 		exit(0);
 	}
 
@@ -143,86 +138,59 @@ int subnet_compare(const subnet_t *a, const subnet_t *b)
 
 /* Initialising trees */
 
-void init_subnets(void)
-{
-	cp();
-
-	subnet_tree = avl_alloc_tree((avl_compare_t) subnet_compare, (avl_action_t) free_subnet);
+void init_subnets(void) {
+	subnet_tree = splay_alloc_tree((splay_compare_t) subnet_compare, (splay_action_t) free_subnet);
 
 	subnet_cache_flush();
 }
 
-void exit_subnets(void)
-{
-	cp();
-
-	avl_delete_tree(subnet_tree);
+void exit_subnets(void) {
+	splay_delete_tree(subnet_tree);
 }
 
-avl_tree_t *new_subnet_tree(void)
-{
-	cp();
-
-	return avl_alloc_tree((avl_compare_t) subnet_compare, NULL);
+splay_tree_t *new_subnet_tree(void) {
+	return splay_alloc_tree((splay_compare_t) subnet_compare, NULL);
 }
 
-void free_subnet_tree(avl_tree_t *subnet_tree)
-{
-	cp();
-
-	avl_delete_tree(subnet_tree);
+void free_subnet_tree(splay_tree_t *subnet_tree) {
+	splay_delete_tree(subnet_tree);
 }
 
 /* Allocating and freeing space for subnets */
 
-subnet_t *new_subnet(void)
-{
-	cp();
-
+subnet_t *new_subnet(void) {
 	return xmalloc_and_zero(sizeof(subnet_t));
 }
 
-void free_subnet(subnet_t *subnet)
-{
-	cp();
-
+void free_subnet(subnet_t *subnet) {
 	free(subnet);
 }
 
 /* Adding and removing subnets */
 
-void subnet_add(node_t *n, subnet_t *subnet)
-{
-	cp();
-
+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);
 
 	subnet_cache_flush();
 }
 
-void subnet_del(node_t *n, subnet_t *subnet)
-{
-	cp();
-
-	avl_delete(n->subnet_tree, subnet);
-	avl_delete(subnet_tree, subnet);
+void subnet_del(node_t *n, subnet_t *subnet) {
+	splay_delete(n->subnet_tree, subnet);
+	splay_delete(subnet_tree, subnet);
 
 	subnet_cache_flush();
 }
 
 /* Ascii representation of subnets */
 
-bool str2net(subnet_t *subnet, const char *subnetstr)
-{
+bool str2net(subnet_t *subnet, const char *subnetstr) {
 	int i, l;
 	uint16_t x[8];
 	int weight = 10;
 
-	cp();
-
 	if(sscanf(subnetstr, "%hu.%hu.%hu.%hu/%d#%d",
 			  &x[0], &x[1], &x[2], &x[3], &l, &weight) >= 5) {
 		if(l < 0 || l > 32)
@@ -297,12 +265,9 @@ bool str2net(subnet_t *subnet, const char *subnetstr)
 	return false;
 }
 
-bool net2str(char *netstr, int len, const subnet_t *subnet)
-{
-	cp();
-
+bool net2str(char *netstr, int len, const subnet_t *subnet) {
 	if(!netstr || !subnet) {
-		logger(LOG_ERR, _("net2str() was called with netstr=%p, subnet=%p!\n"), netstr, subnet);
+		logger(LOG_ERR, "net2str() was called with netstr=%p, subnet=%p!\n", netstr, subnet);
 		return false;
 	}
 
@@ -344,9 +309,8 @@ bool net2str(char *netstr, int len, const subnet_t *subnet)
 
 		default:
 			logger(LOG_ERR,
-				   _("net2str() was called with unknown subnet type %d, exiting!"),
+				   "net2str() was called with unknown subnet type %d, exiting!",
 				   subnet->type);
-			cp_trace();
 			exit(0);
 	}
 
@@ -355,36 +319,27 @@ bool net2str(char *netstr, int len, const subnet_t *subnet)
 
 /* Subnet lookup routines */
 
-subnet_t *lookup_subnet(const node_t *owner, const subnet_t *subnet)
-{
-	cp();
-
-	return avl_search(owner->subnet_tree, subnet);
+subnet_t *lookup_subnet(const node_t *owner, const subnet_t *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) {
 	subnet_t *p, subnet = {0};
 
-	cp();
-
 	subnet.type = SUBNET_MAC;
 	subnet.net.mac.address = *address;
 	subnet.owner = NULL;
 
-	p = avl_search(subnet_tree, &subnet);
+	p = splay_search(subnet_tree, &subnet);
 
 	return p;
 }
 
-subnet_t *lookup_subnet_ipv4(const ipv4_t *address)
-{
+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();
-
 	// Check if this address is cached
 
 	for(i = 0; i < 2; i++) {
@@ -424,14 +379,11 @@ subnet_t *lookup_subnet_ipv4(const ipv4_t *address)
 	return r;
 }
 
-subnet_t *lookup_subnet_ipv6(const ipv6_t *address)
-{
+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();
-
 	// Check if this address is cached
 
 	for(i = 0; i < 2; i++) {
@@ -472,7 +424,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[9] = {0};
 	char netstr[MAXNETSTR];
@@ -538,22 +490,19 @@ void subnet_update(node_t *owner, subnet_t *subnet, bool up) {
 		free(envp[i]);
 }
 
-void dump_subnets(void)
-{
+int dump_subnets(struct evbuffer *out) {
 	char netstr[MAXNETSTR];
 	subnet_t *subnet;
-	avl_node_t *node;
-
-	cp();
-
-	logger(LOG_DEBUG, _("Subnet list:"));
+	splay_node_t *node;
 
 	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;
 }