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

diff --git a/src/protocol.h b/src/protocol.h
index 682f76a0..79bda43c 100644
--- a/src/protocol.h
+++ b/src/protocol.h
@@ -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.13 2000/10/28 21:05:20 guus Exp $
+    $Id: protocol.h,v 1.5.4.16 2000/11/20 19:12:16 guus Exp $
 */
 
 #ifndef __TINC_PROTOCOL_H__
@@ -36,7 +36,7 @@
 
 enum {
   ALL = -1,			     /* Guardian for allow_request */
-  ID = 0, CHALLENGE, CHAL_REPLY, ACK,
+  ID = 0, CHALLENGE, CHAL_REPLY, METAKEY, ACK,
   STATUS, ERROR, TERMREQ,
   PING,  PONG,
   ADD_HOST, DEL_HOST,
@@ -45,28 +45,31 @@ enum {
   LAST                               /* Guardian for the highest request number */
 };
 
-extern int (*request_handlers[])(conn_list_t*);
+extern int (*request_handlers[])(connection_t*);
 
-extern int send_id(conn_list_t*);
-extern int send_challenge(conn_list_t*);
-extern int send_chal_reply(conn_list_t*);
-extern int send_ack(conn_list_t*);
-extern int send_status(conn_list_t*, int, char*);
-extern int send_error(conn_list_t*, int, char*);
-extern int send_termreq(conn_list_t*);
-extern int send_ping(conn_list_t*);
-extern int send_pong(conn_list_t*);
-extern int send_add_host(conn_list_t*, conn_list_t*);
-extern int send_del_host(conn_list_t*, conn_list_t*);
-extern int send_add_subnet(conn_list_t*, subnet_t*);
-extern int send_del_subnet(conn_list_t*, subnet_t*);
-extern int send_key_changed(conn_list_t*, conn_list_t*);
-extern int send_req_key(conn_list_t*, conn_list_t*);
-extern int send_ans_key(conn_list_t*, conn_list_t*, char*);
+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*);
+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_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*);
 
 /* Old functions */
 
-extern int send_tcppacket(conn_list_t *, void *, int);
-extern int notify_others(conn_list_t *, conn_list_t *, int (*function)(conn_list_t*, conn_list_t*));
+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 *);
 
 #endif /* __TINC_PROTOCOL_H__ */