X-Git-Url: https://www.tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=src%2Fprotocol.h;h=47f772c7de41eecdc24c305a7701915754689dab;hp=dea2e9f055deddf3c6a8ad2b1fffe085a5acdf0b;hb=8b2b67e26c5b971761f5015764d5e188f6343bc4;hpb=d134c4542d4e890e1c1007f32b866742319853c5

diff --git a/src/protocol.h b/src/protocol.h
index dea2e9f0..47f772c7 100644
--- a/src/protocol.h
+++ b/src/protocol.h
@@ -17,7 +17,7 @@
     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.31 2002/09/03 20:43:25 guus Exp $
+    $Id: protocol.h,v 1.5.4.34 2002/09/04 16:26:45 guus Exp $
 */
 
 #ifndef __TINC_PROTOCOL_H__
@@ -25,13 +25,14 @@
 
 #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 15
+#define PROT_CURRENT 17
 
 /* Request numbers */
 
@@ -40,8 +41,9 @@ enum {
   ID = 0, METAKEY, CHALLENGE, CHAL_REPLY, ACK,
   STATUS, ERROR, TERMREQ,
   PING, PONG,
+//  ADD_NODE, DEL_NODE,
   ADD_SUBNET, DEL_SUBNET,
-  ADD_NODE, DEL_NODE,
+  ADD_EDGE, DEL_EDGE,
   KEY_CHANGED, REQ_KEY, ANS_KEY,
   PACKET,
   LAST                               /* Guardian for the highest request number */
@@ -60,6 +62,7 @@ typedef struct past_request_t {
 /* Basic functions */
 
 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 *);
 
@@ -80,10 +83,12 @@ extern int send_error(connection_t *, int, char *);
 extern int send_termreq(connection_t *);
 extern int send_ping(connection_t *);
 extern int send_pong(connection_t *);
+// extern int send_add_node(connection_t *, node_t *);
+// extern int send_del_node(connection_t *, node_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 *);
@@ -103,10 +108,12 @@ extern int error_h(connection_t *);
 extern int termreq_h(connection_t *);
 extern int ping_h(connection_t *);
 extern int pong_h(connection_t *);
+// extern int add_node_h(connection_t *);
+// extern int del_node_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 *);