X-Git-Url: https://www.tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=src%2Fsubnet.c;h=9fceea8e0fe386b086257d4edc53f0dd34e8dac2;hp=12b78ef8ebee11612d0a8a1f515f8400373ae4bf;hb=5065ea32c32e27478d93c00a1bba0c812b7a2b8c;hpb=85adeef21275633b78a234b2660cbe3bc9dd2c33

diff --git a/src/subnet.c b/src/subnet.c
index 12b78ef8..9fceea8e 100644
--- a/src/subnet.c
+++ b/src/subnet.c
@@ -17,15 +17,25 @@
     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.4 2000/10/15 00:59:37 guus Exp $
+    $Id: subnet.c,v 1.1.2.9 2000/11/03 22:35:12 zarq 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 "subnet.h"
+#include "system.h"
+
+#include <utils.h>
+#include <xalloc.h>
+
+/* lists type of subnet */
+
+subnet_t *subnet_list[SUBNET_TYPES] = { NULL };
 
 /* Allocating and freeing space for subnets */
 
@@ -45,29 +55,84 @@ cp
 
 void subnet_add(conn_list_t *cl, subnet_t *subnet)
 {
+  subnet_t *p = NULL;
+  subnet_t *q = NULL;
 cp
-  /* FIXME: do sorting on netmask size if necessary */
+  subnet->owner = cl;
 
-  subnet->next = cl->subnets->next;
+  /* Link it into the owners list of subnets (unsorted) */
+
+  subnet->next = cl->subnets;
   subnet->prev = NULL;
-  subnet->next->prev = subnet;
+  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
+   */
+cp
+  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;
+        }
+     }
+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;
+    }
+cp
+  if(subnet->global_next)
+    subnet->global_next->global_prev = subnet;
 cp
 }
 
 void subnet_del(subnet_t *subnet)
 {
 cp
+  /* Remove it from owner's list */
+
   if(subnet->prev)
-    {
-      subnet->prev->next = subnet->next;
-    }
+    subnet->prev->next = subnet->next;
   else
-    {
-      subnet->owner->subnets = subnet->next;
-    }
+    subnet->owner->subnets = subnet->next;
+
+  if(subnet->next)
+    subnet->next->prev = subnet->prev;
 
-  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;
+
+  if(subnet->global_next)
+    subnet->global_next->global_prev = subnet->global_prev;
+  
   free_subnet(subnet);
 cp
 }
@@ -81,9 +146,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:
@@ -100,7 +165,7 @@ cp
           }
         break;
       case SUBNET_IPV4:
-        if(sscanf(subnetstr, "%d,%lx:%lx", &subnet->type, &subnet->net.ipv4.address, &subnet->net.ipv4.mask) != 3)
+        if(sscanf(subnetstr, "%d,%lx/%lx", &subnet->type, &subnet->net.ipv4.address, &subnet->net.ipv4.mask) != 3)
           {
             free_subnet(subnet);
             return NULL;
@@ -129,7 +194,6 @@ cp
             return NULL;
           }
         break;
-                break;
       default:
         free_subnet(subnet);
         return NULL;
@@ -152,8 +216,10 @@ 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);
+        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->net.ipv6.address.x[0],
@@ -172,8 +238,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;
@@ -181,50 +248,63 @@ cp
 
 /* Subnet lookup routines */
 
-subnet_t *lookup_subnet_mac(subnet_t *subnets, mac_t address)
+subnet_t *lookup_subnet_mac(mac_t address)
 {
   subnet_t *subnet;
 cp
-  for(subnet = subnets; subnet != NULL; subnet = subnet->next)
+  for(subnet = subnet_list[SUBNET_MAC]; subnet != NULL; subnet = subnet->global_next)
     {
-      if(subnet->type == SUBNET_MAC)
-        if(memcmp(&address, &subnet->net.mac.address, sizeof(address)) == 0)
-          break;
+      if(memcmp(&address, &subnet->net.mac.address, sizeof(address)) == 0)
+        break;
     }
 cp
   return subnet;
 }
 
-subnet_t *lookup_subnet_ipv4(subnet_t *subnets, ipv4_t address)
+subnet_t *lookup_subnet_ipv4(ipv4_t address)
 {
   subnet_t *subnet;
 cp
-  for(subnet = subnets; subnet != NULL; subnet = subnet->next)
+  for(subnet = subnet_list[SUBNET_IPV4]; subnet != NULL; subnet = subnet->global_next)
     {
-      if(subnet->type == SUBNET_IPV4)
-        if((address & subnet->net.ipv4.mask) == subnet->net.ipv4.address)
-          break;
+      if((address & subnet->net.ipv4.mask) == subnet->net.ipv4.address)
+        break;
     }
 cp
   return subnet;
 }
 
-subnet_t *lookup_subnet_ipv6(subnet_t *subnets, ipv6_t address)
+subnet_t *lookup_subnet_ipv6(ipv6_t address)
 {
   subnet_t *subnet;
   int i;
 cp
-  for(subnet = subnets; subnet != NULL; subnet = subnet->next)
+  for(subnet = subnet_list[SUBNET_IPV6]; subnet != NULL; subnet = subnet->global_next)
     {
-      if(subnet->type == SUBNET_IPV6)
-        {
-          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;
-        }
+      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;
 }
+
+void dump_subnet_list(void)
+{
+  subnet_t *subnet;
+  char *netstr;
+cp
+  syslog(LOG_DEBUG, _("Subnet list:"));
+
+  for(subnet = subnet_list[SUBNET_IPV4]; subnet != NULL; subnet = subnet->global_next)
+    {
+      netstr = net2str(subnet);
+      syslog(LOG_DEBUG, "  %s owner %s", netstr, subnet->owner->name);
+      free(netstr);
+    }
+
+  syslog(LOG_DEBUG, _("End of subnet list."));
+cp
+}