X-Git-Url: https://www.tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=src%2Fsubnet.h;h=6fecca3b80079cbb0934ec25e106d5b5f3645718;hp=d68677f12e34d40ff2f467685d1f66030f8699c1;hb=57bc9a1835bcb6a8df7963ee4ab04fde34f28eaf;hpb=3f0c1f6b81dd305b0ded2424f9f7da441c7d97b6

diff --git a/src/subnet.h b/src/subnet.h
index d68677f1..6fecca3b 100644
--- a/src/subnet.h
+++ b/src/subnet.h
@@ -66,22 +66,21 @@ typedef struct subnet_t {
 
 extern avl_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 free_subnet(subnet_t *subnet);
 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 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 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 free_subnet_tree(avl_tree_t *subnet_tree);
+extern void subnet_add(struct node_t *owner, subnet_t *subnet);
+extern void subnet_del(struct node_t *owner, subnet_t *subnet);
+extern void subnet_update(struct node_t *owner, subnet_t *subnet, bool up);
+extern bool net2str(char *netstr, int len, const subnet_t *subnet);
+extern bool str2net(subnet_t *subnet, const char *netstr);
+extern subnet_t *lookup_subnet(const struct node_t *owner, const subnet_t *subnet);
+extern subnet_t *lookup_subnet_mac(const struct node_t *owner, const mac_t *address);
+extern subnet_t *lookup_subnet_ipv4(const ipv4_t *address);
+extern subnet_t *lookup_subnet_ipv6(const ipv6_t *address);
 extern void dump_subnets(void);
 extern void subnet_cache_flush(void);