[GNUnet-SVN] r23299 - gnunet/src/mesh

[gnunet]

Author: bartpolot
Date: 2012-08-18 13:00:23 +0200 (Sat, 18 Aug 2012)
New Revision: 23299

Modified:
   gnunet/src/mesh/gnunet-service-mesh.c
   gnunet/src/mesh/mesh.h
   gnunet/src/mesh/mesh_api.c
Log:
- make api use same window size

Modified: gnunet/src/mesh/gnunet-service-mesh.c
===================================================================
--- gnunet/src/mesh/gnunet-service-mesh.c       2012-08-18 10:38:33 UTC (rev 
23298)
+++ gnunet/src/mesh/gnunet-service-mesh.c       2012-08-18 11:00:23 UTC (rev 
23299)
@@ -60,9 +60,6 @@
 #define MESH_DEBUG_DHT          GNUNET_YES
 #define MESH_DEBUG_CONNECTION   GNUNET_NO
 
-#define INITIAL_WINDOW_SIZE     2
-#define ACK_THRESHOLD           INITIAL_WINDOW_SIZE / 2
-
 #if MESH_DEBUG_CONNECTION
 #define DEBUG_CONN(...) GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, __VA_ARGS__)
 #else

Modified: gnunet/src/mesh/mesh.h
===================================================================
--- gnunet/src/mesh/mesh.h      2012-08-18 10:38:33 UTC (rev 23298)
+++ gnunet/src/mesh/mesh.h      2012-08-18 11:00:23 UTC (rev 23299)
@@ -29,6 +29,8 @@
 
 #define MESH_DEBUG              GNUNET_YES
 
+#define INITIAL_WINDOW_SIZE     2
+#define ACK_THRESHOLD           INITIAL_WINDOW_SIZE / 2
 
 #include "platform.h"
 #include "gnunet_common.h"

Modified: gnunet/src/mesh/mesh_api.c
===================================================================
--- gnunet/src/mesh/mesh_api.c  2012-08-18 10:38:33 UTC (rev 23298)
+++ gnunet/src/mesh/mesh_api.c  2012-08-18 11:00:23 UTC (rev 23299)
@@ -454,7 +454,7 @@
   {
     t->tid = tid;
   }
-  t->max_send_pid = 0;
+  t->max_send_pid = INITIAL_WINDOW_SIZE - 1;
   t->last_recv_pid = (uint32_t) -1;
   return t;
 }
@@ -837,7 +837,7 @@
       continue;
     }
     t->next_send_pid = 0;
-    t->max_send_pid = 0;
+    t->max_send_pid = INITIAL_WINDOW_SIZE - 1;
     t->last_recv_pid = (uint32_t) -1;
     tmsg.header.type = htons (GNUNET_MESSAGE_TYPE_MESH_LOCAL_TUNNEL_CREATE);
     tmsg.header.size = htons (sizeof (struct GNUNET_MESH_TunnelMessage));