Remove everything GPL that is not copyright Guus Sliepen, update copyright statements.

[meshlink] / src / protocol.h

diff --git a/src/protocol.h b/src/protocol.h
index 540a7c3fb6aa7455791727bbdf5e150f27a78df6..68a5f1c931e5ef6e79c82b10ffb433c8e57350bd 100644 (file)
--- a/src/protocol.h
+++ b/src/protocol.h
@@ -1,7 +1,6 @@
 /*
     protocol.h -- header for protocol.c
-    Copyright (C) 1999-2005 Ivo Timmermans,
-                  2000-2009 Guus Sliepen <guus@tinc-vpn.org>
+    Copyright (C) 2014 Guus Sliepen <guus@meshlink.io>
 
     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 +20,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 +36,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 +44,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 {
@@ -52,10 +56,10 @@ typedef struct past_request_t {
        time_t firstseen;
 } 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.
@@ -67,7 +71,6 @@ extern bool experimental;
 #include "edge.h"
 #include "net.h"
 #include "node.h"
-#include "subnet.h"
 
 /* Basic functions */
 
@@ -93,8 +96,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);
@@ -114,14 +115,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__ */