along with this program; if not, write to the Free Software
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- $Id: protocol.h,v 1.5.4.32 2002/09/04 08:33:08 guus Exp $
+ $Id: protocol.h,v 1.5.4.35 2002/09/09 21:24:42 guus Exp $
*/
#ifndef __TINC_PROTOCOL_H__
#include "net.h"
#include "node.h"
+#include "edge.h"
#include "subnet.h"
/* Protocol version. Different versions are incompatible,
incompatible version have different protocols.
*/
-#define PROT_CURRENT 16
+#define PROT_CURRENT 17
/* Request numbers */
enum {
- ALL = -1, /* Guardian for allow_request */
- ID = 0, METAKEY, CHALLENGE, CHAL_REPLY, ACK,
- STATUS, ERROR, TERMREQ,
- PING, PONG,
- ADD_SUBNET, DEL_SUBNET,
- ADD_NODE, DEL_NODE,
- KEY_CHANGED, REQ_KEY, ANS_KEY,
- PACKET,
- LAST /* Guardian for the highest request number */
+ ALL = -1, /* Guardian for allow_request */
+ ID = 0, METAKEY, CHALLENGE, CHAL_REPLY, ACK,
+ STATUS, ERROR, TERMREQ,
+ PING, PONG,
+ ADD_SUBNET, DEL_SUBNET,
+ ADD_EDGE, DEL_EDGE,
+ KEY_CHANGED, REQ_KEY, ANS_KEY,
+ PACKET,
+ LAST /* Guardian for the highest request number */
};
typedef struct past_request_t {
- char *request;
- time_t firstseen;
+ char *request;
+ time_t firstseen;
} past_request_t;
/* Maximum size of strings in a request */
/* Basic functions */
-extern int send_request(connection_t*, const char*, ...);
+extern int send_request(connection_t *, const char *, ...);
+extern int forward_request(connection_t *);
extern int receive_request(connection_t *);
extern int check_id(char *);
extern int send_pong(connection_t *);
extern int send_add_subnet(connection_t *, subnet_t *);
extern int send_del_subnet(connection_t *, subnet_t *);
-extern int send_add_node(connection_t *, node_t *);
-extern int send_del_node(connection_t *, node_t *);
+extern int send_add_edge(connection_t *, edge_t *);
+extern int send_del_edge(connection_t *, edge_t *);
extern int send_key_changed(connection_t *, node_t *);
extern int send_req_key(connection_t *, node_t *, node_t *);
extern int send_ans_key(connection_t *, node_t *, node_t *);
/* Request handlers */
-extern int (*request_handlers[])(connection_t *);
+extern int (*request_handlers[]) (connection_t *);
extern int id_h(connection_t *);
extern int metakey_h(connection_t *);
extern int pong_h(connection_t *);
extern int add_subnet_h(connection_t *);
extern int del_subnet_h(connection_t *);
-extern int add_node_h(connection_t *);
-extern int del_node_h(connection_t *);
+extern int add_edge_h(connection_t *);
+extern int del_edge_h(connection_t *);
extern int key_changed_h(connection_t *);
extern int req_key_h(connection_t *);
extern int ans_key_h(connection_t *);
extern int tcppacket_h(connection_t *);
-#endif /* __TINC_PROTOCOL_H__ */
+#endif /* __TINC_PROTOCOL_H__ */