X-Git-Url: http://git.meshlink.io/?p=meshlink;a=blobdiff_plain;f=src%2Fprotocol.h;h=f97682a1717af4277fc460f01f31b88fd8d8a562;hp=8e2258fc3401d1a218e7ef4794b70b2e6473638f;hb=963c5055505f2fc117cd5efa06eaa02c9b2bf85d;hpb=eb049936ffce049cf6b53de8ca0f39c98a360363 diff --git a/src/protocol.h b/src/protocol.h index 8e2258fc..f97682a1 100644 --- a/src/protocol.h +++ b/src/protocol.h @@ -1,6 +1,9 @@ +#ifndef MESHLINK_PROTOCOL_H +#define MESHLINK_PROTOCOL_H + /* protocol.h -- header for protocol.c - Copyright (C) 2014 Guus Sliepen + Copyright (C) 2014, 2017 Guus Sliepen 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 @@ -17,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. */ @@ -70,45 +70,39 @@ typedef struct past_request_t { /* 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_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 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