X-Git-Url: https://tinc-vpn.org/git/browse?a=blobdiff_plain;f=src%2Fprotocol.h;h=42981ccaa9e4b807104f308d094167ff916721e8;hb=42d2dff33306beae8ddbd9cc991ad80f135950a6;hp=1a1fb3f8cc0207ab0e884e24f76039db10f2efe0;hpb=511b51ffe60c20a9091829c03863197b76027716;p=tinc diff --git a/src/protocol.h b/src/protocol.h index 1a1fb3f8..42981cca 100644 --- a/src/protocol.h +++ b/src/protocol.h @@ -1,7 +1,10 @@ +#ifndef TINC_PROTOCOL_H +#define TINC_PROTOCOL_H + /* protocol.h -- header for protocol.c Copyright (C) 1999-2005 Ivo Timmermans, - 2000-2013 Guus Sliepen + 2000-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 @@ -18,15 +21,12 @@ 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. */ #define PROT_MAJOR 17 -#define PROT_MINOR 3 /* Should not exceed 255! */ +#define PROT_MINOR 7 /* Should not exceed 255! */ /* Silly Windows */ @@ -48,7 +48,8 @@ typedef enum request_t { /* Tinc 1.1 requests */ CONTROL, REQ_PUBKEY, ANS_PUBKEY, - REQ_SPTPS, + SPTPS_PACKET, + UDP_INFO, MTU_INFO, LAST /* Guardian for the highest request number */ } request_t; @@ -61,6 +62,7 @@ extern bool tunnelserver; extern bool strictsubnets; extern bool experimental; +extern int invitation_lifetime; extern ecdsa_t *invitation_key; /* Maximum size of strings in a request. @@ -78,56 +80,60 @@ 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 connection_t *c, const char *format, ...) __attribute__((__format__(printf, 2, 3))); +extern void forward_request(struct connection_t *c, const char *request); +extern bool receive_request(struct connection_t *c, const char *request); extern void init_requests(void); extern void exit_requests(void); -extern bool seen_request(const char *); +extern bool seen_request(const char *request); /* 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 bool send_id(struct connection_t *c); +extern bool send_metakey(struct connection_t *c); +extern bool send_metakey_ec(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_termreq(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 *to); +extern bool send_ans_key(struct node_t *to); +extern bool send_tcppacket(struct connection_t *c, const struct vpn_packet_t *packet); +extern bool send_sptps_tcppacket(struct connection_t *c, const char *packet, int len); +extern bool send_udp_info(struct node_t *from, struct node_t *to); +extern bool send_mtu_info(struct node_t *from, struct node_t *to, int mtu); /* 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_subnet_h(struct connection_t *, const char *); -extern bool del_subnet_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 *); -extern bool control_h(struct connection_t *, const char *); - -#endif /* __TINC_PROTOCOL_H__ */ +extern bool id_h(struct connection_t *c, const char *request); +extern bool metakey_h(struct connection_t *c, const char *request); +extern bool challenge_h(struct connection_t *c, const char *request); +extern bool chal_reply_h(struct connection_t *c, const char *request); +extern bool ack_h(struct connection_t *c, const char *request); +extern bool status_h(struct connection_t *c, const char *request); +extern bool error_h(struct connection_t *c, const char *request); +extern bool termreq_h(struct connection_t *c, const char *request); +extern bool ping_h(struct connection_t *c, const char *request); +extern bool pong_h(struct connection_t *c, const char *request); +extern bool add_subnet_h(struct connection_t *c, const char *request); +extern bool del_subnet_h(struct connection_t *c, const char *request); +extern bool add_edge_h(struct connection_t *c, const char *request); +extern bool del_edge_h(struct connection_t *c, const char *request); +extern bool key_changed_h(struct connection_t *c, const char *request); +extern bool req_key_h(struct connection_t *c, const char *request); +extern bool ans_key_h(struct connection_t *c, const char *request); +extern bool tcppacket_h(struct connection_t *c, const char *request); +extern bool sptps_tcppacket_h(struct connection_t *c, const char *request); +extern bool control_h(struct connection_t *c, const char *request); +extern bool udp_info_h(struct connection_t *c, const char *request); +extern bool mtu_info_h(struct connection_t *c, const char *request); + +#endif