Merge branch 'master' into 1.1

[meshlink] / src / protocol.h

diff --git a/src/protocol.h b/src/protocol.h
index 540a7c3fb6aa7455791727bbdf5e150f27a78df6..41f74ab4bcd5f736df1641cac6a12410f390d2f3 100644 (file)
--- a/src/protocol.h
+++ b/src/protocol.h
@@ -24,7 +24,7 @@
 /* Protocol version. Different major versions are incompatible. */
 
 #define PROT_MAJOR 17
-#define PROT_MINOR 2
+#define PROT_MINOR 2 /* Should not exceed 255! */
 
 /* Silly Windows */
 
@@ -43,7 +43,10 @@ typedef enum request_t {
        ADD_EDGE, DEL_EDGE,
        KEY_CHANGED, REQ_KEY, ANS_KEY,
        PACKET,
+       /* Tinc 1.1 requests */
        CONTROL,
+       REQ_PUBKEY, ANS_PUBKEY,
+       REQ_SPTPS,
        LAST                                            /* Guardian for the highest request number */
 } request_t;