X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;f=src%2Fprotocol.h;h=d6060650021f85fb46d32cbb178710a77c18658f;hb=8d7a4c48cac3708dc8bc88b7d6ede01b80268b4d;hp=a56153946f6ee20e0180221a7c24b119cda8f30a;hpb=248d300f1be0d5f2aae39202041699ab2b46c56b;p=meshlink

diff --git a/src/protocol.h b/src/protocol.h
index a5615394..d6060650 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-2013 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 /* Should not exceed 255! */
+#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,
@@ -46,7 +48,8 @@ typedef enum request_t {
 	/* Tinc 1.1 requests */
 	CONTROL,
 	REQ_PUBKEY, ANS_PUBKEY,
-	LAST						/* Guardian for the highest request number */
+	REQ_SPTPS,
+	LAST                                            /* Guardian for the highest request number */
 } request_t;
 
 typedef struct past_request_t {
@@ -55,9 +58,10 @@ typedef struct past_request_t {
 } past_request_t;
 
 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.
@@ -69,7 +73,6 @@ extern bool experimental;
 #include "edge.h"
 #include "net.h"
 #include "node.h"
-#include "subnet.h"
 
 /* Basic functions */
 
@@ -95,8 +98,6 @@ 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 *);
-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(void);
@@ -116,14 +117,11 @@ 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__ */
+#endif /* __TINC_PROTOCOL_H__ */