X-Git-Url: https://www.tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=src%2Fsubnet.h;h=d1dd96517ff3746003cd10328e01ada6f4c7c6b2;hp=21b2a1e5ece102b1d20ec86c266ad256a8e63594;hb=ede6671c1354eeab86936efda32f6cdb3b3fd8d5;hpb=d3f889c8076dff9c00ebfe1459cb36425f8da41d

diff --git a/src/subnet.h b/src/subnet.h
index 21b2a1e5..d1dd9651 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.9 2001/01/07 17:09:07 guus Exp $
+    $Id: subnet.h,v 1.1.2.13 2001/10/28 22:42:49 guus Exp $
 */
 
 #ifndef __TINC_SUBNET_H__
@@ -50,15 +50,11 @@ typedef struct subnet_ipv6_t
   ipv6_t mask;
 } subnet_ipv6_t;
 
-typedef struct subnet_t {
-  struct connection_t *owner;		/* the owner of this subnet */
-  struct connection_t *uplink;		/* the uplink which we should send packets to for this subnet */
-
-  struct subnet_t *prev;		/* previous subnet_t for this owner */
-  struct subnet_t *next;		/* next subnet_t for this owner */
+#include "node.h"
 
-  struct subnet_t *global_prev;		/* previous subnet_t for this subnet type */
-  struct subnet_t *global_next;		/* next subnet_t for this subnet type */
+typedef struct subnet_t {
+  struct node_t *owner;			/* the owner of this subnet */
+  struct node_t *uplink;		/* the uplink which we should send packets to for this subnet */
 
   int type;				/* subnet type (IPv4? IPv6? MAC? something even weirder?) */
 
@@ -71,21 +67,22 @@ typedef struct subnet_t {
       subnet_ipv6_t ipv6;
     } net;
     
-} subnet_t;  
-
-#include "connection.h"
+} subnet_t;
 
 extern subnet_t *new_subnet(void);
 extern void free_subnet(subnet_t *);
 extern void init_subnets(void);
-extern void subnet_add(struct connection_t *, subnet_t *);
-extern void subnet_del(subnet_t *);
+extern void exit_subnets(void);
+extern avl_tree_t *new_subnet_tree(void);
+extern void free_subnet_tree(avl_tree_t *);
+extern void subnet_add(struct node_t *, subnet_t *);
+extern void subnet_del(struct node_t *, subnet_t *);
 extern char *net2str(subnet_t *);
 extern subnet_t *str2net(char *);
-extern int subnet_compare(subnet_t *, subnet_t *);
+extern subnet_t *lookup_subnet(struct node_t *, subnet_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 *);
-extern void dump_subnet_list(void);
+extern void dump_subnets(void);
 
 #endif /* __TINC_SUBNET_H__ */