X-Git-Url: https://tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=src%2Fsubnet.h;h=6184e6b77794639913731f14ec6a4b15b9e4952f;hp=7cb0e9bb1f50ce1037f2f55f4f347c7627cd75e9;hb=03878f12150cbdb1aeb43e207404a0929a35ff13;hpb=eefa28059ab989c915a7d95fb4ae728abd7ce713

diff --git a/src/subnet.h b/src/subnet.h
index 7cb0e9bb..6184e6b7 100644
--- a/src/subnet.h
+++ b/src/subnet.h
@@ -1,7 +1,7 @@
 /*
     subnet.h -- header for subnet.c
-    Copyright (C) 2000,2001 Guus Sliepen <guus@sliepen.eu.org>,
-                  2000,2001 Ivo Timmermans <ivo@o2w.nl>
+    Copyright (C) 2000-2012 Guus Sliepen <guus@tinc-vpn.org>,
+                  2000-2005 Ivo Timmermans
 
     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
@@ -13,28 +13,26 @@
     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: subnet.h,v 1.1.2.22 2003/07/22 20:55:20 guus Exp $
+    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__
 #define __TINC_SUBNET_H__
 
 #include "net.h"
+#include "node.h"
 
 typedef enum subnet_type_t {
 	SUBNET_MAC = 0,
 	SUBNET_IPV4,
 	SUBNET_IPV6,
-	SUBNET_TYPES				/* Guardian */
+	SUBNET_TYPES            /* Guardian */
 } subnet_type_t;
 
 typedef struct subnet_mac_t {
 	mac_t address;
-	time_t lastseen;
 } subnet_mac_t;
 
 typedef struct subnet_ipv4_t {
@@ -47,13 +45,12 @@ typedef struct subnet_ipv6_t {
 	int prefixlength;
 } subnet_ipv6_t;
 
-#include "node.h"
-
 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 */
+	struct node_t *owner;   /* the owner of this subnet */
 
-	subnet_type_t type;		/* subnet type (IPv4? IPv6? MAC? something even weirder?) */
+	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: */
 
@@ -64,20 +61,31 @@ typedef struct subnet_t {
 	} net;
 } subnet_t;
 
-extern subnet_t *new_subnet(void) __attribute__ ((malloc));
+#define MAXNETSTR 64
+
+extern splay_tree_t *subnet_tree;
+
+extern int subnet_compare(const struct subnet_t *, const struct subnet_t *);
+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 char *net2str(subnet_t *);
-extern subnet_t *str2net(char *);
-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__ */
+extern void subnet_update(struct node_t *, subnet_t *, bool);
+extern int maskcmp(const void *, const void *, int);
+extern void maskcpy(void *, const void *, int, int);
+extern void mask(void *, int, int);
+extern bool maskcheck(const void *, int, int);
+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 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 bool dump_subnets(struct connection_t *);
+extern void subnet_cache_flush(void);
+
+#endif /* __TINC_SUBNET_H__ */