Protocol fix (ANS_KEY). This breaks 0.3.3 protocol compatibility.

[tinc] / src / protocol.h

diff --git a/src/protocol.h b/src/protocol.h
index 3021e2f..2713df9 100644 (file)
--- a/src/protocol.h
+++ b/src/protocol.h
@@ -61,6 +61,7 @@ enum {
 
 typedef struct add_host_t {
   unsigned char type;
+  char unused1;
   ip_t real_ip;
   ip_t vpn_ip;
   ip_t vpn_mask;
@@ -69,6 +70,7 @@ typedef struct add_host_t {
 
 typedef struct termreq_t {
   unsigned char type;
+  char unused1;
   ip_t vpn_ip;
 } termreq_t;
 
@@ -82,18 +84,21 @@ typedef struct basic_info_t {
 
 typedef struct calculate_t {
   unsigned char type;
+  char unused1;
   unsigned short len;
   char key;
 } calculate_t;
 
 typedef struct public_key_t {
   unsigned char type;
+  char unused1;
   unsigned short len;
   char key;
 } public_key_t;
 
 typedef struct key_req_t {
   unsigned char type;
+  char unused1;
   ip_t from;
   ip_t to;
   time_t expiry;
@@ -103,15 +108,17 @@ typedef struct key_req_t {
 
 typedef struct key_changed_t {
   unsigned char type;
+  char unused1;
   ip_t from;
 } key_changed_t;
 
 typedef struct del_host_t {
   unsigned char type;
+  char unused1;
   ip_t vpn_ip;
 } del_host_t;
 
-extern int (*request_handlers[256])(conn_list_t*, unsigned char*, int);
+extern int (*request_handlers[256])(conn_list_t*);
 
 extern int send_ping(conn_list_t*);
 extern int send_basic_info(conn_list_t *);