X-Git-Url: https://tinc-vpn.org/git/browse?a=blobdiff_plain;f=src%2Fprotocol.h;h=1df54fc951d0eda6bb22c57c8f3f439f921a218a;hb=053af97c9e729ab485609e4202f5195fdc8aeeb5;hp=540a7c3fb6aa7455791727bbdf5e150f27a78df6;hpb=268c8545aaf83b7433f43402f5c77e39e20006ef;p=tinc

diff --git a/src/protocol.h b/src/protocol.h
index 540a7c3f..1df54fc9 100644
--- a/src/protocol.h
+++ b/src/protocol.h
@@ -1,7 +1,7 @@
 /*
     protocol.h -- header for protocol.c
     Copyright (C) 1999-2005 Ivo Timmermans,
-                  2000-2009 Guus Sliepen <guus@tinc-vpn.org>
+                  2000-2012 Guus Sliepen <guus@tinc-vpn.org>
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -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 */
 
@@ -35,7 +35,7 @@
 /* Request numbers */
 
 typedef enum request_t {
-	ALL = -1,					/* Guardian for allow_request */
+	ALL = -1,                                       /* Guardian for allow_request */
 	ID = 0, METAKEY, CHALLENGE, CHAL_REPLY, ACK,
 	STATUS, ERROR, TERMREQ,
 	PING, PONG,
@@ -43,8 +43,11 @@ typedef enum request_t {
 	ADD_EDGE, DEL_EDGE,
 	KEY_CHANGED, REQ_KEY, ANS_KEY,
 	PACKET,
+	/* Tinc 1.1 requests */
 	CONTROL,
-	LAST						/* Guardian for the highest request number */
+	REQ_PUBKEY, ANS_PUBKEY,
+	REQ_SPTPS,
+	LAST                                            /* Guardian for the highest request number */
 } request_t;
 
 typedef struct past_request_t {
@@ -124,4 +127,4 @@ extern bool ans_key_h(struct connection_t *, const char *);
 extern bool tcppacket_h(struct connection_t *, const char *);
 extern bool control_h(struct connection_t *, const char *);
 
-#endif							/* __TINC_PROTOCOL_H__ */
+#endif /* __TINC_PROTOCOL_H__ */