Merge branch 'master' of git://tinc-vpn.org/tinc into 1.1

[meshlink] / src / protocol.h

diff --git a/src/protocol.h b/src/protocol.h
index f1c2a20655f7e34e8addaa78d0fa0cc8d1504a93..2c97641d97b9c5fc1a236dc367cc2932c7f2108f 100644 (file)
--- 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 */
 
@@ -55,6 +54,7 @@ typedef struct 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,
@@ -84,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 *);