X-Git-Url: https://www.tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=src%2Fsubnet.h;h=0ea218605af8571ee648807e1939eba4be9b8bc3;hp=994c541c9a6110d68d3186f18ccf60cd1815365f;hb=627f7c22b447bd464b536cd016278545674df93d;hpb=f25868fd2b58bc0b350a5cfaf342480f28f804cf

diff --git a/src/subnet.h b/src/subnet.h
index 994c541c..0ea21860 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.eu.org>,
+                  2000,2001 Ivo Timmermans <ivo@o2w.nl>
 
     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.5 2000/10/28 21:05:20 guus Exp $
+    $Id: subnet.h,v 1.1.2.19 2002/06/21 10:11:34 guus Exp $
 */
 
 #ifndef __TINC_SUBNET_H__
@@ -36,29 +36,26 @@ enum
 typedef struct subnet_mac_t
 {
   mac_t address;
+  time_t lastseen;
 } subnet_mac_t;
 
 typedef struct subnet_ipv4_t
 {
   ipv4_t address;
-  ipv4_t mask;
+  int prefixlength;
 } subnet_ipv4_t;
 
 typedef struct subnet_ipv6_t
 {
   ipv6_t address;
-  ipv6_t mask;
+  int prefixlength;
 } 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 */
-
-  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?) */
 
@@ -70,20 +67,22 @@ typedef struct subnet_t {
       subnet_ipv4_t ipv4;
       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 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 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 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__ */