- add framework for mesh2 mutipeer tests

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

diff --git a/src/mesh/mesh2.h b/src/mesh/mesh2.h
index ec2e14a1f2fe9acadd496d235f8c5c883db934d0..3bcd067eec45802fe41b35a89d7efe733cf47069 100644 (file)
--- a/src/mesh/mesh2.h
+++ b/src/mesh/mesh2.h
@@ -38,9 +38,6 @@ extern "C"
 
 #define MESH_DEBUG              GNUNET_YES
 
-#define INITIAL_WINDOW_SIZE     8
-#define ACK_THRESHOLD           INITIAL_WINDOW_SIZE / 2
-
 #include "platform.h"
 #include "gnunet_common.h"
 #include "gnunet_util_lib.h"
@@ -112,8 +109,7 @@ struct GNUNET_MESH_ClientConnect
      *       sizeof(uint16_t) * types
      */
   struct GNUNET_MessageHeader header;
-  uint16_t types GNUNET_PACKED;
-  /* uint16_t                 list_types[types]           */
+  /* uint32_t                 list_ports[]           */
 };
 
 
@@ -125,6 +121,7 @@ struct GNUNET_MESH_ClientConnect
  */
 typedef uint32_t MESH_TunnelNumber;
 
+
 /**
  * Message for a client to create and destroy tunnels.
  */
@@ -132,7 +129,6 @@ struct GNUNET_MESH_TunnelMessage
 {
     /**
      * Type: GNUNET_MESSAGE_TYPE_MESH_LOCAL_TUNNEL_[CREATE|DESTROY]
-     *       GNUNET_MESSAGE_TYPE_MESH_LOCAL_TUNNEL_[MAX|MIN]
      *
      * Size: sizeof(struct GNUNET_MESH_TunnelMessage)
      */
@@ -147,6 +143,11 @@ struct GNUNET_MESH_TunnelMessage
      * Tunnel's peer
      */
   struct GNUNET_PeerIdentity peer;
+
+    /**
+     * Port of the tunnel.
+     */
+  uint32_t port GNUNET_PACKED;
 };
 
 
@@ -172,10 +173,15 @@ struct GNUNET_MESH_TunnelNotification
      */
   struct GNUNET_PeerIdentity peer;
 
+    /**
+     * Port for this tunnel
+     */
+  uint32_t port GNUNET_PACKED;
+
     /**
      * Tunnel options (speed, buffering)
      */
-  uint32_t opt;
+  uint32_t opt GNUNET_PACKED;
 };