X-Git-Url: https://www.tinc-vpn.org/git/browse?a=blobdiff_plain;f=src%2Fsubnet.c;h=12ca03c73135d8e6e80596fba7793b02580ac7af;hb=cc3c69c892b0dad9a6ece0a0f4ccd429a22fcbff;hp=99d97bcdbb4d4dd2aaa5b6e957ccdc78976a8613;hpb=b6298e2c082035b8238ea08673ced15d0fb7b89a;p=tinc

diff --git a/src/subnet.c b/src/subnet.c
index 99d97bcd..12ca03c7 100644
--- a/src/subnet.c
+++ b/src/subnet.c
@@ -1,7 +1,7 @@
 /*
     subnet.c -- handle subnet lookups and lists
-    Copyright (C) 2000,2001 Guus Sliepen <guus@sliepen.warande.net>,
-                  2000,2001 Ivo Timmermans <itimmermans@bigfoot.com>
+    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
     it under the terms of the GNU General Public License as published by
@@ -13,368 +13,268 @@
     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.
-
-    $Id: subnet.c,v 1.1.2.27 2001/10/28 22:42:49 guus Exp $
+    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 "config.h"
-
-#include <stdio.h>
-#include <syslog.h>
-#include <string.h>
+#include "system.h"
 
-#include "conf.h"
+#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 "subnet.h"
-#include "system.h"
-
-#include <utils.h>
-#include <xalloc.h>
-#include <avl_tree.h>
+#include "utils.h"
+#include "xalloc.h"
 
 /* lists type of subnet */
 
-avl_tree_t *subnet_tree;
+splay_tree_t *subnet_tree;
 
-/* Subnet comparison */
+/* Subnet lookup cache */
 
-int subnet_compare_mac(subnet_t *a, subnet_t *b)
-{
-  int result;
-cp
-  result = memcmp(&a->net.mac.address, &b->net.mac.address, sizeof(mac_t));
-  
-  if(result)
-    return result;
+hash_t *ipv4_cache;
+hash_t *ipv6_cache;
+hash_t *mac_cache;
 
-  return strcmp(a->owner->name, b->owner->name);
+void subnet_cache_flush(void) {
+	hash_clear(ipv4_cache);
+	hash_clear(ipv6_cache);
+	hash_clear(mac_cache);
 }
 
-int subnet_compare_ipv4(subnet_t *a, subnet_t *b)
-{
-cp
-  /* We compare as if a subnet is a number that equals (address << 32 + netmask). */
-   
-  if(a->net.ipv4.address < b->net.ipv4.address)
-    return -1;
-  else if(a->net.ipv4.address > b->net.ipv4.address)
-    return 1;
-
-  if(a->net.ipv4.mask < b->net.ipv4.mask)
-    return -1;
-  else if(a->net.ipv4.mask > b->net.ipv4.mask)
-    return 1;
-
-  return strcmp(a->owner->name, b->owner->name);
-}
+/* Initialising trees */
 
-int subnet_compare_ipv6(subnet_t *a, subnet_t *b)
-{
-  int result;
-cp
-  /* Same as ipv4 case, but with nasty 128 bit addresses */
-  
-  result = memcmp(a->net.ipv6.address.x, b->net.ipv6.address.x, sizeof(ipv6_t));
-  
-  if(result)
-    return result;
-
-  result = memcmp(a->net.ipv6.mask.x, b->net.ipv6.mask.x, sizeof(ipv6_t));
-  
-  if(result)
-    return result;
-
-  return strcmp(a->owner->name, b->owner->name);
-}
+void init_subnets(void) {
+	subnet_tree = splay_alloc_tree((splay_compare_t) subnet_compare, (splay_action_t) free_subnet);
 
-int subnet_compare(subnet_t *a, subnet_t *b)
-{
-  int x;
-cp  
-  x = a->type - b->type;
-  if(x)
-    return x;
-    
-  switch(a->type)
-    {
-      case SUBNET_MAC:
-        return subnet_compare_mac(a, b);
-      case SUBNET_IPV4:
-        return subnet_compare_ipv4(a, b);
-      case SUBNET_IPV6:
-        return subnet_compare_ipv6(a, b);
-      default:
-        syslog(LOG_ERR, _("subnet_compare() was called with unknown subnet type %d, restarting!"), a->type);
-        sighup = 1;
-        return 0;
-    }
+	ipv4_cache = hash_alloc(0x100, sizeof(ipv4_t));
+	ipv6_cache = hash_alloc(0x100, sizeof(ipv6_t));
+	mac_cache = hash_alloc(0x100, sizeof(mac_t));
 }
 
-/* Initialising trees */
-
-void init_subnets(void)
-{
-cp
-  subnet_tree = avl_alloc_tree((avl_compare_t)subnet_compare, (avl_action_t)free_subnet);
-cp
-}
+void exit_subnets(void) {
+	splay_delete_tree(subnet_tree);
 
-void exit_subnets(void)
-{
-cp
-  avl_delete_tree(subnet_tree);
-cp
+	hash_free(ipv4_cache);
+	hash_free(ipv6_cache);
+	hash_free(mac_cache);
 }
 
-avl_tree_t *new_subnet_tree(void)
-{
-cp
-  return avl_alloc_tree((avl_compare_t)subnet_compare, NULL);
-cp
+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);
-cp
+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
-  return (subnet_t *)xmalloc(sizeof(subnet_t));
+subnet_t *new_subnet(void) {
+	return xmalloc_and_zero(sizeof(subnet_t));
 }
 
-void free_subnet(subnet_t *subnet)
-{
-cp
-  free(subnet);
+void free_subnet(subnet_t *subnet) {
+	free(subnet);
 }
 
-/* Linked list management */
+/* Adding and removing subnets */
 
-void subnet_add(node_t *n, subnet_t *subnet)
-{
-cp
-  subnet->owner = n;
+void subnet_add(node_t *n, subnet_t *subnet) {
+	subnet->owner = n;
 
-  avl_insert(subnet_tree, subnet);
-cp
-  avl_insert(n->subnet_tree, subnet);
-cp
-}
+	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);
-cp
-  avl_delete(subnet_tree, subnet);
-cp
+	subnet_cache_flush();
 }
 
-/* Ascii representation of subnets */
-
-subnet_t *str2net(char *subnetstr)
-{
-  int type;
-  subnet_t *subnet;
-cp
-  if(sscanf(subnetstr, "%d,", &type) != 1)
-    return NULL;
-cp
-  subnet = new_subnet();
-cp
-  switch(type)
-    {
-      case SUBNET_MAC:
-        if(sscanf(subnetstr, "%d,%hhx:%hhx:%hhx:%hhx:%hhx:%hhx", &subnet->type,
-                   &subnet->net.mac.address.x[0],
-                   &subnet->net.mac.address.x[1],
-                   &subnet->net.mac.address.x[2],
-                   &subnet->net.mac.address.x[3],
-                   &subnet->net.mac.address.x[4],
-                   &subnet->net.mac.address.x[5]) != 7)
-          {
-            free_subnet(subnet);
-            return NULL;
-          }
-        break;
-      case SUBNET_IPV4:
-        if(sscanf(subnetstr, "%d,%lx/%lx", &subnet->type, &subnet->net.ipv4.address, &subnet->net.ipv4.mask) != 3)
-          {
-            free_subnet(subnet);
-            return NULL;
-          }
-        break;
-      case SUBNET_IPV6:
-        if(sscanf(subnetstr, "%d,%hx:%hx:%hx:%hx:%hx:%hx:%hx:%hx/%hx:%hx:%hx:%hx:%hx:%hx:%hx:%hx", &subnet->type,
-                   &subnet->net.ipv6.address.x[0],
-                   &subnet->net.ipv6.address.x[1],
-                   &subnet->net.ipv6.address.x[2],
-                   &subnet->net.ipv6.address.x[3],
-                   &subnet->net.ipv6.address.x[4],
-                   &subnet->net.ipv6.address.x[5],
-                   &subnet->net.ipv6.address.x[6],
-                   &subnet->net.ipv6.address.x[7],
-                   &subnet->net.ipv6.mask.x[0],
-                   &subnet->net.ipv6.mask.x[1],
-                   &subnet->net.ipv6.mask.x[2],
-                   &subnet->net.ipv6.mask.x[3],
-                   &subnet->net.ipv6.mask.x[4],
-                   &subnet->net.ipv6.mask.x[5],
-                   &subnet->net.ipv6.mask.x[6],
-                   &subnet->net.ipv6.mask.x[7]) != 17)
-          {
-            free_subnet(subnet);
-            return NULL;
-          }
-        break;
-      default:
-        free_subnet(subnet);
-        return NULL;
-    }
-cp
-  return subnet;
-}
+void subnet_del(node_t *n, subnet_t *subnet) {
+	splay_delete(n->subnet_tree, subnet);
+	splay_delete(subnet_tree, subnet);
 
-char *net2str(subnet_t *subnet)
-{
-  char *netstr;
-cp
-  switch(subnet->type)
-    {
-      case SUBNET_MAC:
-        asprintf(&netstr, "%d,%hhx:%hhx:%hhx:%hhx:%hhx:%hhx", subnet->type,
-                   subnet->net.mac.address.x[0],
-                   subnet->net.mac.address.x[1],
-                   subnet->net.mac.address.x[2],
-                   subnet->net.mac.address.x[3],
-                   subnet->net.mac.address.x[4],
-                   subnet->net.mac.address.x[5]);
-        break;
-      case SUBNET_IPV4:
-        asprintf(&netstr, "%d,%lx/%lx", subnet->type, subnet->net.ipv4.address, subnet->net.ipv4.mask);
-        break;
-      case SUBNET_IPV6:
-        asprintf(&netstr, "%d,%hx:%hx:%hx:%hx:%hx:%hx:%hx:%hx/%hx:%hx:%hx:%hx:%hx:%hx:%hx:%hx", subnet->type,
-                   subnet->net.ipv6.address.x[0],
-                   subnet->net.ipv6.address.x[1],
-                   subnet->net.ipv6.address.x[2],
-                   subnet->net.ipv6.address.x[3],
-                   subnet->net.ipv6.address.x[4],
-                   subnet->net.ipv6.address.x[5],
-                   subnet->net.ipv6.address.x[6],
-                   subnet->net.ipv6.address.x[7],
-                   subnet->net.ipv6.mask.x[0],
-                   subnet->net.ipv6.mask.x[1],
-                   subnet->net.ipv6.mask.x[2],
-                   subnet->net.ipv6.mask.x[3],
-                   subnet->net.ipv6.mask.x[4],
-                   subnet->net.ipv6.mask.x[5],
-                   subnet->net.ipv6.mask.x[6],
-                   subnet->net.ipv6.mask.x[7]);
-        break;
-      default:
-        asprintf(&netstr, _("unknown subnet type"));
-    }
-cp
-  return netstr;
+	subnet_cache_flush();
 }
 
 /* Subnet lookup routines */
 
-subnet_t *lookup_subnet(node_t *owner, 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(mac_t *address)
-{
-  subnet_t subnet, *p;
-cp
-  subnet.type = SUBNET_MAC;
-  memcpy(&subnet.net.mac.address, address, sizeof(mac_t));
+subnet_t *lookup_subnet_mac(const node_t *owner, const mac_t *address) {
+	subnet_t *r = NULL;
+
+	// Check if this address is cached
+
+	if((r = hash_search(mac_cache, address)))
+		return r;
+
+	// Search all subnets for a matching one
 
-  p = (subnet_t *)avl_search(subnet_tree, &subnet);
-cp
-  return p;
+	for splay_each(subnet_t, p, owner ? owner->subnet_tree : subnet_tree) {
+		if(!p || p->type != SUBNET_MAC)
+			continue;
+
+		if(!memcmp(address, &p->net.mac.address, sizeof *address)) {
+			r = p;
+			if(p->owner->status.reachable)
+				break;
+		}
+	}
+
+	// Cache the result
+
+	if(r)
+		hash_insert(mac_cache, address, r);
+
+	return r;
 }
 
-subnet_t *lookup_subnet_ipv4(ipv4_t *address)
-{
-  subnet_t subnet, *p;
-cp
-  subnet.type = SUBNET_IPV4;
-  subnet.net.ipv4.address = *address;
-  subnet.net.ipv4.mask = 0xFFFFFFFF;
-
-  do
-  {
-    /* Go find subnet */
-  
-    p = (subnet_t *)avl_search_closest_smaller(subnet_tree, &subnet);
-
-  /* Check if the found subnet REALLY matches */
-cp
-    if(p)
-      {
-        if ((*address & p->net.ipv4.mask) == p->net.ipv4.address)
-          break;
-        else
-          {
-            /* Otherwise, see if there is a bigger enclosing subnet */
-
-            subnet.net.ipv4.mask = p->net.ipv4.mask << 1;
-            subnet.net.ipv4.address = p->net.ipv4.address & subnet.net.ipv4.mask;
-          }
-      }
-   } while (p);
-   
-   return p;
+subnet_t *lookup_subnet_ipv4(const ipv4_t *address) {
+	subnet_t *r = NULL;
+
+	// Check if this address is cached
+
+	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)
+			continue;
+
+		if(!maskcmp(address, &p->net.ipv4.address, p->net.ipv4.prefixlength)) {
+			r = p;
+			if(p->owner->status.reachable)
+				break;
+		}
+	}
+
+	// Cache the result
+
+	if(r)
+		hash_insert(ipv4_cache, address, r);
+
+	return r;
+}
+
+subnet_t *lookup_subnet_ipv6(const ipv6_t *address) {
+	subnet_t *r = NULL;
+
+	// Check if this address is cached
+
+	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)
+			continue;
+
+		if(!maskcmp(address, &p->net.ipv6.address, p->net.ipv6.prefixlength)) {
+			r = p;
+			if(p->owner->status.reachable)
+				break;
+		}
+	}
+
+	// Cache the result
+
+	if(r)
+		hash_insert(ipv6_cache, address, r);
+
+	return r;
 }
 
-subnet_t *lookup_subnet_ipv6(ipv6_t *address)
-{
-  subnet_t subnet, *p;
-  int i;
-cp
-  subnet.type = SUBNET_IPV6;
-  memcpy(&subnet.net.ipv6.address, address, sizeof(ipv6_t));
-  memset(&subnet.net.ipv6.mask, 0xFF, 16);
-  
-  p = (subnet_t *)avl_search_closest_greater(subnet_tree, &subnet);
-  
-  if(p)
-    for(i=0; i<8; i++)
-      if((address->x[i] & p->net.ipv6.address.x[i]) != p->net.ipv6.address.x[i])
-        return NULL;
-
-  return p;
+void subnet_update(node_t *owner, subnet_t *subnet, bool up) {
+	char netstr[MAXNETSTR];
+	char *name, *address, *port;
+	char empty[] = "";
+
+	// 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);
+
+	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);
+		free(port);
+		free(address);
+	}
+
+	name = up ? "subnet-up" : "subnet-down";
+
+	if(!subnet) {
+		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)
+				*weight++ = 0;
+			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);
+		}
+	} else {
+		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)
+				*weight++ = 0;
+			else
+				weight = empty;
+
+			// Prepare the SUBNET and WEIGHT variables
+			xasprintf(&envp[4], "SUBNET=%s", netstr);
+			xasprintf(&envp[5], "WEIGHT=%s", weight);
+
+			execute_script(name, envp);
+		}
+	}
+
+	for(int i = 0; envp[i] && i < 8; i++)
+		free(envp[i]);
 }
 
-void dump_subnets(void)
-{
-  char *netstr;
-  subnet_t *subnet;
-  avl_node_t *node;
-cp
-  syslog(LOG_DEBUG, _("Subnet list:"));
-  for(node = subnet_tree->head; node; node = node->next)
-    {
-      subnet = (subnet_t *)node->data;
-      netstr = net2str(subnet);
-      syslog(LOG_DEBUG, " %s owner %s", netstr, subnet->owner->name);
-      free(netstr);
-    }
-  syslog(LOG_DEBUG, _("End of subnet list."));
-cp
+bool dump_subnets(connection_t *c) {
+	for splay_each(subnet_t, subnet, subnet_tree) {
+		char netstr[MAXNETSTR];
+
+		if(!net2str(netstr, sizeof netstr, subnet))
+			continue;
+
+		send_request(c, "%d %d %s %s",
+				CONTROL, REQ_DUMP_SUBNETS,
+				netstr, subnet->owner->name);
+	}
+
+	return send_request(c, "%d %d", CONTROL, REQ_DUMP_SUBNETS);
 }