X-Git-Url: https://www.tinc-vpn.org/git/browse?a=blobdiff_plain;f=src%2Fprotocol.h;h=1a68555487cacb548b8f804f9d8f6b9e6ccf83b6;hb=e3c763eae89df9a69bb2d611238ef18f78de311f;hp=540a7c3fb6aa7455791727bbdf5e150f27a78df6;hpb=58007d7efa3940c863c5a398f8b257a686ce37ba;p=tinc

diff --git a/src/protocol.h b/src/protocol.h
index 540a7c3f..1a685554 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
@@ -21,10 +21,12 @@
 #ifndef __TINC_PROTOCOL_H__
 #define __TINC_PROTOCOL_H__
 
+#include "ecdsa.h"
+
 /* Protocol version. Different major versions are incompatible. */
 
 #define PROT_MAJOR 17
-#define PROT_MINOR 2
+#define PROT_MINOR 3 /* Should not exceed 255! */
 
 /* Silly Windows */
 
@@ -35,7 +37,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 +45,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 {
@@ -56,6 +61,8 @@ extern bool tunnelserver;
 extern bool strictsubnets;
 extern bool experimental;
 
+extern ecdsa_t *invitation_key;
+
 /* Maximum size of strings in a request.
  * scanf terminates %2048s with a NUL character,
  * but the NUL character can be written after the 2048th non-NUL character.
@@ -124,4 +131,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__ */