X-Git-Url: https://www.tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=src%2Fsubnet.c;h=8e50646261efd609aeaf4adafe46f7a9c7174c68;hp=c7b2ed7e1c3a709b355a447e230a514a13160c48;hb=3a6200c1e39b61b249db3d1f9bcffa77351863bd;hpb=d47d5932a3bbc4940aa6453ebfe617ef330783c8

diff --git a/src/subnet.c b/src/subnet.c
index c7b2ed7e..8e506462 100644
--- a/src/subnet.c
+++ b/src/subnet.c
@@ -17,123 +17,130 @@
     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: subnet.c,v 1.1.2.14 2000/11/20 22:13:13 guus Exp $
 */
 
 #include "config.h"
-#include <utils.h>
 
-#include <xalloc.h>
-#include "subnet.h"
+#include <stdio.h>
+#include <syslog.h>
+
+#include "conf.h"
 #include "net.h"
+#include "connection.h"
+#include "subnet.h"
+#include "system.h"
 
-/* lists type of subnet */
+#include <utils.h>
+#include <xalloc.h>
+#include <rbl.h>
 
-subnet_t *subnet_list[SUBNET_TYPES] = { NULL };
+/* lists type of subnet */
 
-/* Allocating and freeing space for subnets */
+rbltree_t *subnet_tree;
 
-subnet_t *new_subnet(void)
+void init_subnets(void)
 {
 cp
-  return (subnet_t *)xmalloc(sizeof(subnet_t));
+  subnet_tree = new_rbltree((rbl_compare_t)subnet_compare, (rbl_action_t)free_subnet);
+cp
 }
 
-void free_subnet(subnet_t *subnet)
+/* Subnet comparison */
+
+int subnet_compare_mac(subnet_t *a, subnet_t *b)
 {
 cp
-  free(subnet);
+  return memcmp(&a->net.mac.address, &b->net.mac.address, sizeof(mac_t));
 }
 
-/* Linked list management */
-
-void subnet_add(conn_list_t *cl, subnet_t *subnet)
+int subnet_compare_ipv4(subnet_t *a, subnet_t *b)
 {
-  subnet_t *p = NULL;
-  subnet_t *q = NULL;
 cp
-  subnet->owner = cl;
+  /* If the subnet of a falls within the range of subnet b,
+     then we consider a smaller then b.
+     Otherwise, the addresses alone (and not the subnet masks) will be compared.
+   */
+   
+  if(a->net.ipv4.mask > b->net.ipv4.mask)
+    if((a->net.ipv4.address & b->net.ipv4.mask) == b->net.ipv4.address)
+      return -1;
 
-  /* Link it into the owners list of subnets (unsorted) */
+  return a->net.ipv4.address - b->net.ipv4.address;
+}
 
-  subnet->next = cl->subnets->next;
-  subnet->prev = NULL;
-  if(subnet->next)
-    subnet->next->prev = subnet;
-  cl->subnets = subnet;
+int subnet_compare_ipv6(subnet_t *a, subnet_t *b)
+{
+cp
+  /* Same as ipv4 case, but with nasty 128 bit addresses */
   
-  /* And now add it to the global subnet list (sorted) */
-
-  /* Sort on size of subnet mask (IPv4 only at the moment!)
+  if(memcmp(&a->net.ipv6.mask, &b->net.ipv6.mask, sizeof(ipv6_t)) > 0)
+    if((a->net.ipv6.address.x[0] & b->net.ipv6.mask.x[0]) == b->net.ipv6.address.x[0] &&
+       (a->net.ipv6.address.x[1] & b->net.ipv6.mask.x[1]) == b->net.ipv6.address.x[1] &&
+       (a->net.ipv6.address.x[2] & b->net.ipv6.mask.x[2]) == b->net.ipv6.address.x[2] &&
+       (a->net.ipv6.address.x[3] & b->net.ipv6.mask.x[3]) == b->net.ipv6.address.x[3] &&
+       (a->net.ipv6.address.x[4] & b->net.ipv6.mask.x[4]) == b->net.ipv6.address.x[4] &&
+       (a->net.ipv6.address.x[5] & b->net.ipv6.mask.x[5]) == b->net.ipv6.address.x[5] &&
+       (a->net.ipv6.address.x[6] & b->net.ipv6.mask.x[6]) == b->net.ipv6.address.x[6] &&
+       (a->net.ipv6.address.x[7] & b->net.ipv6.mask.x[7]) == b->net.ipv6.address.x[7])
+      return -1;
   
-     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;
+  return memcmp(&a->net.ipv6.address, &b->net.ipv6.address, sizeof(ipv6_t));
+}
 
-          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 */
+int subnet_compare(subnet_t *a, subnet_t *b)
+{
+  int x;
+cp  
+  x = a->type - b->type;
+  if(x)
+    return x;
+    
+  switch(a->type)
     {
-      /* Insert after q */
-      subnet->global_next = q->global_next;
-      subnet->global_prev = q;
-      q->global_next = subnet;
+      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;
     }
+}
+
+/* Allocating and freeing space for subnets */
 
-  if(subnet->global_next)
-    subnet->global_next->global_prev = subnet;
+subnet_t *new_subnet(void)
+{
 cp
+  return (subnet_t *)xmalloc(sizeof(subnet_t));
 }
 
-void subnet_del(subnet_t *subnet)
+void free_subnet(subnet_t *subnet)
 {
 cp
-  /* Remove it from owner's list */
-
-  if(subnet->prev)
-    {
-      subnet->prev->next = subnet->next;
-    }
-  else
-    {
-      subnet->owner->subnets = subnet->next;
-    }
+  free(subnet);
+}
 
-  subnet->next->prev = subnet->prev;
+/* Linked list management */
 
-  /* 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_add(connection_t *cl, subnet_t *subnet)
+{
+cp
+  subnet->owner = cl;
+  rbl_insert(subnet_tree, subnet);
+  rbl_insert(cl->subnet_tree, subnet);
+cp
+}
 
-  subnet->global_next->global_prev = subnet->global_prev;
-  
-  free_subnet(subnet);
+void subnet_del(subnet_t *subnet)
+{
+cp
+  rbl_delete(subnet->owner->subnet_tree, subnet);
+  rbl_delete(subnet_tree, subnet);
 cp
 }
 
@@ -146,9 +153,9 @@ subnet_t *str2net(char *subnetstr)
 cp
   if(sscanf(subnetstr, "%d,", &type) != 1)
     return NULL;
-
+cp
   subnet = new_subnet();
-
+cp
   switch(type)
     {
       case SUBNET_MAC:
@@ -194,7 +201,6 @@ cp
             return NULL;
           }
         break;
-                break;
       default:
         free_subnet(subnet);
         return NULL;
@@ -217,10 +223,12 @@ cp
                    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",
+        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],
@@ -237,8 +245,9 @@ cp
                    subnet->net.ipv6.mask.x[5],
                    subnet->net.ipv6.mask.x[6],
                    subnet->net.ipv6.mask.x[7]);
+        break;
       default:
-        netstr = NULL;
+        asprintf(&netstr, _("unknown"));
     }
 cp
   return netstr;
@@ -248,43 +257,47 @@ cp
 
 subnet_t *lookup_subnet_mac(mac_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;
-    }
+  subnet_t subnet;
 cp
-  return subnet;
+  subnet.type = SUBNET_MAC;
+  subnet.net.mac.address = address;
+  return (subnet_t *)rbl_search_closest(subnet_tree, &subnet);
 }
 
 subnet_t *lookup_subnet_ipv4(ipv4_t address)
 {
-  subnet_t *subnet;
+  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.type = SUBNET_IPV4;
+  subnet.net.ipv4.address = address;
+  subnet.net.ipv4.mask = 0xFFFFFFFF;
+  return (subnet_t *)rbl_search_closest(subnet_tree, &subnet);
 }
 
 subnet_t *lookup_subnet_ipv6(ipv6_t address)
 {
+  subnet_t subnet;
+cp
+  subnet.type = SUBNET_IPV6;
+  subnet.net.ipv6.address = address;
+  memset(&subnet.net.ipv6.mask, 0xFF, 16);
+  return (subnet_t *)rbl_search_closest(subnet_tree, &subnet);
+}
+
+void dump_subnet_list(void)
+{
+  char *netstr;
   subnet_t *subnet;
-  int i;
+  rbl_t *rbl;
 cp
-  for(subnet = subnet_list[SUBNET_IPV6]; subnet != NULL; subnet = subnet->next)
+  syslog(LOG_DEBUG, _("Subnet list:"));
+  RBL_FOREACH(subnet_tree, rbl)
     {
-      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;
+      subnet = (subnet_t *)rbl->data;
+      netstr = net2str(subnet);
+      syslog(LOG_DEBUG, " %s owner %s", netstr, subnet->owner->name);
+      free(netstr);
     }
+  syslog(LOG_DEBUG, _("End of subnet list."));
 cp
-  return subnet;
 }