X-Git-Url: https://tinc-vpn.org/git/browse?a=blobdiff_plain;f=src%2Fsubnet.c;h=4fefda6ff8f47996c380eabf2165da7d72b1aa9f;hb=f6e87ab476a0faf8b124ecaaa27f967d825e6457;hp=06fee32f5a217861ad6a943bc66f66152a573868;hpb=f5bb64b36ae0807cdd3f241f81a8e933065437f6;p=tinc

diff --git a/src/subnet.c b/src/subnet.c
index 06fee32f..4fefda6f 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-2017 Guus Sliepen <guus@tinc-vpn.org>,
                   2000-2005 Ivo Timmermans
 
     This program is free software; you can redistribute it and/or modify
@@ -29,7 +29,7 @@
 #include "net.h"
 #include "netutl.h"
 #include "node.h"
-#include "process.h"
+#include "script.h"
 #include "subnet.h"
 #include "utils.h"
 #include "xalloc.h"
@@ -40,9 +40,9 @@ splay_tree_t *subnet_tree;
 
 /* Subnet lookup cache */
 
-hash_t *ipv4_cache;
-hash_t *ipv6_cache;
-hash_t *mac_cache;
+static hash_t *ipv4_cache;
+static hash_t *ipv6_cache;
+static hash_t *mac_cache;
 
 void subnet_cache_flush(void) {
 	hash_clear(ipv4_cache);
@@ -79,7 +79,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) {
@@ -92,13 +92,19 @@ void subnet_add(node_t *n, subnet_t *subnet) {
 	subnet->owner = n;
 
 	splay_insert(subnet_tree, subnet);
-	splay_insert(n->subnet_tree, subnet);
+
+	if(n) {
+		splay_insert(n->subnet_tree, subnet);
+	}
 
 	subnet_cache_flush();
 }
 
 void subnet_del(node_t *n, subnet_t *subnet) {
-	splay_delete(n->subnet_tree, subnet);
+	if(n) {
+		splay_delete(n->subnet_tree, subnet);
+	}
+
 	splay_delete(subnet_tree, subnet);
 
 	subnet_cache_flush();
@@ -115,26 +121,31 @@ subnet_t *lookup_subnet_mac(const node_t *owner, const mac_t *address) {
 
 	// Check if this address is cached
 
-	if((r = hash_search(mac_cache, address)))
+	if((r = hash_search(mac_cache, address))) {
 		return r;
+	}
 
 	// Search all subnets for a matching one
 
 	for splay_each(subnet_t, p, owner ? owner->subnet_tree : subnet_tree) {
-		if(!p || p->type != SUBNET_MAC)
+		if(!p || p->type != SUBNET_MAC) {
 			continue;
+		}
 
-		if(!memcmp(address, &p->net.mac.address, sizeof *address)) {
+		if(!memcmp(address, &p->net.mac.address, sizeof(*address))) {
 			r = p;
-			if(p->owner->status.reachable)
+
+			if(!p->owner || p->owner->status.reachable) {
 				break;
+			}
 		}
 	}
 
 	// Cache the result
 
-	if(r)
+	if(r) {
 		hash_insert(mac_cache, address, r);
+	}
 
 	return r;
 }
@@ -144,26 +155,31 @@ subnet_t *lookup_subnet_ipv4(const ipv4_t *address) {
 
 	// Check if this address is cached
 
-	if((r = hash_search(ipv4_cache, address)))
+	if((r = hash_search(ipv4_cache, address))) {
 		return r;
+	}
 
 	// Search all subnets for a matching one
 
 	for splay_each(subnet_t, p, subnet_tree) {
-		if(!p || p->type != SUBNET_IPV4)
+		if(!p || p->type != SUBNET_IPV4) {
 			continue;
+		}
 
 		if(!maskcmp(address, &p->net.ipv4.address, p->net.ipv4.prefixlength)) {
 			r = p;
-			if(p->owner->status.reachable)
+
+			if(!p->owner || p->owner->status.reachable) {
 				break;
+			}
 		}
 	}
 
 	// Cache the result
 
-	if(r)
+	if(r) {
 		hash_insert(ipv4_cache, address, r);
+	}
 
 	return r;
 }
@@ -173,26 +189,31 @@ subnet_t *lookup_subnet_ipv6(const ipv6_t *address) {
 
 	// Check if this address is cached
 
-	if((r = hash_search(ipv6_cache, address)))
+	if((r = hash_search(ipv6_cache, address))) {
 		return r;
+	}
 
 	// Search all subnets for a matching one
 
 	for splay_each(subnet_t, p, subnet_tree) {
-		if(!p || p->type != SUBNET_IPV6)
+		if(!p || p->type != SUBNET_IPV6) {
 			continue;
+		}
 
 		if(!maskcmp(address, &p->net.ipv6.address, p->net.ipv6.prefixlength)) {
 			r = p;
-			if(p->owner->status.reachable)
+
+			if(!p->owner || p->owner->status.reachable) {
 				break;
+			}
 		}
 	}
 
 	// Cache the result
 
-	if(r)
+	if(r) {
 		hash_insert(ipv6_cache, address, r);
+	}
 
 	return r;
 }
@@ -204,76 +225,77 @@ void subnet_update(node_t *owner, subnet_t *subnet, bool up) {
 
 	// Prepare environment variables to be passed to the script
 
-	char *envp[9] = {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);
+	environment_t env;
+	environment_init(&env);
+	environment_add(&env, "NODE=%s", owner->name);
 
 	if(owner != myself) {
 		sockaddr2str(&owner->address, &address, &port);
-		// 4 and 5 are reserved for SUBNET and WEIGHT
-		xasprintf(&envp[6], "REMOTEADDRESS=%s", address);
-		xasprintf(&envp[7], "REMOTEPORT=%s", port);
+		environment_add(&env, "REMOTEADDRESS=%s", address);
+		environment_add(&env, "REMOTEPORT=%s", port);
 		free(port);
 		free(address);
 	}
 
+	int env_subnet = environment_add(&env, NULL);
+	int env_weight = environment_add(&env, NULL);
+
 	name = up ? "subnet-up" : "subnet-down";
 
 	if(!subnet) {
 		for splay_each(subnet_t, subnet, owner->subnet_tree) {
-			if(!net2str(netstr, sizeof netstr, subnet))
+			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)
+
+			if(weight) {
 				*weight++ = 0;
-			else
+			} else {
 				weight = empty;
+			}
 
 			// Prepare the SUBNET and WEIGHT variables
-			if(envp[4])
-				free(envp[4]);
-			if(envp[5])
-				free(envp[5]);
-			xasprintf(&envp[4], "SUBNET=%s", netstr);
-			xasprintf(&envp[5], "WEIGHT=%s", weight);
-
-			execute_script(name, envp);
+			environment_update(&env, env_subnet, "SUBNET=%s", netstr);
+			environment_update(&env, env_weight, "WEIGHT=%s", weight);
+
+			execute_script(name, &env);
 		}
 	} else {
-		if(net2str(netstr, sizeof netstr, subnet)) {
+		if(net2str(netstr, sizeof(netstr), subnet)) {
 			// Strip the weight from the subnet, and put it in its own environment variable
 			char *weight = strchr(netstr, '#');
-			if(weight)
+
+			if(weight) {
 				*weight++ = 0;
-			else
+			} else {
 				weight = empty;
+			}
 
 			// Prepare the SUBNET and WEIGHT variables
-			xasprintf(&envp[4], "SUBNET=%s", netstr);
-			xasprintf(&envp[5], "WEIGHT=%s", weight);
+			environment_update(&env, env_subnet, "SUBNET=%s", netstr);
+			environment_update(&env, env_weight, "WEIGHT=%s", weight);
 
-			execute_script(name, envp);
+			execute_script(name, &env);
 		}
 	}
 
-	for(int i = 0; envp[i] && i < 8; i++)
-		free(envp[i]);
+	environment_exit(&env);
 }
 
 bool dump_subnets(connection_t *c) {
 	for splay_each(subnet_t, subnet, subnet_tree) {
 		char netstr[MAXNETSTR];
 
-		if(!net2str(netstr, sizeof netstr, subnet))
+		if(!net2str(netstr, sizeof(netstr), subnet)) {
 			continue;
+		}
 
 		send_request(c, "%d %d %s %s",
-				CONTROL, REQ_DUMP_SUBNETS,
-				netstr, subnet->owner->name);
+		             CONTROL, REQ_DUMP_SUBNETS,
+		             netstr, subnet->owner ? subnet->owner->name : "(broadcast)");
 	}
 
 	return send_request(c, "%d %d", CONTROL, REQ_DUMP_SUBNETS);