X-Git-Url: https://tinc-vpn.org/git/browse?a=blobdiff_plain;f=src%2Fprotocol.h;h=2c97641d97b9c5fc1a236dc367cc2932c7f2108f;hb=bbeab00f46a6c856573fe0d2b9b85bce35728403;hp=29c4ab1cdd052ad4f85d51fa036421b242e43a46;hpb=103543aa2c15d9f1e2aa313a2e593a7524cce484;p=tinc diff --git a/src/protocol.h b/src/protocol.h index 29c4ab1c..2c97641d 100644 --- a/src/protocol.h +++ b/src/protocol.h @@ -21,11 +21,10 @@ #ifndef __TINC_PROTOCOL_H__ #define __TINC_PROTOCOL_H__ -/* Protocol version. Different versions are incompatible, - incompatible version have different protocols. - */ +/* Protocol version. Different major versions are incompatible. */ -#define PROT_CURRENT 17 +#define PROT_MAJOR 17 +#define PROT_MINOR 2 /* Silly Windows */ @@ -55,6 +54,7 @@ typedef struct 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, @@ -84,6 +84,7 @@ extern bool seen_request(char *); 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 *); @@ -96,10 +97,10 @@ 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(); +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 *, struct vpn_packet_t *); +extern bool send_tcppacket(struct connection_t *, const struct vpn_packet_t *); /* Request handlers */