X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;f=src%2Fprotocol.h;h=fb1e10960cc25539971a4250f8c9f358a1e87556;hb=7870cb4a1882fb0e3fd4e90784f81327fc0cab08;hp=47aacd990f1966fb1a6dc0a04219311c55d9fea8;hpb=0d133a5ff230ad78da3208d32521d7549836187e;p=meshlink

diff --git a/src/protocol.h b/src/protocol.h
index 47aacd99..fb1e1096 100644
--- a/src/protocol.h
+++ b/src/protocol.h
@@ -36,7 +36,7 @@
 /* Request numbers */
 
 typedef enum request_t {
-	ALL = -1,                                       /* Guardian for allow_request */
+	ALL = -1, /* Guardian for allow_request */
 	ID = 0, METAKEY, CHALLENGE, CHAL_REPLY, ACK,
 	STATUS, ERROR, TERMREQ,
 	PING, PONG,
@@ -44,13 +44,19 @@ typedef enum request_t {
 	ADD_EDGE, DEL_EDGE,
 	KEY_CHANGED, REQ_KEY, ANS_KEY,
 	PACKET,
-	/* Tinc 1.1 requests */
+	/* Extended requests */
 	CONTROL,
 	REQ_PUBKEY, ANS_PUBKEY,
 	REQ_SPTPS,
-	LAST                                            /* Guardian for the highest request number */
+	REQ_CANONICAL,
+	NUM_REQUESTS
 } request_t;
 
+typedef enum request_error_t {
+	NONE = 0,
+	BLACKLISTED = 1,
+} request_error_t;
+
 typedef struct past_request_t {
 	const char *request;
 	time_t firstseen;
@@ -70,40 +76,41 @@ typedef struct past_request_t {
 
 /* Basic functions */
 
-extern bool send_request(struct meshlink_handle *mesh, struct connection_t *, struct submesh_t *s, const char *, ...) __attribute__((__format__(printf, 4, 5)));
-extern void forward_request(struct meshlink_handle *mesh, struct connection_t *, struct submesh_t *, const char *);
-extern bool receive_request(struct meshlink_handle *mesh, struct connection_t *, const char *);
-extern bool check_id(const char *);
+bool send_request(struct meshlink_handle *mesh, struct connection_t *, const struct submesh_t *s, const char *, ...) __attribute__((__format__(printf, 4, 5)));
+void forward_request(struct meshlink_handle *mesh, struct connection_t *, const struct submesh_t *, const char *);
+bool receive_request(struct meshlink_handle *mesh, struct connection_t *, const char *);
+bool check_id(const char *);
 
-extern void init_requests(struct meshlink_handle *mesh);
-extern void exit_requests(struct meshlink_handle *mesh);
-extern bool seen_request(struct meshlink_handle *mesh, const char *);
+void init_requests(struct meshlink_handle *mesh);
+void exit_requests(struct meshlink_handle *mesh);
+bool seen_request(struct meshlink_handle *mesh, const char *);
 
 /* Requests */
 
-extern bool send_id(struct meshlink_handle *mesh, struct connection_t *);
-extern bool send_ack(struct meshlink_handle *mesh, struct connection_t *);
-extern bool send_ping(struct meshlink_handle *mesh, struct connection_t *);
-extern bool send_pong(struct meshlink_handle *mesh, struct connection_t *);
-extern bool send_add_edge(struct meshlink_handle *mesh, struct connection_t *, const struct edge_t *, int contradictions);
-extern bool send_del_edge(struct meshlink_handle *mesh, struct connection_t *, const struct edge_t *, int contradictions);
-extern void send_key_changed(struct meshlink_handle *mesh);
-extern bool send_req_key(struct meshlink_handle *mesh, struct node_t *);
+bool send_id(struct meshlink_handle *mesh, struct connection_t *);
+bool send_ack(struct meshlink_handle *mesh, struct connection_t *);
+bool send_error(struct meshlink_handle *mesh, struct connection_t *, request_error_t, const char *);
+bool send_ping(struct meshlink_handle *mesh, struct connection_t *);
+bool send_pong(struct meshlink_handle *mesh, struct connection_t *);
+bool send_add_edge(struct meshlink_handle *mesh, struct connection_t *, const struct edge_t *, int contradictions);
+bool send_del_edge(struct meshlink_handle *mesh, struct connection_t *, const struct edge_t *, int contradictions);
+bool send_req_key(struct meshlink_handle *mesh, struct node_t *);
+bool send_canonical_address(struct meshlink_handle *mesh, struct node_t *);
 
 /* Request handlers  */
 
-extern bool id_h(struct meshlink_handle *mesh, struct connection_t *, const char *);
-extern bool ack_h(struct meshlink_handle *mesh, struct connection_t *, const char *);
-extern bool status_h(struct meshlink_handle *mesh, struct connection_t *, const char *);
-extern bool error_h(struct meshlink_handle *mesh, struct connection_t *, const char *);
-extern bool termreq_h(struct meshlink_handle *mesh, struct connection_t *, const char *);
-extern bool ping_h(struct meshlink_handle *mesh, struct connection_t *, const char *);
-extern bool pong_h(struct meshlink_handle *mesh, struct connection_t *, const char *);
-extern bool add_edge_h(struct meshlink_handle *mesh, struct connection_t *, const char *);
-extern bool del_edge_h(struct meshlink_handle *mesh, struct connection_t *, const char *);
-extern bool key_changed_h(struct meshlink_handle *mesh, struct connection_t *, const char *);
-extern bool req_key_h(struct meshlink_handle *mesh, struct connection_t *, const char *);
-extern bool ans_key_h(struct meshlink_handle *mesh, struct connection_t *, const char *);
-extern bool tcppacket_h(struct meshlink_handle *mesh, struct connection_t *, const char *);
+bool id_h(struct meshlink_handle *mesh, struct connection_t *, const char *);
+bool ack_h(struct meshlink_handle *mesh, struct connection_t *, const char *);
+bool status_h(struct meshlink_handle *mesh, struct connection_t *, const char *);
+bool error_h(struct meshlink_handle *mesh, struct connection_t *, const char *);
+bool termreq_h(struct meshlink_handle *mesh, struct connection_t *, const char *);
+bool ping_h(struct meshlink_handle *mesh, struct connection_t *, const char *);
+bool pong_h(struct meshlink_handle *mesh, struct connection_t *, const char *);
+bool add_edge_h(struct meshlink_handle *mesh, struct connection_t *, const char *);
+bool del_edge_h(struct meshlink_handle *mesh, struct connection_t *, const char *);
+bool key_changed_h(struct meshlink_handle *mesh, struct connection_t *, const char *);
+bool req_key_h(struct meshlink_handle *mesh, struct connection_t *, const char *);
+bool ans_key_h(struct meshlink_handle *mesh, struct connection_t *, const char *);
+bool tcppacket_h(struct meshlink_handle *mesh, struct connection_t *, const char *);
 
 #endif