X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;f=src%2Fprotocol.h;fp=src%2Fprotocol.h;h=4bf76ee9b278166f3580976f3a86311199f3888a;hb=de1fbdf4403ea2a78f14925ffcc113198d87fc9d;hp=92ccef01482f7d8882b431c35420812cdac55a3a;hpb=b8d9f9f97b63565bfe56c248428a49bc3f6a1e47;p=meshlink

diff --git a/src/protocol.h b/src/protocol.h
index 92ccef01..4bf76ee9 100644
--- a/src/protocol.h
+++ b/src/protocol.h
@@ -24,8 +24,8 @@
 
 /* Protocol version. Different major versions are incompatible. */
 
-#define PROT_MAJOR 17
-#define PROT_MINOR 3 /* Should not exceed 255! */
+#define PROT_MAJOR 18
+#define PROT_MINOR 0 /* Should not exceed 255! */
 
 /* Silly Windows */
 
@@ -37,15 +37,15 @@
 
 typedef enum request_t {
 	ALL = -1,                                       /* Guardian for allow_request */
-	ID = 0, METAKEY, CHALLENGE, CHAL_REPLY, ACK,
-	STATUS, ERROR, TERMREQ,
-	PING, PONG,
-	ADD_SUBNET, DEL_SUBNET,
-	ADD_EDGE, DEL_EDGE,
-	KEY_CHANGED, REQ_KEY, ANS_KEY,
-	PACKET,
+	ID = 0,
+	ACK,
+	PING,
+	PONG,
+	ADD_EDGE,
+	DEL_EDGE,
+	REQ_KEY,
+	ANS_KEY,
 	/* Tinc 1.1 requests */
-	CONTROL,
 	REQ_PUBKEY, ANS_PUBKEY,
 	REQ_SPTPS,
 	LAST                                            /* Guardian for the highest request number */
@@ -87,16 +87,12 @@ extern bool send_ping(struct meshlink_handle *mesh, struct connection_t *);
 extern bool send_pong(struct meshlink_handle *mesh, struct connection_t *);
 extern bool send_add_edge(struct meshlink_handle *mesh, struct connection_t *, const struct edge_t *, int contradictions);
 extern bool send_del_edge(struct meshlink_handle *mesh, struct connection_t *, const struct edge_t *, int contradictions);
-extern void send_key_changed(struct meshlink_handle *mesh);
 extern bool send_req_key(struct meshlink_handle *mesh, struct node_t *);
 
 /* Request handlers  */
 
 extern bool id_h(struct meshlink_handle *mesh, struct connection_t *, const char *);
 extern bool ack_h(struct meshlink_handle *mesh, struct connection_t *, const char *);
-extern bool status_h(struct meshlink_handle *mesh, struct connection_t *, const char *);
-extern bool error_h(struct meshlink_handle *mesh, struct connection_t *, const char *);
-extern bool termreq_h(struct meshlink_handle *mesh, struct connection_t *, const char *);
 extern bool ping_h(struct meshlink_handle *mesh, struct connection_t *, const char *);
 extern bool pong_h(struct meshlink_handle *mesh, struct connection_t *, const char *);
 extern bool add_edge_h(struct meshlink_handle *mesh, struct connection_t *, const char *);
@@ -104,6 +100,5 @@ extern bool del_edge_h(struct meshlink_handle *mesh, struct connection_t *, cons
 extern bool key_changed_h(struct meshlink_handle *mesh, struct connection_t *, const char *);
 extern bool req_key_h(struct meshlink_handle *mesh, struct connection_t *, const char *);
 extern bool ans_key_h(struct meshlink_handle *mesh, struct connection_t *, const char *);
-extern bool tcppacket_h(struct meshlink_handle *mesh, struct connection_t *, const char *);
 
 #endif