-extern void subnet_add(struct conn_list_t *, subnet_t *);
-extern void subnet_del(subnet_t *);
-extern char *net2str(subnet_t *);
-extern subnet_t *str2net(char *);
-extern subnet_t *lookup_subnet_mac(subnet_t *, mac_t);
-extern subnet_t *lookup_subnet_ipv4(subnet_t *, ipv4_t);
-extern subnet_t *lookup_subnet_ipv6(subnet_t *, ipv6_t);
-
-
-#endif /* __TINC_SUBNET_H__ */
+extern void init_subnets(void);
+extern void exit_subnets(void);
+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 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__ */