X-Git-Url: https://tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=src%2Fprotocol.h;h=ad3d31e9d4708fcce63cb00e70f381fe2ea70a2a;hp=54d03796063d2b15ba6804e0dfcebc68266466ba;hb=3f0c1f6b81dd305b0ded2424f9f7da441c7d97b6;hpb=776dbf88df1911ec379c2fece0089fd2f5c71021 diff --git a/src/protocol.h b/src/protocol.h index 54d03796..ad3d31e9 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-2009 Guus Sliepen + 2000-2015 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__ - /* Protocol version. Different versions are incompatible, incompatible version have different protocols. */ @@ -37,7 +37,7 @@ typedef enum request_t { PROXY = -2, - ALL = -1, /* Guardian for allow_request */ + ALL = -1, /* Guardian for allow_request */ ID = 0, METAKEY, CHALLENGE, CHAL_REPLY, ACK, STATUS, ERROR, TERMREQ, PING, PONG, @@ -45,7 +45,7 @@ typedef enum request_t { ADD_EDGE, DEL_EDGE, KEY_CHANGED, REQ_KEY, ANS_KEY, PACKET, - LAST /* Guardian for the highest request number */ + LAST /* Guardian for the highest request number */ } request_t; typedef struct past_request_t { @@ -71,7 +71,7 @@ extern bool strictsubnets; /* 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 *); extern bool receive_request(struct connection_t *); extern bool check_id(const char *); @@ -88,9 +88,6 @@ extern bool send_metakey(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 *); @@ -123,4 +120,4 @@ extern bool req_key_h(struct connection_t *); extern bool ans_key_h(struct connection_t *); extern bool tcppacket_h(struct connection_t *); -#endif /* __TINC_PROTOCOL_H__ */ +#endif