X-Git-Url: https://www.tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=src%2Fsubnet.c;h=954d5d0a1e0747b59252b8c9331e35c3a817c83f;hp=15ae528eb4cc8d037e6ebcce6d5d8a32df9e892b;hb=626d5956d2bb0660ba315fba77da6cec9776fd3b;hpb=ed0bf283e37642f9f7673f664713a16d916bd70f

diff --git a/src/subnet.c b/src/subnet.c
index 15ae528e..954d5d0a 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-2002 Guus Sliepen <guus@sliepen.warande.net>,
+                  2000-2002 Ivo Timmermans <itimmermans@bigfoot.com>
 
     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,123 +17,171 @@
     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.10 2000/11/04 11:49:58 guus Exp $
+    $Id: subnet.c,v 1.1.2.31 2002/02/20 17:16:15 guus Exp $
 */
 
 #include "config.h"
 
 #include <stdio.h>
 #include <syslog.h>
+#include <string.h>
+#include <errno.h>
+#include <fcntl.h>
+#include <netdb.h>
+#include <netinet/in.h>
+
+#include <utils.h>
+#include <xalloc.h>
+#include <avl_tree.h>
 
 #include "conf.h"
 #include "net.h"
+#include "node.h"
 #include "subnet.h"
+#include "netutl.h"
+
 #include "system.h"
 
-#include <utils.h>
-#include <xalloc.h>
+int cache_mac_valid = 0;
+int cache_ipv4_valid = 0;
+int cache_ipv6_valid = 0;
 
 /* lists type of subnet */
 
-subnet_t *subnet_list[SUBNET_TYPES] = { NULL };
+avl_tree_t *subnet_tree;
 
-/* Allocating and freeing space for subnets */
+/* Subnet comparison */
 
-subnet_t *new_subnet(void)
+int subnet_compare_mac(subnet_t *a, subnet_t *b)
 {
 cp
-  return (subnet_t *)xmalloc(sizeof(subnet_t));
+  return memcmp(&a->net.mac.address, &b->net.mac.address, sizeof(mac_t));
 }
 
-void free_subnet(subnet_t *subnet)
+int subnet_compare_ipv4(subnet_t *a, subnet_t *b)
 {
+  int result;
 cp
-  free(subnet);
+  result = memcmp(&a->net.ipv4.address, &b->net.ipv4.address, sizeof(ipv4_t));
+  
+  if(result)
+    return result;
+
+  return a->net.ipv4.masklength - b->net.ipv4.masklength;
+}
+
+int subnet_compare_ipv6(subnet_t *a, subnet_t *b)
+{
+  int result;
+cp
+  result = memcmp(&a->net.ipv6.address, &b->net.ipv6.address, sizeof(ipv6_t));
+  
+  if(result)
+    return result;
+
+  return a->net.ipv6.masklength - b->net.ipv6.masklength;
+}
+
+int subnet_compare(subnet_t *a, subnet_t *b)
+{
+  int result;
+cp  
+  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:
+        syslog(LOG_ERR, _("subnet_compare() was called with unknown subnet type %d, exitting!"), a->type);
+        cp_trace();
+        exit(0);
+    }
+
+  return 0;
 }
 
-/* Linked list management */
+/* Initialising trees */
 
-void subnet_add(conn_list_t *cl, subnet_t *subnet)
+void init_subnets(void)
 {
-  subnet_t *p = NULL;
-  subnet_t *q = NULL;
 cp
-  subnet->owner = cl;
+  subnet_tree = avl_alloc_tree((avl_compare_t)subnet_compare, (avl_action_t)free_subnet);
+cp
+}
 
-  /* Link it into the owners list of subnets (unsorted) */
+void exit_subnets(void)
+{
+cp
+  avl_delete_tree(subnet_tree);
+cp
+}
 
-  subnet->next = cl->subnets;
-  subnet->prev = NULL;
-  if(subnet->next)
-    subnet->next->prev = subnet;
-  cl->subnets = subnet;
-  
-  /* And now add it to the global subnet list (sorted) */
+avl_tree_t *new_subnet_tree(void)
+{
+cp
+  return avl_alloc_tree((avl_compare_t)subnet_compare, NULL);
+cp
+}
 
-  /* 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
-   */
+void free_subnet_tree(avl_tree_t *subnet_tree)
+{
 cp
-  if(subnet_list[subnet->type])
-    {
-      p = q = subnet_list[subnet->type];
+  avl_delete_tree(subnet_tree);
+cp
+}
 
-      for(; p; p = p->global_next)
-        {
-          if(subnet->net.ipv4.mask >= p->net.ipv4.mask)
-            break;
+/* Allocating and freeing space for subnets */
 
-          q = p;
-        }
-     }
-cp  
-  if(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;
-    }
+subnet_t *new_subnet(void)
+{
 cp
-  if(subnet->global_next)
-    subnet->global_next->global_prev = subnet;
+  return (subnet_t *)xmalloc(sizeof(subnet_t));
+}
+
+void free_subnet(subnet_t *subnet)
+{
 cp
+  free(subnet);
 }
 
-void subnet_del(subnet_t *subnet)
+/* Adding and removing subnets */
+
+void cache_invalidate(void)
+{
+  cache_mac_valid = 0;
+  cache_ipv4_valid = 0;
+  cache_ipv6_valid = 0;
+}
+
+void subnet_add(node_t *n, subnet_t *subnet)
 {
 cp
-  /* Remove it from owner's list */
+  subnet->owner = n;
 
-  if(subnet->prev)
-    subnet->prev->next = subnet->next;
-  else
-    subnet->owner->subnets = subnet->next;
+  cache_invalidate();
 
-  if(subnet->next)
-    subnet->next->prev = subnet->prev;
+  avl_insert(subnet_tree, subnet);
+cp
+  avl_insert(n->subnet_tree, subnet);
+cp
+}
 
-  /* 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;
+void subnet_del(node_t *n, subnet_t *subnet)
+{
+cp
+  cache_invalidate();
 
-  if(subnet->global_next)
-    subnet->global_next->global_prev = subnet->global_prev;
-  
-  free_subnet(subnet);
+  avl_delete(n->subnet_tree, subnet);
+cp
+  avl_delete(subnet_tree, subnet);
 cp
 }
 
@@ -141,65 +189,65 @@ cp
 
 subnet_t *str2net(char *subnetstr)
 {
-  int type;
+  int i, l;
   subnet_t *subnet;
-cp
-  if(sscanf(subnetstr, "%d,", &type) != 1)
-    return NULL;
+  unsigned short int x[8];
 cp
   subnet = new_subnet();
 cp
-  switch(type)
+  if(sscanf(subnetstr, "%hu.%hu.%hu.%hu/%d",
+              &x[0], &x[1], &x[2], &x[3],
+              &l) == 5)
     {
-      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;
+      subnet->type = SUBNET_IPV4;
+      subnet->net.ipv4.masklength = l;
+      for(i = 0; i < 4; i++)
+        subnet->net.ipv4.address.x[i] = x[i];
+      return subnet;
     }
-cp
-  return subnet;
+	      
+  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)
+    {
+      subnet->type = SUBNET_IPV6;
+      subnet->net.ipv6.masklength = l;
+      for(i = 0; i < 8; i++)
+        subnet->net.ipv6.address.x[i] = htons(x[i]);
+      return subnet;
+    }
+
+  if(sscanf(subnetstr, "%hu.%hu.%hu.%hu",
+              &x[0], &x[1], &x[2], &x[3]) == 4)
+    {
+      subnet->type = SUBNET_IPV4;
+      subnet->net.ipv4.masklength = 32;
+      for(i = 0; i < 4; i++)
+        subnet->net.ipv4.address.x[i] = x[i];
+      return subnet;
+    }
+	      
+  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.masklength = 128;
+      for(i = 0; i < 8; i++)
+      subnet->net.ipv6.address.x[i] = htons(x[i]);
+      return subnet;
+    }
+
+  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 subnet;
+    }
+
+  free(subnet);
+  return NULL;
 }
 
 char *net2str(subnet_t *subnet)
@@ -209,7 +257,7 @@ cp
   switch(subnet->type)
     {
       case SUBNET_MAC:
-        asprintf(&netstr, "%d,%hhx:%hhx:%hhx:%hhx:%hhx:%hhx", subnet->type,
+        asprintf(&netstr, "%hx:%hx:%hx:%hx:%hx:%hx",
                    subnet->net.mac.address.x[0],
                    subnet->net.mac.address.x[1],
                    subnet->net.mac.address.x[2],
@@ -218,29 +266,29 @@ cp
                    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);
+        asprintf(&netstr, "%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.masklength);
         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]);
+        asprintf(&netstr, "%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.masklength);
         break;
       default:
-        asprintf(&netstr, _("unknown"));
+        syslog(LOG_ERR, _("net2str() was called with unknown subnet type %d, exitting!"), subnet->type);
+	cp_trace();
+        exit(0);
     }
 cp
   return netstr;
@@ -248,63 +296,130 @@ cp
 
 /* Subnet lookup routines */
 
-subnet_t *lookup_subnet_mac(mac_t address)
+subnet_t *lookup_subnet(node_t *owner, subnet_t *subnet)
 {
-  subnet_t *subnet;
+cp  
+  return avl_search(owner->subnet_tree, subnet);
+}
+
+subnet_t *lookup_subnet_mac(mac_t *address)
+{
+  static subnet_t subnet, *p;
 cp
-  for(subnet = subnet_list[SUBNET_MAC]; subnet != NULL; subnet = subnet->global_next)
-    {
-      if(memcmp(&address, &subnet->net.mac.address, sizeof(address)) == 0)
-        break;
-    }
+  if(cache_mac_valid && !memcmp(&subnet.net.mac.address, address, sizeof(mac_t)))
+    return p;
+
+  subnet.type = SUBNET_MAC;
+  memcpy(&subnet.net.mac.address, address, sizeof(mac_t));
+
+  p = (subnet_t *)avl_search(subnet_tree, &subnet);
+  cache_mac_valid = 1;
 cp
-  return subnet;
+  return p;
 }
 
-subnet_t *lookup_subnet_ipv4(ipv4_t address)
+subnet_t *lookup_subnet_ipv4(ipv4_t *address)
 {
-  subnet_t *subnet;
+  static subnet_t subnet, *p;
 cp
-  for(subnet = subnet_list[SUBNET_IPV4]; subnet != NULL; subnet = subnet->global_next)
-    {
-      if((address & subnet->net.ipv4.mask) == subnet->net.ipv4.address)
-        break;
-    }
+  if(cache_ipv4_valid && !memcmp(&subnet.net.ipv4.address, address, sizeof(ipv4_t)))
+    return p;
+
+  subnet.type = SUBNET_IPV4;
+  memcpy(&subnet.net.ipv4.address, address, sizeof(ipv4_t));
+  subnet.net.ipv4.masklength = 32;
+
+  do
+  {
+    /* Go find subnet */
+  
+    p = (subnet_t *)avl_search_closest_smaller(subnet_tree, &subnet);
+
+  /* Check if the found subnet REALLY matches */
 cp
-  return subnet;
+    if(p)
+      {
+	if(p->type != SUBNET_IPV4)
+	  {
+	    p = NULL;
+	    break;
+	  }
+
+        if (!maskcmp((char *)address, (char *)&p->net.ipv4.address, p->net.ipv4.masklength, sizeof(ipv4_t)))
+          break;
+        else
+          {
+            /* Otherwise, see if there is a bigger enclosing subnet */
+
+            subnet.net.ipv4.masklength = p->net.ipv4.masklength - 1;
+            maskcpy((char *)&subnet.net.ipv4.address, (char *)&p->net.ipv4.address, subnet.net.ipv4.masklength, sizeof(ipv4_t));
+          }
+      }
+  } while (p);
+   
+  memcpy(&subnet.net.ipv4.address, address, sizeof(ipv4_t));
+  cache_ipv4_valid = 1; 
+cp
+  return p;
 }
 
-subnet_t *lookup_subnet_ipv6(ipv6_t address)
+subnet_t *lookup_subnet_ipv6(ipv6_t *address)
 {
-  subnet_t *subnet;
-  int i;
+  static subnet_t subnet, *p;
 cp
-  for(subnet = subnet_list[SUBNET_IPV6]; subnet != NULL; subnet = subnet->global_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;
-    }
+  if(cache_ipv6_valid && !memcmp(&subnet.net.ipv6.address, address, sizeof(ipv6_t)))
+    return p;
+
+  subnet.type = SUBNET_IPV6;
+  memcpy(&subnet.net.ipv6.address, address, sizeof(ipv6_t));
+  subnet.net.ipv6.masklength = 128;
+  
+  do
+  {
+    /* Go find subnet */
+  
+    p = (subnet_t *)avl_search_closest_smaller(subnet_tree, &subnet);
+
+    /* Check if the found subnet REALLY matches */
+
 cp
-  return subnet;
+    if(p)
+      {
+	if(p->type != SUBNET_IPV6)
+	  return NULL;
+
+        if (!maskcmp((char *)address, (char *)&p->net.ipv6.address, p->net.ipv6.masklength, sizeof(ipv6_t)))
+          break;
+        else
+          {
+            /* Otherwise, see if there is a bigger enclosing subnet */
+
+            subnet.net.ipv6.masklength = p->net.ipv6.masklength - 1;
+            maskcpy((char *)&subnet.net.ipv6.address, (char *)&p->net.ipv6.address, subnet.net.ipv6.masklength, sizeof(ipv6_t));
+          }
+      }
+   } while (p);
+
+  memcpy(&subnet.net.ipv6.address, address, sizeof(ipv6_t));
+  cache_ipv6_valid = 1; 
+cp   
+  return p;
 }
 
-void dump_subnet_list(void)
+void dump_subnets(void)
 {
-  subnet_t *subnet;
   char *netstr;
+  subnet_t *subnet;
+  avl_node_t *node;
 cp
   syslog(LOG_DEBUG, _("Subnet list:"));
-
-  for(subnet = subnet_list[SUBNET_IPV4]; subnet != NULL; subnet = subnet->global_next)
+  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);
+      syslog(LOG_DEBUG, _(" %s owner %s"), netstr, subnet->owner->name);
       free(netstr);
     }
-
   syslog(LOG_DEBUG, _("End of subnet list."));
 cp
 }