- fixes

[oweals/gnunet.git] / src / mesh / mesh_protocol.h

diff --git a/src/mesh/mesh_protocol.h b/src/mesh/mesh_protocol.h
index 21f64d3eb75069b22ae8c68c9bcfe61b6fb867a0..01f7f3487d8ca91972271440d83a8eda792e7ded 100644 (file)
--- a/src/mesh/mesh_protocol.h
+++ b/src/mesh/mesh_protocol.h
@@ -35,6 +35,10 @@ extern "C"
 #endif
 #endif
 
+#define MESH_TUNNEL_OPT_SPEED_MIN       0x1
+#define MESH_TUNNEL_OPT_NOBUFFER        0x2
+
+
 /******************************************************************************/
 /********************      MESH NETWORK MESSAGES     **************************/
 /******************************************************************************/
@@ -47,7 +51,7 @@ GNUNET_NETWORK_STRUCT_BEGIN
 struct GNUNET_MESH_ManipulatePath
 {
     /**
-     * Type: GNUNET_MESSAGE_TYPE_MESH_PATH_[CREATE|CHANGE|ADD|DEL]
+     * Type: GNUNET_MESSAGE_TYPE_MESH_PATH_[CREATE|CHANGE|ADD|DESTROY]
      *
      * Size: sizeof(struct GNUNET_MESH_ManipulatePath) +
      *       path_length * sizeof (struct GNUNET_PeerIdentity)
@@ -60,6 +64,16 @@ struct GNUNET_MESH_ManipulatePath
      */
   uint32_t tid GNUNET_PACKED;
 
+    /**
+     * Tunnel options (MESH_TUNNEL_OPT_*).
+     */
+  uint32_t opt GNUNET_PACKED;
+
+    /**
+     * 64 bit alignment padding.
+     */
+  uint32_t reserved GNUNET_PACKED;
+
     /**
      * path_length structs defining the *whole* path from the origin [0] to the
      * final destination [path_length-1].
@@ -159,6 +173,16 @@ struct GNUNET_MESH_ToOrigin
      */
   uint32_t tid GNUNET_PACKED;
 
+    /**
+     * Number of hops to live
+     */
+  uint32_t ttl GNUNET_PACKED;
+
+    /**
+     * Unique ID of the packet
+     */
+  uint32_t pid GNUNET_PACKED;
+
     /**
      * OID of the tunnel
      */
@@ -176,7 +200,7 @@ struct GNUNET_MESH_ToOrigin
 
 
 /**
- * Message to acknowledte mesh data traffic.
+ * Message to acknowledge mesh data traffic.
  */
 struct GNUNET_MESH_ACK
 {
@@ -196,13 +220,36 @@ struct GNUNET_MESH_ACK
   struct GNUNET_PeerIdentity oid;
 
     /**
-     * Sender of the message.
+     * Maximum packet ID authorized.
      */
-  struct GNUNET_PeerIdentity sender;
+  uint32_t pid;
 
-    /**
-     * Payload follows
-     */
+};
+
+/**
+ * Message to query a peer about its Flow Control status regarding a tunnel.
+ */
+struct GNUNET_MESH_Poll
+{
+  /**
+   * Type: GNUNET_MESSAGE_TYPE_MESH_POLL
+   */
+  struct GNUNET_MessageHeader header;
+
+  /**
+   * TID of the tunnel
+   */
+  uint32_t tid GNUNET_PACKED;
+
+  /**
+   * OID of the tunnel
+   */
+  struct GNUNET_PeerIdentity oid;
+
+  /**
+   * Last ACK received.
+   */
+  uint32_t last_ack;
 };
 
 /**
@@ -293,36 +340,27 @@ struct GNUNET_MESH_TunnelDestroy
 
 
 /**
- * Message for mesh flow control
+ * Message to destroy a tunnel
  */
-struct GNUNET_MESH_SpeedNotify
+struct GNUNET_MESH_TunnelKeepAlive
 {
-    /**
-     * Type: GNUNET_MESSAGE_TYPE_DATA_SPEED_NOTIFY
-     */
+  /**
+   * Type: GNUNET_MESSAGE_TYPE_MESH_PATH_KEEPALIVE
+   */
   struct GNUNET_MessageHeader header;
-
-    /**
-     * TID of the tunnel
-     */
+  
+  /**
+   * TID of the tunnel
+   */
   uint32_t tid GNUNET_PACKED;
-
-    /**
-     * OID of the tunnel
-     */
+  
+  /**
+   * OID of the tunnel
+   */
   struct GNUNET_PeerIdentity oid;
+};
 
-    /**
-     * Is the speed limited by the slowest peer?.
-     */
-  int16_t speed_min;
-
-    /**
-     * Is the buffering allowed?.
-     */
-  int16_t buffering;
 
-};
 
 GNUNET_NETWORK_STRUCT_END