Avoid allocating packet buffers unnecessarily.

[meshlink] / src / protocol.h

diff --git a/src/protocol.h b/src/protocol.h
index c7f1faddea32ed8769754273c9314622053af06f..f97682a1717af4277fc460f01f31b88fd8d8a562 100644 (file)
--- a/src/protocol.h
+++ b/src/protocol.h
@@ -1,7 +1,9 @@
+#ifndef MESHLINK_PROTOCOL_H
+#define MESHLINK_PROTOCOL_H
+
 /*
     protocol.h -- header for protocol.c
-    Copyright (C) 1999-2005 Ivo Timmermans,
-                  2000-2013 Guus Sliepen <guus@meshlink.io>
+    Copyright (C) 2014, 2017 Guus Sliepen <guus@meshlink.io>
 
     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
@@ -18,9 +20,6 @@
     51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
 
-#ifndef __TINC_PROTOCOL_H__
-#define __TINC_PROTOCOL_H__
-
 #include "ecdsa.h"
 
 /* Protocol version. Different major versions are incompatible. */
@@ -57,11 +56,6 @@ typedef struct past_request_t {
        time_t firstseen;
 } past_request_t;
 
-extern bool tunnelserver;
-extern bool experimental;
-
-extern ecdsa_t *invitation_key;
-
 /* 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.
@@ -76,52 +70,39 @@ extern ecdsa_t *invitation_key;
 
 /* Basic functions */
 
-extern bool send_request(struct connection_t *, const char *, ...) __attribute__ ((__format__(printf, 2, 3)));
-extern void forward_request(struct connection_t *, const char *);
-extern bool receive_request(struct connection_t *, const char *);
+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 *);
 
-extern void init_requests(void);
-extern void exit_requests(void);
-extern bool seen_request(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 *);
 
 /* 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_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 *);
+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 bool send_req_key(struct meshlink_handle *mesh, struct node_t *);
 
 /* Request handlers  */
 
-extern bool id_h(struct connection_t *, const char *);
-extern bool metakey_h(struct connection_t *, const char *);
-extern bool challenge_h(struct connection_t *, const char *);
-extern bool chal_reply_h(struct connection_t *, const char *);
-extern bool ack_h(struct connection_t *, const char *);
-extern bool status_h(struct connection_t *, const char *);
-extern bool error_h(struct connection_t *, const char *);
-extern bool termreq_h(struct connection_t *, const char *);
-extern bool ping_h(struct connection_t *, const char *);
-extern bool pong_h(struct connection_t *, const char *);
-extern bool add_edge_h(struct connection_t *, const char *);
-extern bool del_edge_h(struct connection_t *, const char *);
-extern bool key_changed_h(struct connection_t *, const char *);
-extern bool req_key_h(struct connection_t *, const char *);
-extern bool ans_key_h(struct connection_t *, const char *);
-extern bool tcppacket_h(struct connection_t *, const char *);
-
-#endif /* __TINC_PROTOCOL_H__ */
+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 *);
+
+#endif