Merging of the entire pre5 branch.

[tinc] / src / subnet.h

diff --git a/src/subnet.h b/src/subnet.h
index 5969301..9657ad9 100644 (file)
--- 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.11 2001/10/27 12:13:17 guus Exp $
+    $Id: subnet.h,v 1.1.2.15 2002/02/10 21:57:54 guus Exp $
 */
 
 #ifndef __TINC_SUBNET_H__
@@ -42,12 +42,14 @@ typedef struct subnet_ipv4_t
 {
   ipv4_t address;
   ipv4_t mask;
+  int masklength;
 } subnet_ipv4_t;
 
 typedef struct subnet_ipv6_t
 {
   ipv6_t address;
   ipv6_t mask;
+  int masklength;
 } subnet_ipv6_t;
 
 #include "node.h"
@@ -66,21 +68,22 @@ typedef struct subnet_t {
       subnet_ipv4_t ipv4;
       subnet_ipv6_t ipv6;
     } net;
-    
 } subnet_t;
 
 extern subnet_t *new_subnet(void);
 extern void free_subnet(subnet_t *);
 extern void init_subnets(void);
+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__ */