Merge branch 'master' into 1.1

[meshlink] / src / protocol.h

diff --git a/src/protocol.h b/src/protocol.h
index f290148f90f500d71404e3b58f3eee5b72ba20ed..29c4ab1cdd052ad4f85d51fa036421b242e43a46 100644 (file)
--- a/src/protocol.h
+++ b/src/protocol.h
@@ -54,6 +54,7 @@ typedef struct past_request_t {
 } past_request_t;
 
 extern bool tunnelserver;
+extern bool strictsubnets;
 
 /* Maximum size of strings in a request.
  * scanf terminates %2048s with a NUL character,
@@ -95,7 +96,7 @@ extern bool send_add_subnet(struct connection_t *, const struct subnet_t *);
 extern bool send_del_subnet(struct connection_t *, const struct subnet_t *);
 extern bool send_add_edge(struct connection_t *, const struct edge_t *);
 extern bool send_del_edge(struct connection_t *, const struct edge_t *);
-extern bool send_key_changed();
+extern void send_key_changed();
 extern bool send_req_key(struct node_t *);
 extern bool send_ans_key(struct node_t *);
 extern bool send_tcppacket(struct connection_t *, struct vpn_packet_t *);