X-Git-Url: https://tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=src%2Fprotocol.h;h=132a8e6e8ac406745213f40315cd560302f25b7a;hp=6f01a76c947a84a50b2ccbd17d0214e6163cd1ea;hb=eefa28059ab989c915a7d95fb4ae728abd7ce713;hpb=471308e1636e7a06e1d9ebc98e82b1c0c5150dde

diff --git a/src/protocol.h b/src/protocol.h
index 6f01a76c..132a8e6e 100644
--- a/src/protocol.h
+++ b/src/protocol.h
@@ -17,17 +17,12 @@
     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.39 2003/07/17 15:06:26 guus Exp $
+    $Id: protocol.h,v 1.5.4.40 2003/07/22 20:55:20 guus Exp $
 */
 
 #ifndef __TINC_PROTOCOL_H__
 #define __TINC_PROTOCOL_H__
 
-#include "edge.h"
-#include "net.h"
-#include "node.h"
-#include "subnet.h"
-
 /* Protocol version. Different versions are incompatible,
    incompatible version have different protocols.
  */
@@ -36,7 +31,7 @@
 
 /* Request numbers */
 
-enum {
+typedef enum request_t {
 	ALL = -1,					/* Guardian for allow_request */
 	ID = 0, METAKEY, CHALLENGE, CHAL_REPLY, ACK,
 	STATUS, ERROR, TERMREQ,
@@ -46,7 +41,7 @@ enum {
 	KEY_CHANGED, REQ_KEY, ANS_KEY,
 	PACKET,
 	LAST						/* Guardian for the highest request number */
-};
+} request_t;
 
 typedef struct past_request_t {
 	char *request;
@@ -58,58 +53,63 @@ typedef struct past_request_t {
 #define MAX_STRING_SIZE 2048
 #define MAX_STRING "%2048s"
 
+#include "edge.h"
+#include "net.h"
+#include "node.h"
+#include "subnet.h"
+
 /* Basic functions */
 
-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 *);
+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 void init_requests(void);
 extern void exit_requests(void);
-extern int seen_request(char *);
+extern bool 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 *);
+extern bool send_id(struct connection_t *);
+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_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 *);
 
 /* 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 *);
+extern bool id_h(struct connection_t *);
+extern bool metakey_h(struct connection_t *);
+extern bool challenge_h(struct connection_t *);
+extern bool chal_reply_h(struct connection_t *);
+extern bool ack_h(struct connection_t *);
+extern bool status_h(struct connection_t *);
+extern bool error_h(struct connection_t *);
+extern bool termreq_h(struct connection_t *);
+extern bool ping_h(struct connection_t *);
+extern bool pong_h(struct connection_t *);
+extern bool add_subnet_h(struct connection_t *);
+extern bool del_subnet_h(struct connection_t *);
+extern bool add_edge_h(struct connection_t *);
+extern bool del_edge_h(struct connection_t *);
+extern bool key_changed_h(struct connection_t *);
+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__ */