-enum {
- ALL = -1, /* Guardian for allow_request */
- ID = 0, CHALLENGE, CHAL_REPLY, METAKEY, ACK,
- STATUS, ERROR, TERMREQ,
- PING, PONG,
- ADD_HOST, DEL_HOST,
- ADD_SUBNET, DEL_SUBNET,
- KEY_CHANGED, REQ_KEY, ANS_KEY,
- PACKET,
- LAST /* Guardian for the highest request number */
-};
-
-/* 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_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*);
-extern int send_tcppacket(connection_t *, vpn_packet_t *);
-
-/* Old functions */
-
-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__ */
+typedef enum request_t {
+ 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,
+ CONTROL,
+ LAST /* Guardian for the highest request number */
+} request_t;
+
+typedef struct past_request_t {
+ char *request;
+ time_t firstseen;
+} past_request_t;
+
+extern bool tunnelserver;
+extern bool strictsubnets;
+extern bool experimental;
+
+/* Maximum size of strings in a request.
+ * scanf terminates %2048s with a NUL character,
+ * but the NUL character can be written after the 2048th non-NUL character.
+ */
+
+#define MAX_STRING_SIZE 2049
+#define MAX_STRING "%2048s"
+
+#include "edge.h"
+#include "net.h"
+#include "node.h"
+#include "subnet.h"
+
+/* Basic functions */
+
+extern bool send_request(struct connection_t *, const char *, ...) __attribute__ ((__format__(printf, 2, 3)));
+extern void forward_request(struct connection_t *, char *);
+extern bool receive_request(struct connection_t *, char *);
+extern bool check_id(const char *);
+
+extern void init_requests(void);
+extern void exit_requests(void);
+extern bool seen_request(char *);
+
+/* Requests */
+
+extern bool send_id(struct connection_t *);
+extern bool send_metakey(struct connection_t *);
+extern bool send_metakey_ec(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 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 *);
+
+/* Request handlers */
+
+extern bool id_h(struct connection_t *, char *);
+extern bool metakey_h(struct connection_t *, char *);
+extern bool challenge_h(struct connection_t *, char *);
+extern bool chal_reply_h(struct connection_t *, char *);
+extern bool ack_h(struct connection_t *, char *);
+extern bool status_h(struct connection_t *, char *);
+extern bool error_h(struct connection_t *, char *);
+extern bool termreq_h(struct connection_t *, char *);
+extern bool ping_h(struct connection_t *, char *);
+extern bool pong_h(struct connection_t *, char *);
+extern bool add_subnet_h(struct connection_t *, char *);
+extern bool del_subnet_h(struct connection_t *, char *);
+extern bool add_edge_h(struct connection_t *, char *);
+extern bool del_edge_h(struct connection_t *, char *);
+extern bool key_changed_h(struct connection_t *, char *);
+extern bool req_key_h(struct connection_t *, char *);
+extern bool ans_key_h(struct connection_t *, char *);
+extern bool tcppacket_h(struct connection_t *, char *);
+extern bool control_h(struct connection_t *, char *);
+
+#endif /* __TINC_PROTOCOL_H__ */