X-Git-Url: https://tinc-vpn.org/git/browse?a=blobdiff_plain;f=src%2Fprotocol.h;h=2c97641d97b9c5fc1a236dc367cc2932c7f2108f;hb=574b380dfc75ef13ee4accba1f2416165c58a5a2;hp=a5ac8edc16731505018930e5cbb43d5f4f8c5b5f;hpb=108b238915c5f58b3d94ab433dc5d04e064c2b11;p=tinc

diff --git a/src/protocol.h b/src/protocol.h
index a5ac8edc..2c97641d 100644
--- a/src/protocol.h
+++ b/src/protocol.h
@@ -21,11 +21,10 @@
 #ifndef __TINC_PROTOCOL_H__
 #define __TINC_PROTOCOL_H__
 
-/* Protocol version. Different versions are incompatible,
-   incompatible version have different protocols.
- */
+/* Protocol version. Different major versions are incompatible. */
 
-#define PROT_CURRENT 17
+#define PROT_MAJOR 17
+#define PROT_MINOR 2
 
 /* Silly Windows */
 
@@ -44,6 +43,7 @@ typedef enum request_t {
 	ADD_EDGE, DEL_EDGE,
 	KEY_CHANGED, REQ_KEY, ANS_KEY,
 	PACKET,
+	CONTROL,
 	LAST						/* Guardian for the highest request number */
 } request_t;
 
@@ -53,6 +53,8 @@ typedef struct past_request_t {
 } past_request_t;
 
 extern bool tunnelserver;
+extern bool strictsubnets;
+extern bool experimental;
 
 /* Maximum size of strings in a request.
  * scanf terminates %2048s with a NUL character,
@@ -82,6 +84,7 @@ extern bool seen_request(char *);
 
 extern bool send_id(struct connection_t *);
 extern bool send_metakey(struct connection_t *);
+extern bool send_metakey_ec(struct connection_t *);
 extern bool send_challenge(struct connection_t *);
 extern bool send_chal_reply(struct connection_t *);
 extern bool send_ack(struct connection_t *);
@@ -94,10 +97,10 @@ 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(void);
 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 *);
+extern bool send_tcppacket(struct connection_t *, const struct vpn_packet_t *);
 
 /* Request handlers  */
 
@@ -119,5 +122,6 @@ extern bool key_changed_h(struct connection_t *, char *);
 extern bool req_key_h(struct connection_t *, char *);
 extern bool ans_key_h(struct connection_t *, char *);
 extern bool tcppacket_h(struct connection_t *, char *);
+extern bool control_h(struct connection_t *, char *);
 
 #endif							/* __TINC_PROTOCOL_H__ */