X-Git-Url: https://www.tinc-vpn.org/git/browse?a=blobdiff_plain;f=src%2Fprotocol.h;h=c0e6f4fa61b3d8ebc379420d1cad0220549c7592;hb=5822f817aa802c2c5a83e9d99a8ae78cb822799b;hp=e4978f4ea424e534fa77b8156545a1e133bc22e4;hpb=9bb230f30f665779eb89dcce077a15360ec50be1;p=tinc

diff --git a/src/protocol.h b/src/protocol.h
index e4978f4e..c0e6f4fa 100644
--- a/src/protocol.h
+++ b/src/protocol.h
@@ -1,7 +1,10 @@
+#ifndef TINC_PROTOCOL_H
+#define TINC_PROTOCOL_H
+
 /*
     protocol.h -- header for protocol.c
     Copyright (C) 1999-2005 Ivo Timmermans,
-                  2000-2013 Guus Sliepen <guus@tinc-vpn.org>
+                  2000-2017 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
@@ -18,15 +21,12 @@
     51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
 
-#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 5 /* Should not exceed 255! */
+#define PROT_MINOR 7 /* Should not exceed 255! */
 
 /* Silly Windows */
 
@@ -48,8 +48,8 @@ typedef enum request_t {
 	/* Tinc 1.1 requests */
 	CONTROL,
 	REQ_PUBKEY, ANS_PUBKEY,
-	REQ_SPTPS,
-	UDP_INFO,
+	SPTPS_PACKET,
+	UDP_INFO, MTU_INFO,
 	LAST                                            /* Guardian for the highest request number */
 } request_t;
 
@@ -62,6 +62,7 @@ extern bool tunnelserver;
 extern bool strictsubnets;
 extern bool experimental;
 
+extern int invitation_lifetime;
 extern ecdsa_t *invitation_key;
 
 /* Maximum size of strings in a request.
@@ -108,7 +109,9 @@ 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 *, const struct vpn_packet_t *);
+extern bool send_sptps_tcppacket(struct connection_t *, const char*, int);
 extern bool send_udp_info(struct node_t *, struct node_t *);
+extern bool send_mtu_info(struct node_t *, struct node_t *, int);
 
 /* Request handlers  */
 
@@ -130,7 +133,9 @@ 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 sptps_tcppacket_h(struct connection_t *, const char *);
 extern bool control_h(struct connection_t *, const char *);
 extern bool udp_info_h(struct connection_t *, const char *);
+extern bool mtu_info_h(struct connection_t *, const char *);
 
-#endif /* __TINC_PROTOCOL_H__ */
+#endif