- struct conn_list_t *owner; /* the owner of this subnet */
- struct conn_list_t *uplink; /* the uplink which we should send packets to for this subnet */
-
- struct subnet_t *prev; /* previous subnet_t for this owner */
- struct subnet_t *next; /* next subnet_t for this owner */
-
- struct subnet_t *global_prev; /* previous subnet_t for this subnet type */
- struct subnet_t *global_next; /* next subnet_t for this subnet type */
-
- int type; /* subnet type (IPv4? IPv6? MAC? something even weirder?) */
-
- /* And now for the actual subnet: */
-
- union net
- {
- subnet_mac_t mac;
- subnet_ipv4_t ipv4;
- subnet_ipv6_t ipv6;
- } net;
-
-} subnet_t;
-
-#include "connlist.h"
-
-extern subnet_t *new_subnet(void);
-extern void free_subnet(subnet_t *);
-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(mac_t);
-extern subnet_t *lookup_subnet_ipv4(ipv4_t);
-extern subnet_t *lookup_subnet_ipv6(ipv6_t);
-extern void dump_subnet_list(void);
-
-#endif /* __TINC_SUBNET_H__ */
+ struct node_t *owner; /* the owner of this subnet */
+
+ 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: */
+
+ union net {
+ subnet_mac_t mac;
+ subnet_ipv4_t ipv4;
+ subnet_ipv6_t ipv6;
+ } net;
+} subnet_t;
+
+#define MAXNETSTR 64
+
+extern splay_tree_t *subnet_tree;
+
+extern int subnet_compare(const struct subnet_t *a, const struct subnet_t *b);
+extern subnet_t *new_subnet(void) __attribute__((__malloc__));
+extern void free_subnet(subnet_t *subnet);
+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 *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 int maskcmp(const void *a, const void *b, int masklen);
+extern void maskcpy(void *dest, const void *src, int masklen, int len);
+extern void mask(void *mask, int masklen, int len);
+extern bool subnetcheck(const subnet_t subnet);
+extern bool maskcheck(const void *mask, int masklen, int len);
+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 bool dump_subnets(struct connection_t *c);
+extern void subnet_cache_flush(void);
+
+#endif