X-Git-Url: https://tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=src%2Fprotocol.h;h=6e71f810e5b82f5573d2b7f79b3178acee435332;hp=64e17ad0d67840797145cdaaedd0d80bf410d59a;hb=1401faf608e1c8af0d0754e545b0ec79d2bd5d93;hpb=82e383710980534d38bb9a8ef22f20677cd85861 diff --git a/src/protocol.h b/src/protocol.h index 64e17ad0..6e71f810 100644 --- a/src/protocol.h +++ b/src/protocol.h @@ -1,7 +1,7 @@ /* protocol.h -- header for protocol.c - Copyright (C) 1999-2001 Ivo Timmermans , - 2000,2001 Guus Sliepen + Copyright (C) 1999-2001 Ivo Timmermans , + 2000,2001 Guus Sliepen 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.23 2001/10/27 12:13:17 guus Exp $ + $Id: protocol.h,v 1.5.4.38 2003/07/06 23:16:28 guus Exp $ */ #ifndef __TINC_PROTOCOL_H__ @@ -25,61 +25,91 @@ #include "net.h" #include "node.h" +#include "edge.h" #include "subnet.h" /* Protocol version. Different versions are incompatible, incompatible version have different protocols. */ -#define PROT_CURRENT 11 +#define PROT_CURRENT 17 /* Request numbers */ enum { - ALL = -1, /* Guardian for allow_request */ - ID = 0, METAKEY, CHALLENGE, CHAL_REPLY, ACK, - STATUS, ERROR, TERMREQ, - PING, PONG, - ADD_NODE, DEL_NODE, - ADD_SUBNET, DEL_SUBNET, - ADD_VERTEX, DEL_VERTEX, - KEY_CHANGED, REQ_KEY, ANS_KEY, - PACKET, - LAST /* Guardian for the highest request number */ + ALL = -1, /* Guardian for allow_request */ + ID = 0, METAKEY, CHALLENGE, CHAL_REPLY, ACK, + STATUS, ERROR, TERMREQ, + PING, PONG, + ADD_SUBNET, DEL_SUBNET, + ADD_EDGE, DEL_EDGE, + KEY_CHANGED, REQ_KEY, ANS_KEY, + PACKET, + LAST /* Guardian for the highest request number */ }; +typedef struct past_request_t { + char *request; + time_t firstseen; +} past_request_t; + /* 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_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_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_add_vertex(connection_t*, node_t*); -extern int send_del_vertex(connection_t*, node_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 *); +#define MAX_STRING_SIZE 2048 +#define MAX_STRING "%2048s" -/* Old functions */ +/* Basic functions */ -extern int notify_others(connection_t *, connection_t *, int (*function)(connection_t*, connection_t*)); +extern int send_request(connection_t *, const char *, ...) __attribute__ ((format(printf, 2, 3))); +extern int forward_request(connection_t *); extern int receive_request(connection_t *); extern int check_id(char *); -#endif /* __TINC_PROTOCOL_H__ */ +extern void init_requests(void); +extern void exit_requests(void); +extern int seen_request(char *); +extern void age_past_requests(void); + +/* Requests */ + +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_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_subnet(connection_t *, subnet_t *); +extern int send_del_subnet(connection_t *, subnet_t *); +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 *); +extern int send_tcppacket(connection_t *, vpn_packet_t *); + +/* Request handlers */ + +extern int id_h(connection_t *); +extern int metakey_h(connection_t *); +extern int challenge_h(connection_t *); +extern int chal_reply_h(connection_t *); +extern int ack_h(connection_t *); +extern int status_h(connection_t *); +extern int error_h(connection_t *); +extern int termreq_h(connection_t *); +extern int ping_h(connection_t *); +extern int pong_h(connection_t *); +extern int add_subnet_h(connection_t *); +extern int del_subnet_h(connection_t *); +extern int add_edge_h(connection_t *); +extern int del_edge_h(connection_t *); +extern int key_changed_h(connection_t *); +extern int req_key_h(connection_t *); +extern int ans_key_h(connection_t *); +extern int tcppacket_h(connection_t *); + +#endif /* __TINC_PROTOCOL_H__ */