X-Git-Url: https://www.tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=src%2Fsubnet.h;h=50cfefd7f84ae3589706db68de5a98ce2a0b9580;hp=8ebed81d87a8ad406c3935a3e113ed64343f125f;hb=66067cc9c1347fb2de35660d531fdd4be8aede6a;hpb=183a8edd22ba4bc682392c73ae02fc9e121eda68

diff --git a/src/subnet.h b/src/subnet.h
index 8ebed81d..50cfefd7 100644
--- a/src/subnet.h
+++ b/src/subnet.h
@@ -1,7 +1,7 @@
 /*
     subnet.h -- header for subnet.c
-    Copyright (C) 2000 Guus Sliepen <guus@sliepen.warande.net>,
-                  2000 Ivo Timmermans <itimmermans@bigfoot.com>
+    Copyright (C) 2000,2001 Guus Sliepen <guus@sliepen.warande.net>,
+                  2000,2001 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.h,v 1.1.2.3 2000/10/11 22:01:02 guus Exp $
+    $Id: subnet.h,v 1.1.2.12 2001/10/27 13:13:35 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
@@ -49,12 +50,11 @@ typedef struct subnet_ipv6_t
   ipv6_t mask;
 } subnet_ipv6_t;
 
-typedef struct subnet_t {
-  struct conn_list_t *owner;		/* the owner of this subnet */
-  struct conn_list_t *uplink;		/* the uplink which we should send packets to for this subnet */
+#include "node.h"
 
-  struct subnet_t *prev;		/* previous subnet_t for this owner */
-  struct subnet_t *next;		/* next subnet_t for this owner */
+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?) */
 
@@ -67,19 +67,20 @@ typedef struct subnet_t {
       subnet_ipv6_t ipv6;
     } net;
     
-} subnet_t;  
-
-#include "connlist.h"
+} subnet_t;
 
 extern subnet_t *new_subnet(void);
 extern void free_subnet(subnet_t *);
-extern void subnet_add(struct conn_list_t *, subnet_t *);
-extern void subnet_del(subnet_t *);
+extern void init_subnets(void);
+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 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 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_subnets(void);
 
 #endif /* __TINC_SUBNET_H__ */