X-Git-Url: https://www.tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=src%2Fprotocol.h;h=0d163868782f59d28e2f47880898f38c0c1e68c0;hp=3789d804bd641e518c2ad49b6ec6b01d1507458a;hb=24a2c7e51a0b080c4bdb55f697b3f0458ebc3fb1;hpb=a07602c4fddfca9894f1d738959ae359695f5bf9

diff --git a/src/protocol.h b/src/protocol.h
index 3789d804..0d163868 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,7 +17,7 @@
     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.17 2000/11/22 19:55:53 guus Exp $
+    $Id: protocol.h,v 1.5.4.22 2001/09/24 14:12:00 guus Exp $
 */
 
 #ifndef __TINC_PROTOCOL_H__
@@ -30,18 +30,19 @@
    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,
   STATUS, ERROR, TERMREQ,
   PING,  PONG,
   ADD_HOST, DEL_HOST,
   ADD_SUBNET, DEL_SUBNET,
   KEY_CHANGED, REQ_KEY, ANS_KEY,
+  PACKET,
   LAST                               /* Guardian for the highest request number */
 };
 
@@ -56,7 +57,6 @@ extern int send_id(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*);
@@ -69,10 +69,10 @@ 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_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 *);