X-Git-Url: https://www.tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=src%2Fprotocol.h;h=0bacd7b12af0b07f9bcd41e3e7ba410816b8694c;hp=132a8e6e8ac406745213f40315cd560302f25b7a;hb=3fae14fae5a347823679ef694ab630b4991a201d;hpb=eefa28059ab989c915a7d95fb4ae728abd7ce713

diff --git a/src/protocol.h b/src/protocol.h
index 132a8e6e..0bacd7b1 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-2001 Ivo Timmermans <ivo@o2w.nl>,
-                  2000,2001 Guus Sliepen <guus@sliepen.eu.org>
+    Copyright (C) 1999-2005 Ivo Timmermans,
+                  2000-2015 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
@@ -13,26 +16,28 @@
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
     GNU General Public License for more details.
 
-    You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-
-    $Id: protocol.h,v 1.5.4.40 2003/07/22 20:55:20 guus Exp $
+    You should have received a copy of the GNU General Public License along
+    with this program; if not, write to the Free Software Foundation, Inc.,
+    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
 
-#ifndef __TINC_PROTOCOL_H__
-#define __TINC_PROTOCOL_H__
-
 /* Protocol version. Different versions are incompatible,
    incompatible version have different protocols.
  */
 
 #define PROT_CURRENT 17
 
+/* Silly Windows */
+
+#ifdef ERROR
+#undef ERROR
+#endif
+
 /* Request numbers */
 
 typedef enum request_t {
-	ALL = -1,					/* Guardian for allow_request */
+	PROXY = -2,
+	ALL = -1,                                       /* Guardian for allow_request */
 	ID = 0, METAKEY, CHALLENGE, CHAL_REPLY, ACK,
 	STATUS, ERROR, TERMREQ,
 	PING, PONG,
@@ -40,7 +45,7 @@ typedef enum request_t {
 	ADD_EDGE, DEL_EDGE,
 	KEY_CHANGED, REQ_KEY, ANS_KEY,
 	PACKET,
-	LAST						/* Guardian for the highest request number */
+	LAST                                            /* Guardian for the highest request number */
 } request_t;
 
 typedef struct past_request_t {
@@ -48,9 +53,15 @@ typedef struct past_request_t {
 	time_t firstseen;
 } past_request_t;
 
-/* Maximum size of strings in a request */
+extern bool tunnelserver;
+extern bool strictsubnets;
+
+/* 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.
+ */
 
-#define MAX_STRING_SIZE 2048
+#define MAX_STRING_SIZE 2049
 #define MAX_STRING "%2048s"
 
 #include "edge.h"
@@ -60,10 +71,10 @@ typedef struct past_request_t {
 
 /* Basic functions */
 
-extern bool send_request(struct connection_t *, const char *, ...) __attribute__ ((format(printf, 2, 3)));
+extern bool send_request(struct connection_t *, const char *, ...) __attribute__((__format__(printf, 2, 3)));
 extern void forward_request(struct connection_t *);
 extern bool receive_request(struct connection_t *);
-extern bool check_id(char *);
+extern bool check_id(const char *);
 
 extern void init_requests(void);
 extern void exit_requests(void);
@@ -77,19 +88,19 @@ extern bool send_metakey(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, char *);
-extern bool send_error(struct connection_t *, int, char *);
+extern bool send_status(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 *);
-extern bool send_add_subnet(struct connection_t *, struct subnet_t *);
-extern bool send_del_subnet(struct connection_t *, struct subnet_t *);
-extern bool send_add_edge(struct connection_t *, struct edge_t *);
-extern bool send_del_edge(struct connection_t *, struct edge_t *);
-extern bool send_key_changed(struct connection_t *, struct node_t *);
-extern bool send_req_key(struct connection_t *, struct node_t *, struct node_t *);
-extern bool send_ans_key(struct connection_t *, struct node_t *, struct node_t *);
-extern bool send_tcppacket(struct connection_t *, struct vpn_packet_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);
+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 *);
 
 /* Request handlers  */
 
@@ -112,4 +123,4 @@ extern bool req_key_h(struct connection_t *);
 extern bool ans_key_h(struct connection_t *);
 extern bool tcppacket_h(struct connection_t *);
 
-#endif							/* __TINC_PROTOCOL_H__ */
+#endif