Merge branch 'master' into 1.1

[meshlink] / src / protocol.h

diff --git a/src/protocol.h b/src/protocol.h
index ee6f1f0e69217c805ab09be51b5eef1a5b50a7d9..41f74ab4bcd5f736df1641cac6a12410f390d2f3 100644 (file)
--- a/src/protocol.h
+++ b/src/protocol.h
@@ -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;