Merge branch 'master' into 1.1

[meshlink] / src / subnet.h

diff --git a/src/subnet.h b/src/subnet.h
index c6aa93f2d058c023443b50b73029de4559890906..df48f60eda8268cc989cb9591bf47b4c72076c8f 100644 (file)
--- a/src/subnet.h
+++ b/src/subnet.h
@@ -77,10 +77,10 @@ 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 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 int dump_subnets(struct evbuffer *);
+extern bool dump_subnets(struct connection_t *);
 extern void subnet_cache_flush(void);
 
 #endif                                                 /* __TINC_SUBNET_H__ */