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

diff --git a/src/subnet.c b/src/subnet.c
index 1b7bc386..954d5d0a 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-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,7 +17,7 @@
     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.28 2001/10/30 12:59:12 guus Exp $
+    $Id: subnet.c,v 1.1.2.31 2002/02/20 17:16:15 guus Exp $
 */
 
 #include "config.h"
@@ -25,16 +25,26 @@
 #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>
-#include <avl_tree.h>
+int cache_mac_valid = 0;
+int cache_ipv4_valid = 0;
+int cache_ipv6_valid = 0;
 
 /* lists type of subnet */
 
@@ -50,48 +60,36 @@ cp
 
 int subnet_compare_ipv4(subnet_t *a, subnet_t *b)
 {
+  int result;
 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;
+  result = memcmp(&a->net.ipv4.address, &b->net.ipv4.address, sizeof(ipv4_t));
+  
+  if(result)
+    return result;
 
-  return 0;
+  return a->net.ipv4.masklength - b->net.ipv4.masklength;
 }
 
 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));
+  result = memcmp(&a->net.ipv6.address, &b->net.ipv6.address, 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 0;
+  return a->net.ipv6.masklength - b->net.ipv6.masklength;
 }
 
 int subnet_compare(subnet_t *a, subnet_t *b)
 {
-  int x;
+  int result;
 cp  
-  x = a->type - b->type;
-  if(x)
-    return x;
+  result = a->type - b->type;
+ 
+  if(result)
+    return result;
     
   switch(a->type)
     {
@@ -102,10 +100,12 @@ cp
       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;
+        syslog(LOG_ERR, _("subnet_compare() was called with unknown subnet type %d, exitting!"), a->type);
+        cp_trace();
+        exit(0);
     }
+
+  return 0;
 }
 
 /* Initialising trees */
@@ -154,11 +154,20 @@ cp
 
 /* 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
   subnet->owner = n;
 
+  cache_invalidate();
+
   avl_insert(subnet_tree, subnet);
 cp
   avl_insert(n->subnet_tree, subnet);
@@ -168,6 +177,8 @@ cp
 void subnet_del(node_t *n, subnet_t *subnet)
 {
 cp
+  cache_invalidate();
+
   avl_delete(n->subnet_tree, subnet);
 cp
   avl_delete(subnet_tree, subnet);
@@ -178,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)
@@ -246,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],
@@ -255,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 subnet type"));
+        syslog(LOG_ERR, _("net2str() was called with unknown subnet type %d, exitting!"), subnet->type);
+	cp_trace();
+        exit(0);
     }
 cp
   return netstr;
@@ -293,23 +304,30 @@ cp
 
 subnet_t *lookup_subnet_mac(mac_t *address)
 {
-  subnet_t subnet, *p;
+  static subnet_t subnet, *p;
 cp
+  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 p;
 }
 
 subnet_t *lookup_subnet_ipv4(ipv4_t *address)
 {
-  subnet_t subnet, *p;
+  static subnet_t subnet, *p;
 cp
+  if(cache_ipv4_valid && !memcmp(&subnet.net.ipv4.address, address, sizeof(ipv4_t)))
+    return p;
+
   subnet.type = SUBNET_IPV4;
-  subnet.net.ipv4.address = *address;
-  subnet.net.ipv4.mask = 0xFFFFFFFF;
+  memcpy(&subnet.net.ipv4.address, address, sizeof(ipv4_t));
+  subnet.net.ipv4.masklength = 32;
 
   do
   {
@@ -321,37 +339,70 @@ cp
 cp
     if(p)
       {
-        if ((*address & p->net.ipv4.mask) == p->net.ipv4.address)
+	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.mask = p->net.ipv4.mask << 1;
-            subnet.net.ipv4.address = p->net.ipv4.address & subnet.net.ipv4.mask;
+            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);
+  } while (p);
    
-   return 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 subnet, *p;
-  int i;
+  static subnet_t subnet, *p;
 cp
+  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));
-  memset(&subnet.net.ipv6.mask, 0xFF, 16);
+  subnet.net.ipv6.masklength = 128;
   
-  p = (subnet_t *)avl_search_closest_greater(subnet_tree, &subnet);
+  do
+  {
+    /* Go find 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;
+    p = (subnet_t *)avl_search_closest_smaller(subnet_tree, &subnet);
+
+    /* Check if the found subnet REALLY matches */
+
+cp
+    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;
 }
 
@@ -366,7 +417,7 @@ cp
     {
       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."));