X-Git-Url: https://git.librecmc.org/?p=oweals%2Ftinc.git;a=blobdiff_plain;f=src%2Fsubnet.c;h=52ed443713e2147779061bb135b98f3ba28c7eb9;hp=c7b2ed7e1c3a709b355a447e230a514a13160c48;hb=b2cee41b187d79c095914d1097b8ff34a0609ec3;hpb=d47d5932a3bbc4940aa6453ebfe617ef330783c8

diff --git a/src/subnet.c b/src/subnet.c
index c7b2ed7..52ed443 100644
--- a/src/subnet.c
+++ b/src/subnet.c
@@ -1,7 +1,7 @@
 /*
     subnet.c -- handle subnet lookups and lists
-    Copyright (C) 2000 Guus Sliepen <guus@sliepen.warande.net>,
-                  2000 Ivo Timmermans <itimmermans@bigfoot.com>
+    Copyright (C) 2000-2006 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
@@ -17,274 +17,459 @@
     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.6 2000/10/28 16:41:40 guus Exp $
+    $Id$
 */
 
-#include "config.h"
-#include <utils.h>
+#include "system.h"
 
-#include <xalloc.h>
-#include "subnet.h"
+#include "avl_tree.h"
+#include "device.h"
+#include "logger.h"
 #include "net.h"
+#include "netutl.h"
+#include "node.h"
+#include "process.h"
+#include "subnet.h"
+#include "utils.h"
+#include "xalloc.h"
 
 /* lists type of subnet */
 
-subnet_t *subnet_list[SUBNET_TYPES] = { NULL };
+avl_tree_t *subnet_tree;
+
+/* Subnet comparison */
+
+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));
+
+	if(result || !a->owner || !b->owner)
+		return result;
+
+	return strcmp(a->owner->name, b->owner->name);
+}
+
+static int subnet_compare_ipv4(const subnet_t *a, const subnet_t *b)
+{
+	int result;
+
+	result = memcmp(&a->net.ipv4.address, &b->net.ipv4.address, sizeof(ipv4_t));
+
+	if(result)
+		return result;
+
+	result = a->net.ipv4.prefixlength - b->net.ipv4.prefixlength;
+
+	if(result || !a->owner || !b->owner)
+		return result;
+
+	return strcmp(a->owner->name, b->owner->name);
+}
+
+static int subnet_compare_ipv6(const subnet_t *a, const subnet_t *b)
+{
+	int result;
+
+	result = memcmp(&a->net.ipv6.address, &b->net.ipv6.address, sizeof(ipv6_t));
+
+	if(result)
+		return result;
+
+	result = a->net.ipv6.prefixlength - b->net.ipv6.prefixlength;
+
+	if(result || !a->owner || !b->owner)
+		return result;
+
+	return strcmp(a->owner->name, b->owner->name);
+}
+
+int subnet_compare(const subnet_t *a, const subnet_t *b)
+{
+	int result;
+
+	result = a->type - b->type;
+
+	if(result)
+		return result;
+
+	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:
+		logger(LOG_ERR, _("subnet_compare() was called with unknown subnet type %d, exitting!"),
+			   a->type);
+		cp_trace();
+		exit(0);
+	}
+
+	return 0;
+}
+
+/* Initialising trees */
+
+void init_subnets(void)
+{
+	cp();
+
+	subnet_tree = avl_alloc_tree((avl_compare_t) subnet_compare, (avl_action_t) free_subnet);
+}
+
+void exit_subnets(void)
+{
+	cp();
+
+	avl_delete_tree(subnet_tree);
+}
+
+avl_tree_t *new_subnet_tree(void)
+{
+	cp();
+
+	return avl_alloc_tree((avl_compare_t) subnet_compare, NULL);
+}
+
+void free_subnet_tree(avl_tree_t *subnet_tree)
+{
+	cp();
+
+	avl_delete_tree(subnet_tree);
+}
 
 /* Allocating and freeing space for subnets */
 
 subnet_t *new_subnet(void)
 {
-cp
-  return (subnet_t *)xmalloc(sizeof(subnet_t));
+	cp();
+
+	return xmalloc_and_zero(sizeof(subnet_t));
 }
 
 void free_subnet(subnet_t *subnet)
 {
-cp
-  free(subnet);
+	cp();
+
+	free(subnet);
 }
 
-/* Linked list management */
+/* Adding and removing subnets */
 
-void subnet_add(conn_list_t *cl, subnet_t *subnet)
+void subnet_add(node_t *n, subnet_t *subnet)
 {
-  subnet_t *p = NULL;
-  subnet_t *q = NULL;
-cp
-  subnet->owner = cl;
-
-  /* Link it into the owners list of subnets (unsorted) */
-
-  subnet->next = cl->subnets->next;
-  subnet->prev = NULL;
-  if(subnet->next)
-    subnet->next->prev = subnet;
-  cl->subnets = subnet;
-  
-  /* And now add it to the global subnet list (sorted) */
-
-  /* Sort on size of subnet mask (IPv4 only at the moment!)
-  
-     Three cases: subnet_list[] = NULL -> just add this subnet
-                  insert before first -> add it in front of list
-                  rest: insert after another subnet
-   */
-
-  if(subnet_list[subnet->type])
-    {
-      p = q = subnet_list[subnet->type];
-
-      for(; p; p = p->global_next)
-        {
-          if(subnet->net.ipv4.mask >= p->net.ipv4.mask)
-            break;
-
-          q = p;
-        }
-     }
-  
-  if(!subnet_list[subnet->type] || p == subnet_list[subnet->type])  /* First two cases */
-    {
-      /* Insert in front */
-      subnet->global_next = subnet_list[subnet->type];
-      subnet->global_prev = NULL;
-      subnet_list[subnet->type] = subnet;
-    }
-  else                                  /* Third case */
-    {
-      /* Insert after q */
-      subnet->global_next = q->global_next;
-      subnet->global_prev = q;
-      q->global_next = subnet;
-    }
-
-  if(subnet->global_next)
-    subnet->global_next->global_prev = subnet;
-cp
+	cp();
+
+	subnet->owner = n;
+
+	avl_insert(subnet_tree, subnet);
+	avl_insert(n->subnet_tree, subnet);
 }
 
-void subnet_del(subnet_t *subnet)
+void subnet_del(node_t *n, subnet_t *subnet)
 {
-cp
-  /* Remove it from owner's list */
-
-  if(subnet->prev)
-    {
-      subnet->prev->next = subnet->next;
-    }
-  else
-    {
-      subnet->owner->subnets = subnet->next;
-    }
-
-  subnet->next->prev = subnet->prev;
-
-  /* Remove it from the global list */
-  
-  if(subnet->global_prev)
-    {
-      subnet->global_prev->global_next = subnet->global_next;
-    }
-  else
-    {
-      subnet_list[subnet->type] = subnet->global_next;
-    }
-
-  subnet->global_next->global_prev = subnet->global_prev;
-  
-  free_subnet(subnet);
-cp
+	cp();
+
+	avl_delete(n->subnet_tree, subnet);
+	avl_delete(subnet_tree, subnet);
 }
 
 /* Ascii representation of subnets */
 
-subnet_t *str2net(char *subnetstr)
+bool str2net(subnet_t *subnet, const char *subnetstr)
 {
-  int type;
-  subnet_t *subnet;
-cp
-  if(sscanf(subnetstr, "%d,", &type) != 1)
-    return NULL;
-
-  subnet = new_subnet();
-
-  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;
-                break;
-      default:
-        free_subnet(subnet);
-        return NULL;
-    }
-cp
-  return subnet;
+	int i, l;
+	uint16_t x[8];
+
+	cp();
+
+	if(sscanf(subnetstr, "%hu.%hu.%hu.%hu/%d",
+			  &x[0], &x[1], &x[2], &x[3], &l) == 5) {
+		if(l < 0 || l > 32)
+			return false;
+
+		subnet->type = SUBNET_IPV4;
+		subnet->net.ipv4.prefixlength = l;
+
+		for(i = 0; i < 4; i++) {
+			if(x[i] > 255)
+				return false;
+			subnet->net.ipv4.address.x[i] = x[i];
+		}
+
+		return true;
+	}
+
+	if(sscanf(subnetstr, "%hx:%hx:%hx:%hx:%hx:%hx:%hx:%hx/%d",
+			  &x[0], &x[1], &x[2], &x[3], &x[4], &x[5], &x[6], &x[7],
+			  &l) == 9) {
+		if(l < 0 || l > 128)
+			return false;
+
+		subnet->type = SUBNET_IPV6;
+		subnet->net.ipv6.prefixlength = l;
+
+		for(i = 0; i < 8; i++)
+			subnet->net.ipv6.address.x[i] = htons(x[i]);
+
+		return true;
+	}
+
+	if(sscanf(subnetstr, "%hu.%hu.%hu.%hu", &x[0], &x[1], &x[2], &x[3]) == 4) {
+		subnet->type = SUBNET_IPV4;
+		subnet->net.ipv4.prefixlength = 32;
+
+		for(i = 0; i < 4; i++) {
+			if(x[i] > 255)
+				return false;
+			subnet->net.ipv4.address.x[i] = x[i];
+		}
+
+		return true;
+	}
+
+	if(sscanf(subnetstr, "%hx:%hx:%hx:%hx:%hx:%hx:%hx:%hx",
+			  &x[0], &x[1], &x[2], &x[3], &x[4], &x[5], &x[6], &x[7]) == 8) {
+		subnet->type = SUBNET_IPV6;
+		subnet->net.ipv6.prefixlength = 128;
+
+		for(i = 0; i < 8; i++)
+			subnet->net.ipv6.address.x[i] = htons(x[i]);
+
+		return true;
+	}
+
+	if(sscanf(subnetstr, "%hx:%hx:%hx:%hx:%hx:%hx",
+			  &x[0], &x[1], &x[2], &x[3], &x[4], &x[5]) == 6) {
+		subnet->type = SUBNET_MAC;
+
+		for(i = 0; i < 6; i++)
+			subnet->net.mac.address.x[i] = x[i];
+
+		return true;
+	}
+
+	return false;
 }
 
-char *net2str(subnet_t *subnet)
+bool net2str(char *netstr, int len, const 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]);
-      case SUBNET_IPV4:
-        asprintf(&netstr, "%d,%lx/%lx", subnet->type, subnet->net.ipv4.address, subnet->net.ipv4.mask);
-      case SUBNET_IPV6:
-        asprintf(&netstr, "%d,%hx:%hx:%hx:%hx:%hx:%hx:%hx:%hx/%hx:%hx:%hx:%hx:%hx:%hx:%hx:%hx",
-                   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]);
-      default:
-        netstr = NULL;
-    }
-cp
-  return netstr;
+	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",
+					 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:
+			snprintf(netstr, len, "%hu.%hu.%hu.%hu/%d",
+					 subnet->net.ipv4.address.x[0],
+					 subnet->net.ipv4.address.x[1],
+					 subnet->net.ipv4.address.x[2],
+					 subnet->net.ipv4.address.x[3], subnet->net.ipv4.prefixlength);
+			break;
+
+		case SUBNET_IPV6:
+			snprintf(netstr, len, "%hx:%hx:%hx:%hx:%hx:%hx:%hx:%hx/%d",
+					 ntohs(subnet->net.ipv6.address.x[0]),
+					 ntohs(subnet->net.ipv6.address.x[1]),
+					 ntohs(subnet->net.ipv6.address.x[2]),
+					 ntohs(subnet->net.ipv6.address.x[3]),
+					 ntohs(subnet->net.ipv6.address.x[4]),
+					 ntohs(subnet->net.ipv6.address.x[5]),
+					 ntohs(subnet->net.ipv6.address.x[6]),
+					 ntohs(subnet->net.ipv6.address.x[7]),
+					 subnet->net.ipv6.prefixlength);
+			break;
+
+		default:
+			logger(LOG_ERR,
+				   _("net2str() was called with unknown subnet type %d, exiting!"),
+				   subnet->type);
+			cp_trace();
+			exit(0);
+	}
+
+	return true;
 }
 
 /* Subnet lookup routines */
 
-subnet_t *lookup_subnet_mac(mac_t address)
+subnet_t *lookup_subnet(const node_t *owner, const subnet_t *subnet)
+{
+	cp();
+
+	return avl_search(owner->subnet_tree, subnet);
+}
+
+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);
+
+	return p;
+}
+
+subnet_t *lookup_subnet_ipv4(const ipv4_t *address)
 {
-  subnet_t *subnet;
-cp
-  for(subnet = subnet_list[SUBNET_MAC]; subnet != NULL; subnet = subnet->next)
-    {
-      if(memcmp(&address, &subnet->net.mac.address, sizeof(address)) == 0)
-        break;
-    }
-cp
-  return subnet;
+	subnet_t *p, subnet = {0};
+
+	cp();
+
+	subnet.type = SUBNET_IPV4;
+	subnet.net.ipv4.address = *address;
+	subnet.net.ipv4.prefixlength = 32;
+	subnet.owner = NULL;
+
+	do {
+		/* Go find subnet */
+
+		p = avl_search_closest_smaller(subnet_tree, &subnet);
+
+		/* Check if the found subnet REALLY matches */
+
+		if(p) {
+			if(p->type != SUBNET_IPV4) {
+				p = NULL;
+				break;
+			}
+
+			if(!maskcmp(address, &p->net.ipv4.address, p->net.ipv4.prefixlength))
+				break;
+			else {
+				/* Otherwise, see if there is a bigger enclosing subnet */
+
+				subnet.net.ipv4.prefixlength = p->net.ipv4.prefixlength - 1;
+				if(subnet.net.ipv4.prefixlength < 0 || subnet.net.ipv4.prefixlength > 32)
+					return NULL;
+				maskcpy(&subnet.net.ipv4.address, &p->net.ipv4.address, subnet.net.ipv4.prefixlength, sizeof(ipv4_t));
+			}
+		}
+	} while(p);
+
+	return p;
 }
 
-subnet_t *lookup_subnet_ipv4(ipv4_t address)
+subnet_t *lookup_subnet_ipv6(const ipv6_t *address)
 {
-  subnet_t *subnet;
-cp
-  for(subnet = subnet_list[SUBNET_IPV4]; subnet != NULL; subnet = subnet->next)
-    {
-      if((address & subnet->net.ipv4.mask) == subnet->net.ipv4.address)
-        break;
-    }
-cp
-  return subnet;
+	subnet_t *p, subnet = {0};
+
+	cp();
+
+	subnet.type = SUBNET_IPV6;
+	subnet.net.ipv6.address = *address;
+	subnet.net.ipv6.prefixlength = 128;
+	subnet.owner = NULL;
+
+	do {
+		/* Go find subnet */
+
+		p = avl_search_closest_smaller(subnet_tree, &subnet);
+
+		/* Check if the found subnet REALLY matches */
+
+		if(p) {
+			if(p->type != SUBNET_IPV6)
+				return NULL;
+
+			if(!maskcmp(address, &p->net.ipv6.address, p->net.ipv6.prefixlength))
+				break;
+			else {
+				/* Otherwise, see if there is a bigger enclosing subnet */
+
+				subnet.net.ipv6.prefixlength = p->net.ipv6.prefixlength - 1;
+				if(subnet.net.ipv6.prefixlength < 0 || subnet.net.ipv6.prefixlength > 128)
+					return NULL;
+				maskcpy(&subnet.net.ipv6.address, &p->net.ipv6.address, subnet.net.ipv6.prefixlength, sizeof(ipv6_t));
+			}
+		}
+	} while(p);
+
+	return p;
 }
 
-subnet_t *lookup_subnet_ipv6(ipv6_t address)
+void subnet_update(node_t *owner, subnet_t *subnet, bool up) {
+	avl_node_t *node;
+	int i;
+	char *envp[8];
+	char netstr[MAXNETSTR + 7] = "SUBNET=";
+	char *name, *address, *port;
+
+	asprintf(&envp[0], "NETNAME=%s", netname ? : "");
+	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);
+		asprintf(&envp[5], "REMOTEPORT=%s", port);
+		envp[6] = netstr;
+		envp[7] = NULL;
+	} else {
+		envp[4] = netstr;
+		envp[5] = NULL;
+	}
+
+	name = up ? "subnet-up" : "subnet-down";
+
+	if(!subnet) {
+		for(node = owner->subnet_tree->head; node; node = node->next) {
+			subnet = node->data;
+			if(!net2str(netstr + 7, sizeof netstr - 7, subnet))
+				continue;
+			execute_script(name, envp);
+		}
+	} else {
+		if(net2str(netstr + 7, sizeof netstr - 7, subnet))
+			execute_script(name, envp);
+	}
+
+	for(i = 0; i < (owner != myself ? 6 : 4); i++)
+		free(envp[i]);
+
+	if(owner != myself) {
+		free(address);
+		free(port);
+	}
+}
+
+void dump_subnets(void)
 {
-  subnet_t *subnet;
-  int i;
-cp
-  for(subnet = subnet_list[SUBNET_IPV6]; subnet != NULL; subnet = subnet->next)
-    {
-      for(i=0; i<8; i++)
-        if((address.x[i] & subnet->net.ipv6.mask.x[i]) != subnet->net.ipv6.address.x[i])
-          break;
-      if(i=8)
-        break;
-    }
-cp
-  return subnet;
+	char netstr[MAXNETSTR];
+	subnet_t *subnet;
+	avl_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);
+	}
+
+	logger(LOG_DEBUG, _("End of subnet list."));
 }