X-Git-Url: https://tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=src%2Fprotocol.h;h=1211f9fe23a54a4ed067972afcefd3ec221ee443;hp=29c4ab1cdd052ad4f85d51fa036421b242e43a46;hb=d917c8cb6b69475d568ccbe82389b9f2b3eb5e80;hpb=886a6f61a1f4cc48a77b42d10f34f9126377d904

diff --git a/src/protocol.h b/src/protocol.h
index 29c4ab1c..1211f9fe 100644
--- 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 /* Should not exceed 255! */
 
 /* Silly Windows */
 
@@ -36,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,
@@ -44,17 +43,22 @@ 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,
+	REQ_PACKET,
+	LAST                                            /* Guardian for the highest request number */
 } request_t;
 
 typedef struct past_request_t {
-	char *request;
+	const char *request;
 	time_t firstseen;
 } 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,
@@ -72,23 +76,24 @@ extern bool strictsubnets;
 /* Basic functions */
 
 extern bool send_request(struct connection_t *, const char *, ...) __attribute__ ((__format__(printf, 2, 3)));
-extern void forward_request(struct connection_t *, char *);
-extern bool receive_request(struct connection_t *, char *);
+extern void forward_request(struct connection_t *, const char *);
+extern bool receive_request(struct connection_t *, const char *);
 extern bool check_id(const char *);
 
 extern void init_requests(void);
 extern void exit_requests(void);
-extern bool seen_request(char *);
+extern bool seen_request(const char *);
 
 /* Requests */
 
 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 *);
 extern bool send_status(struct connection_t *, int, const char *);
-extern bool send_error(struct connection_t *, int,const  char *);
+extern bool send_error(struct connection_t *, int, const  char *);
 extern bool send_termreq(struct connection_t *);
 extern bool send_ping(struct connection_t *);
 extern bool send_pong(struct connection_t *);
@@ -96,31 +101,31 @@ extern bool send_add_subnet(struct connection_t *, const struct subnet_t *);
 extern bool send_del_subnet(struct connection_t *, const struct subnet_t *);
 extern bool send_add_edge(struct connection_t *, const struct edge_t *);
 extern bool send_del_edge(struct connection_t *, const struct edge_t *);
-extern void send_key_changed();
+extern void send_key_changed(void);
 extern bool send_req_key(struct node_t *);
 extern bool send_ans_key(struct node_t *);
-extern bool send_tcppacket(struct connection_t *, struct vpn_packet_t *);
+extern bool send_tcppacket(struct connection_t *, const struct vpn_packet_t *);
 
 /* Request handlers  */
 
-extern bool id_h(struct connection_t *, char *);
-extern bool metakey_h(struct connection_t *, char *);
-extern bool challenge_h(struct connection_t *, char *);
-extern bool chal_reply_h(struct connection_t *, char *);
-extern bool ack_h(struct connection_t *, char *);
-extern bool status_h(struct connection_t *, char *);
-extern bool error_h(struct connection_t *, char *);
-extern bool termreq_h(struct connection_t *, char *);
-extern bool ping_h(struct connection_t *, char *);
-extern bool pong_h(struct connection_t *, char *);
-extern bool add_subnet_h(struct connection_t *, char *);
-extern bool del_subnet_h(struct connection_t *, char *);
-extern bool add_edge_h(struct connection_t *, char *);
-extern bool del_edge_h(struct connection_t *, char *);
-extern bool key_changed_h(struct connection_t *, char *);
-extern bool req_key_h(struct connection_t *, char *);
-extern bool ans_key_h(struct connection_t *, char *);
-extern bool tcppacket_h(struct connection_t *, char *);
-extern bool control_h(struct connection_t *, char *);
-
-#endif							/* __TINC_PROTOCOL_H__ */
+extern bool id_h(struct connection_t *, const char *);
+extern bool metakey_h(struct connection_t *, const char *);
+extern bool challenge_h(struct connection_t *, const char *);
+extern bool chal_reply_h(struct connection_t *, const char *);
+extern bool ack_h(struct connection_t *, const char *);
+extern bool status_h(struct connection_t *, const char *);
+extern bool error_h(struct connection_t *, const char *);
+extern bool termreq_h(struct connection_t *, const char *);
+extern bool ping_h(struct connection_t *, const char *);
+extern bool pong_h(struct connection_t *, const char *);
+extern bool add_subnet_h(struct connection_t *, const char *);
+extern bool del_subnet_h(struct connection_t *, const char *);
+extern bool add_edge_h(struct connection_t *, const char *);
+extern bool del_edge_h(struct connection_t *, const char *);
+extern bool key_changed_h(struct connection_t *, const char *);
+extern bool req_key_h(struct connection_t *, const char *);
+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__ */