X-Git-Url: https://tinc-vpn.org/git/browse?a=blobdiff_plain;f=src%2Fprotocol.h;h=3ffcfd5faf6da164133bc650c80b6f8651883328;hb=b34eb5555d40b7e87c1e06988250e4977a793c09;hp=dee6eb8b7404429a995158d004c1db6af7e4a965;hpb=7e6b2dd1ea51057b7135139c200d97a9e8f9c9cb;p=tinc diff --git a/src/protocol.h b/src/protocol.h index dee6eb8b..3ffcfd5f 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,9 +21,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. */ @@ -62,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. @@ -79,7 +80,7 @@ extern ecdsa_t *invitation_key; /* Basic functions */ -extern bool send_request(struct connection_t *, const char *, ...) __attribute__ ((__format__(printf, 2, 3))); +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 *); @@ -95,8 +96,6 @@ 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 *); @@ -108,7 +107,7 @@ 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_sptps_tcppacket(struct connection_t *, const char*, int); +extern bool send_sptps_tcppacket(struct connection_t *, const char *, int); extern bool send_udp_info(struct node_t *, struct node_t *); extern bool send_mtu_info(struct node_t *, struct node_t *, int); @@ -137,4 +136,4 @@ extern bool control_h(struct connection_t *, const char *); extern bool udp_info_h(struct connection_t *, const char *); extern bool mtu_info_h(struct connection_t *, const char *); -#endif /* __TINC_PROTOCOL_H__ */ +#endif