X-Git-Url: https://www.tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=src%2Fprotocol.h;h=5fc30f3866d6ff6e8006e105c14e9d6e8eda2268;hp=79bda43c68e7d33ee40a6ef4ef3255868257993e;hb=a4938b22e7502579ce44cac42410111db11256eb;hpb=408ca91766088b6c2d38e198b0692bf394b41248

diff --git a/src/protocol.h b/src/protocol.h
index 79bda43c..5fc30f38 100644
--- a/src/protocol.h
+++ b/src/protocol.h
@@ -1,7 +1,7 @@
 /*
     protocol.h -- header for protocol.c
-    Copyright (C) 1999,2000 Ivo Timmermans <itimmermans@bigfoot.com>,
-                       2000 Guus Sliepen <guus@sliepen.warande.net>
+    Copyright (C) 1999-2001 Ivo Timmermans <itimmermans@bigfoot.com>,
+                  2000,2001 Guus Sliepen <guus@sliepen.warande.net>
 
     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
@@ -17,57 +17,67 @@
     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.16 2000/11/20 19:12:16 guus Exp $
+    $Id: protocol.h,v 1.5.4.24 2001/10/28 08:41:19 guus Exp $
 */
 
 #ifndef __TINC_PROTOCOL_H__
 #define __TINC_PROTOCOL_H__
 
 #include "net.h"
+#include "node.h"
 #include "subnet.h"
 
 /* Protocol version. Different versions are incompatible,
    incompatible version have different protocols.
  */
 
-#define PROT_CURRENT 8
+#define PROT_CURRENT 11
 
 /* Request numbers */
 
 enum {
   ALL = -1,			     /* Guardian for allow_request */
-  ID = 0, CHALLENGE, CHAL_REPLY, METAKEY, ACK,
+  ID = 0, METAKEY, CHALLENGE, CHAL_REPLY, ACK,
   STATUS, ERROR, TERMREQ,
-  PING,  PONG,
-  ADD_HOST, DEL_HOST,
+  PING, PONG,
+  ADD_NODE, DEL_NODE,
   ADD_SUBNET, DEL_SUBNET,
+  ADD_EDGE, DEL_EDGE,
   KEY_CHANGED, REQ_KEY, ANS_KEY,
+  PACKET,
   LAST                               /* Guardian for the highest request number */
 };
 
+/* Maximum size of strings in a request */
+
+#define MAX_STRING_SIZE 1024
+#define MAX_STRING "%1024s"
+
 extern int (*request_handlers[])(connection_t*);
 
 extern int send_id(connection_t*);
+extern int send_metakey(connection_t*);
 extern int send_challenge(connection_t*);
 extern int send_chal_reply(connection_t*);
-extern int send_metakey(connection_t*);
 extern int send_ack(connection_t*);
 extern int send_status(connection_t*, int, char*);
 extern int send_error(connection_t*, int, char*);
 extern int send_termreq(connection_t*);
 extern int send_ping(connection_t*);
 extern int send_pong(connection_t*);
-extern int send_add_host(connection_t*, connection_t*);
-extern int send_del_host(connection_t*, connection_t*);
+extern int send_add_node(connection_t*, node_t*);
+extern int send_del_node(connection_t*, node_t*);
 extern int send_add_subnet(connection_t*, subnet_t*);
 extern int send_del_subnet(connection_t*, subnet_t*);
-extern int send_key_changed(connection_t*, connection_t*);
-extern int send_req_key(connection_t*, connection_t*);
-extern int send_ans_key(connection_t*, connection_t*, char*);
+extern int send_add_edge(connection_t*, edge_t*);
+extern int send_del_edge(connection_t*, edge_t*);
+extern int send_key_changed(connection_t*, node_t*);
+extern int send_req_key(connection_t*, node_t*, node_t*);
+extern int send_ans_key(connection_t*, node_t*, node_t*, char*);
+extern int send_tcppacket(connection_t *, vpn_packet_t *);
 
 /* Old functions */
 
-extern int send_tcppacket(connection_t *, void *, int);
 extern int notify_others(connection_t *, connection_t *, int (*function)(connection_t*, connection_t*));
 extern int receive_request(connection_t *);
 extern int check_id(char *);