X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;f=src%2Fsubnet.h;h=df48f60eda8268cc989cb9591bf47b4c72076c8f;hb=d6c50eb73ad49bd2eac67214995dff76b7a20661;hp=c50ac6c8577c4cb0f5a0bbe8417b13dfde6d214d;hpb=de78d79db84c486afcc353884ec1770866beb653;p=meshlink

diff --git a/src/subnet.h b/src/subnet.h
index c50ac6c8..df48f60e 100644
--- a/src/subnet.h
+++ b/src/subnet.h
@@ -1,6 +1,6 @@
 /*
     subnet.h -- header for subnet.c
-    Copyright (C) 2000-2006 Guus Sliepen <guus@tinc-vpn.org>,
+    Copyright (C) 2000-2009 Guus Sliepen <guus@tinc-vpn.org>,
                   2000-2005 Ivo Timmermans
 
     This program is free software; you can redistribute it and/or modify
@@ -13,11 +13,9 @@
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
     GNU General Public License for more details.
 
-    You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-
-    $Id$
+    You should have received a copy of the GNU General Public License along
+    with this program; if not, write to the Free Software Foundation, Inc.,
+    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
 
 #ifndef __TINC_SUBNET_H__
@@ -53,6 +51,7 @@ typedef struct subnet_t {
 
 	subnet_type_t type;		/* subnet type (IPv4? IPv6? MAC? something even weirder?) */
 	time_t expires;			/* expiry time */
+	int weight;			/* weight (higher value is higher priority) */
 
 	/* And now for the actual subnet: */
 
@@ -70,17 +69,18 @@ extern subnet_t *new_subnet(void) __attribute__ ((__malloc__));
 extern void free_subnet(subnet_t *);
 extern void init_subnets(void);
 extern void exit_subnets(void);
-extern avl_tree_t *new_subnet_tree(void) __attribute__ ((__malloc__));
-extern void free_subnet_tree(avl_tree_t *);
+extern splay_tree_t *new_subnet_tree(void) __attribute__ ((__malloc__));
+extern void free_subnet_tree(splay_tree_t *);
 extern void subnet_add(struct node_t *, subnet_t *);
 extern void subnet_del(struct node_t *, subnet_t *);
 extern void subnet_update(struct node_t *, subnet_t *, bool);
 extern bool net2str(char *, int, const subnet_t *);
 extern bool str2net(subnet_t *, const char *);
 extern subnet_t *lookup_subnet(const struct node_t *, const subnet_t *);
-extern subnet_t *lookup_subnet_mac(const mac_t *);
+extern subnet_t *lookup_subnet_mac(const struct node_t *, const mac_t *);
 extern subnet_t *lookup_subnet_ipv4(const ipv4_t *);
 extern subnet_t *lookup_subnet_ipv6(const ipv6_t *);
-extern void dump_subnets(void);
+extern bool dump_subnets(struct connection_t *);
+extern void subnet_cache_flush(void);
 
 #endif							/* __TINC_SUBNET_H__ */