X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;f=src%2Fsubnet.c;h=e45d0045235f59802253d2d2add3bb61586b74eb;hb=b3b89e46b1b84fa6cf1726fabe9e9c7bb0d3d831;hp=b2c7e7c463b3c80503d988af44b7198021c7cae3;hpb=4c05afd19acada4781e1b8865cf702b197882e5d;p=meshlink

diff --git a/src/subnet.c b/src/subnet.c
index b2c7e7c4..e45d0045 100644
--- a/src/subnet.c
+++ b/src/subnet.c
@@ -1,6 +1,6 @@
 /*
     subnet.c -- handle subnet lookups and lists
-    Copyright (C) 2000-2012 Guus Sliepen <guus@tinc-vpn.org>,
+    Copyright (C) 2000-2013 Guus Sliepen <guus@tinc-vpn.org>,
                   2000-2005 Ivo Timmermans
 
     This program is free software; you can redistribute it and/or modify
@@ -22,13 +22,13 @@
 
 #include "splay_tree.h"
 #include "control_common.h"
-#include "device.h"
 #include "hash.h"
 #include "logger.h"
+#include "names.h"
 #include "net.h"
 #include "netutl.h"
 #include "node.h"
-#include "process.h"
+#include "script.h"
 #include "subnet.h"
 #include "utils.h"
 #include "xalloc.h"
@@ -78,7 +78,7 @@ void free_subnet_tree(splay_tree_t *subnet_tree) {
 /* Allocating and freeing space for subnets */
 
 subnet_t *new_subnet(void) {
-	return xmalloc_and_zero(sizeof(subnet_t));
+	return xzalloc(sizeof(subnet_t));
 }
 
 void free_subnet(subnet_t *subnet) {
@@ -110,8 +110,7 @@ subnet_t *lookup_subnet(const node_t *owner, const subnet_t *subnet) {
 }
 
 subnet_t *lookup_subnet_mac(const node_t *owner, const mac_t *address) {
-	subnet_t *p, *r = NULL;
-	splay_node_t *n;
+	subnet_t *r = NULL;
 
 	// Check if this address is cached
 
@@ -120,9 +119,7 @@ subnet_t *lookup_subnet_mac(const node_t *owner, const mac_t *address) {
 
 	// Search all subnets for a matching one
 
-	for(n = owner ? owner->subnet_tree->head : subnet_tree->head; n; n = n->next) {
-		p = n->data;
-		
+	for splay_each(subnet_t, p, owner ? owner->subnet_tree : subnet_tree) {
 		if(!p || p->type != SUBNET_MAC)
 			continue;
 
@@ -142,8 +139,7 @@ subnet_t *lookup_subnet_mac(const node_t *owner, const mac_t *address) {
 }
 
 subnet_t *lookup_subnet_ipv4(const ipv4_t *address) {
-	subnet_t *p, *r = NULL;
-	splay_node_t *n;
+	subnet_t *r = NULL;
 
 	// Check if this address is cached
 
@@ -152,9 +148,7 @@ subnet_t *lookup_subnet_ipv4(const ipv4_t *address) {
 
 	// Search all subnets for a matching one
 
-	for(n = subnet_tree->head; n; n = n->next) {
-		p = n->data;
-		
+	for splay_each(subnet_t, p, subnet_tree) {
 		if(!p || p->type != SUBNET_IPV4)
 			continue;
 
@@ -174,8 +168,7 @@ subnet_t *lookup_subnet_ipv4(const ipv4_t *address) {
 }
 
 subnet_t *lookup_subnet_ipv6(const ipv6_t *address) {
-	subnet_t *p, *r = NULL;
-	splay_node_t *n;
+	subnet_t *r = NULL;
 
 	// Check if this address is cached
 
@@ -184,9 +177,7 @@ subnet_t *lookup_subnet_ipv6(const ipv6_t *address) {
 
 	// Search all subnets for a matching one
 
-	for(n = subnet_tree->head; n; n = n->next) {
-		p = n->data;
-		
+	for splay_each(subnet_t, p, subnet_tree) {
 		if(!p || p->type != SUBNET_IPV6)
 			continue;
 
@@ -206,18 +197,14 @@ subnet_t *lookup_subnet_ipv6(const ipv6_t *address) {
 }
 
 void subnet_update(node_t *owner, subnet_t *subnet, bool up) {
-	splay_node_t *node;
-	int i;
-	char *envp[9] = {NULL};
 	char netstr[MAXNETSTR];
 	char *name, *address, *port;
 	char empty[] = "";
 
 	// Prepare environment variables to be passed to the script
 
+	char *envp[10] = {NULL};
 	xasprintf(&envp[0], "NETNAME=%s", netname ? : "");
-	xasprintf(&envp[1], "DEVICE=%s", device ? : "");
-	xasprintf(&envp[2], "INTERFACE=%s", iface ? : "");
 	xasprintf(&envp[3], "NODE=%s", owner->name);
 
 	if(owner != myself) {
@@ -229,13 +216,15 @@ void subnet_update(node_t *owner, subnet_t *subnet, bool up) {
 		free(address);
 	}
 
+	xasprintf(&envp[8], "NAME=%s", myself->name);
+
 	name = up ? "subnet-up" : "subnet-down";
 
 	if(!subnet) {
-		for(node = owner->subnet_tree->head; node; node = node->next) {
-			subnet = node->data;
+		for splay_each(subnet_t, subnet, owner->subnet_tree) {
 			if(!net2str(netstr, sizeof netstr, subnet))
 				continue;
+
 			// Strip the weight from the subnet, and put it in its own environment variable
 			char *weight = strchr(netstr, '#');
 			if(weight)
@@ -270,20 +259,18 @@ void subnet_update(node_t *owner, subnet_t *subnet, bool up) {
 		}
 	}
 
-	for(i = 0; envp[i] && i < 8; i++)
+	for(int i = 0; envp[i] && i < 9; i++)
 		free(envp[i]);
 }
 
 bool dump_subnets(connection_t *c) {
-	char netstr[MAXNETSTR];
-	subnet_t *subnet;
-	splay_node_t *node;
+	for splay_each(subnet_t, subnet, subnet_tree) {
+		char netstr[MAXNETSTR];
 
-	for(node = subnet_tree->head; node; node = node->next) {
-		subnet = node->data;
 		if(!net2str(netstr, sizeof netstr, subnet))
 			continue;
-		send_request(c, "%d %d %s owner %s",
+
+		send_request(c, "%d %d %s %s",
 				CONTROL, REQ_DUMP_SUBNETS,
 				netstr, subnet->owner->name);
 	}