X-Git-Url: https://www.tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=src%2Fprotocol.h;h=a055f28a1c648e2e1388097d2125fbe6c23db717;hp=0bacd7b12af0b07f9bcd41e3e7ba410816b8694c;hb=57bc9a1835bcb6a8df7963ee4ab04fde34f28eaf;hpb=3fae14fae5a347823679ef694ab630b4991a201d

diff --git a/src/protocol.h b/src/protocol.h
index 0bacd7b1..a055f28a 100644
--- a/src/protocol.h
+++ b/src/protocol.h
@@ -71,56 +71,50 @@ extern bool strictsubnets;
 
 /* Basic functions */
 
-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(const char *);
+extern bool send_request(struct connection_t *c, const char *format, ...) __attribute__((__format__(printf, 2, 3)));
+extern void forward_request(struct connection_t *c);
+extern bool receive_request(struct connection_t *c);
+extern bool check_id(const char *name);
 
 extern void init_requests(void);
 extern void exit_requests(void);
-extern bool seen_request(char *);
+extern bool seen_request(char *request);
 extern void age_past_requests(void);
 
 /* Requests */
 
-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, const char *);
-extern bool send_error(struct connection_t *, int, const  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 *, const struct subnet_t *);
-extern bool send_del_subnet(struct connection_t *, const struct subnet_t *);
-extern bool send_add_edge(struct connection_t *, const struct edge_t *);
-extern bool send_del_edge(struct connection_t *, const struct edge_t *);
+extern bool send_id(struct connection_t *c);
+extern bool send_metakey(struct connection_t *c);
+extern bool send_challenge(struct connection_t *c);
+extern bool send_chal_reply(struct connection_t *c);
+extern bool send_ack(struct connection_t *c);
+extern bool send_ping(struct connection_t *c);
+extern bool send_pong(struct connection_t *c);
+extern bool send_add_subnet(struct connection_t *c, const struct subnet_t *subnet);
+extern bool send_del_subnet(struct connection_t *c, const struct subnet_t *subnet);
+extern bool send_add_edge(struct connection_t *c, const struct edge_t *e);
+extern bool send_del_edge(struct connection_t *c, const struct edge_t *e);
 extern void send_key_changed(void);
-extern bool send_req_key(struct node_t *);
-extern bool send_ans_key(struct node_t *);
-extern bool send_tcppacket(struct connection_t *, const struct vpn_packet_t *);
+extern bool send_req_key(struct node_t *n);
+extern bool send_ans_key(struct node_t *n);
+extern bool send_tcppacket(struct connection_t *c, const struct vpn_packet_t *packet);
 
 /* Request handlers  */
 
-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 *);
+extern bool id_h(struct connection_t *c);
+extern bool metakey_h(struct connection_t *c);
+extern bool challenge_h(struct connection_t *c);
+extern bool chal_reply_h(struct connection_t *c);
+extern bool ack_h(struct connection_t *c);
+extern bool ping_h(struct connection_t *c);
+extern bool pong_h(struct connection_t *c);
+extern bool add_subnet_h(struct connection_t *c);
+extern bool del_subnet_h(struct connection_t *c);
+extern bool add_edge_h(struct connection_t *c);
+extern bool del_edge_h(struct connection_t *c);
+extern bool key_changed_h(struct connection_t *c);
+extern bool req_key_h(struct connection_t *c);
+extern bool ans_key_h(struct connection_t *c);
+extern bool tcppacket_h(struct connection_t *c);
 
 #endif