From: Guus Sliepen <guus@tinc-vpn.org>
Date: Sat, 28 Oct 2000 16:41:40 +0000 (+0000)
Subject: - Updated subnet list handling. Subnets are added to two lists now, the
X-Git-Tag: release-1.0pre3~66
X-Git-Url: https://tinc-vpn.org/git/browse?a=commitdiff_plain;h=d47d5932a3bbc4940aa6453ebfe617ef330783c8;p=tinc

- Updated subnet list handling. Subnets are added to two lists now, the
  owner's list and a global list. It is all fucked up but it probably
  works anyway, good enough for pre3 :).
---

diff --git a/src/connlist.c b/src/connlist.c
index b3bb3c46..ebb276e7 100644
--- a/src/connlist.c
+++ b/src/connlist.c
@@ -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: connlist.c,v 1.1.2.8 2000/10/24 15:46:16 guus Exp $
+    $Id: connlist.c,v 1.1.2.9 2000/10/28 16:41:37 guus Exp $
 */
 
 #include <syslog.h>
@@ -153,39 +153,6 @@ cp
   return p;
 }
 
-conn_list_t *lookup_conn_list_mac(mac_t address)
-{
-  conn_list_t *p;
-cp
-  for(p = conn_list; p != NULL; p = p->next)
-    if(lookup_subnet_mac(p->subnets, address))
-      break;
-cp
-  return p;
-}
-
-conn_list_t *lookup_conn_list_ipv4(ipv4_t address)
-{
-  conn_list_t *p;
-cp
-  for(p = conn_list; p != NULL; p = p->next)
-    if(lookup_subnet_ipv4(p->subnets, address))
-      break;
-cp
-  return p;
-}
-
-conn_list_t *lookup_conn_list_ipv6(ipv6_t address)
-{
-  conn_list_t *p;
-cp
-  for(p = conn_list; p != NULL; p = p->next)
-    if(lookup_subnet_ipv6(p->subnets, address))
-      break;
-cp
-  return p;
-}
-
 /* Debugging */
 
 void dump_conn_list(void)
diff --git a/src/connlist.h b/src/connlist.h
index 0c81e06e..3ea64eed 100644
--- a/src/connlist.h
+++ b/src/connlist.h
@@ -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: connlist.h,v 1.1.2.4 2000/10/20 15:34:34 guus Exp $
+    $Id: connlist.h,v 1.1.2.5 2000/10/28 16:41:37 guus Exp $
 */
 
 #ifndef __TINC_CONNLIST_H__
@@ -86,9 +86,6 @@ extern void free_conn_list(conn_list_t *);
 extern void add_conn_list(conn_list_t *);
 extern void del_conn_list(conn_list_t *);
 extern conn_list_t *lookup_id(char *);
-extern conn_list_t *lookup_conn_list_mac(mac_t);
-extern conn_list_t *lookup_conn_list_ipv4(ipv4_t);
-extern conn_list_t *lookup_conn_list_ipv6(ipv6_t);
 extern void dump_conn_list(void);
 extern int read_host_config(conn_list_t *);
 
diff --git a/src/net.c b/src/net.c
index ae6fbed8..d99bd287 100644
--- a/src/net.c
+++ b/src/net.c
@@ -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: net.c,v 1.35.4.45 2000/10/24 15:46:16 guus Exp $
+    $Id: net.c,v 1.35.4.46 2000/10/28 16:41:38 guus Exp $
 */
 
 #include "config.h"
@@ -274,8 +274,9 @@ cp
 int send_packet(ip_t to, vpn_packet_t *packet)
 {
   conn_list_t *cl;
+  subnet_t *subnet;
 cp
-  if((cl = lookup_conn_list_ipv4(to)) == NULL)
+  if((subnet = lookup_subnet_ipv4(to)) == NULL)
     {
       if(debug_lvl >= DEBUG_TRAFFIC)
         {
@@ -285,6 +286,8 @@ cp
 
       return -1;
    }
+
+  cl = subnet->owner;
     
   /* If we ourselves have indirectdata flag set, we should send only to our uplink! */
 
diff --git a/src/subnet.c b/src/subnet.c
index fbcfba7f..c7b2ed7e 100644
--- a/src/subnet.c
+++ b/src/subnet.c
@@ -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.5 2000/10/24 15:46:18 guus Exp $
+    $Id: subnet.c,v 1.1.2.6 2000/10/28 16:41:40 guus Exp $
 */
 
 #include "config.h"
@@ -27,6 +27,10 @@
 #include "subnet.h"
 #include "net.h"
 
+/* lists type of subnet */
+
+subnet_t *subnet_list[SUBNET_TYPES] = { NULL };
+
 /* Allocating and freeing space for subnets */
 
 subnet_t *new_subnet(void)
@@ -50,18 +54,28 @@ void subnet_add(conn_list_t *cl, subnet_t *subnet)
 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: cl->subnets = NULL -> just add this subnet
+     Three cases: subnet_list[] = NULL -> just add this subnet
                   insert before first -> add it in front of list
                   rest: insert after another subnet
    */
 
-  if(cl->subnets)
+  if(subnet_list[subnet->type])
     {
-      p = q = cl->subnets;
+      p = q = subnet_list[subnet->type];
 
-      for(; p; p = p->next)
+      for(; p; p = p->global_next)
         {
           if(subnet->net.ipv4.mask >= p->net.ipv4.mask)
             break;
@@ -69,38 +83,56 @@ cp
           q = p;
         }
      }
-     
-  if(!cl->subnets || p == cl->subnets)	/* First two cases */
+  
+  if(!subnet_list[subnet->type] || p == subnet_list[subnet->type])  /* First two cases */
     {
       /* Insert in front */
-      subnet->next = cl->subnets;
-      subnet->prev = NULL;
-      cl->subnets = subnet;
+      subnet->global_next = subnet_list[subnet->type];
+      subnet->global_prev = NULL;
+      subnet_list[subnet->type] = subnet;
     }
-  else					/* Third case */
+  else                                  /* Third case */
     {
       /* Insert after q */
-      subnet->next = q->next;
-      subnet->prev = q;
-      q->next = subnet;
+      subnet->global_next = q->global_next;
+      subnet->global_prev = q;
+      q->global_next = subnet;
     }
 
-  if(subnet->next)
-    subnet->next->prev = subnet;
+  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;
+    }
 
+  subnet->global_next->global_prev = subnet->global_prev;
+  
   free_subnet(subnet);
 cp
 }
@@ -185,10 +217,8 @@ 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",
                    subnet->net.ipv6.address.x[0],
@@ -207,7 +237,6 @@ cp
                    subnet->net.ipv6.mask.x[5],
                    subnet->net.ipv6.mask.x[6],
                    subnet->net.ipv6.mask.x[7]);
-        break;
       default:
         netstr = NULL;
     }
@@ -217,49 +246,44 @@ 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->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->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->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;
diff --git a/src/subnet.h b/src/subnet.h
index 8ebed81d..0d628767 100644
--- a/src/subnet.h
+++ b/src/subnet.h
@@ -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.h,v 1.1.2.3 2000/10/11 22:01:02 guus Exp $
+    $Id: subnet.h,v 1.1.2.4 2000/10/28 16:41:40 guus Exp $
 */
 
 #ifndef __TINC_SUBNET_H__
@@ -30,6 +30,7 @@ enum
   SUBNET_MAC = 0,
   SUBNET_IPV4,
   SUBNET_IPV6,
+  SUBNET_TYPES				/* Guardian */
 };
 
 typedef struct subnet_mac_t
@@ -56,6 +57,9 @@ typedef struct subnet_t {
   struct subnet_t *prev;		/* previous subnet_t for this owner */
   struct subnet_t *next;		/* next subnet_t for this owner */
 
+  struct subnet_t *global_prev;		/* previous subnet_t for this subnet type */
+  struct subnet_t *global_next;		/* next subnet_t for this subnet type */
+
   int type;				/* subnet type (IPv4? IPv6? MAC? something even weirder?) */
 
   /* And now for the actual subnet: */
@@ -77,9 +81,9 @@ extern void subnet_add(struct conn_list_t *, subnet_t *);
 extern void subnet_del(subnet_t *);
 extern char *net2str(subnet_t *);
 extern subnet_t *str2net(char *);
-extern subnet_t *lookup_subnet_mac(subnet_t *, mac_t);
-extern subnet_t *lookup_subnet_ipv4(subnet_t *, ipv4_t);
-extern subnet_t *lookup_subnet_ipv6(subnet_t *, ipv6_t);
+extern subnet_t *lookup_subnet_mac(mac_t);
+extern subnet_t *lookup_subnet_ipv4(ipv4_t);
+extern subnet_t *lookup_subnet_ipv6(ipv6_t);
 
 
 #endif /* __TINC_SUBNET_H__ */