X-Git-Url: https://tinc-vpn.org/git/browse?a=blobdiff_plain;f=src%2Fsubnet.h;h=0c0e99d0f5117aee6662bb90d20c887bee802c2f;hb=e5e96882c3825cee81ff163490b2f39fad3192b8;hp=c9bb10e8a8fdb161221ef51f8f40148459b06312;hpb=ab7c61b06f6c6e991225f2fcc32d02b8e1084aee;p=tinc

diff --git a/src/subnet.h b/src/subnet.h
index c9bb10e8..0c0e99d0 100644
--- a/src/subnet.h
+++ b/src/subnet.h
@@ -64,23 +64,29 @@ typedef struct subnet_t {
 
 #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 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 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__ */