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

[gnunet]

Author: bartpolot
Date: 2013-10-17 17:22:51 +0200 (Thu, 17 Oct 2013)
New Revision: 30264

Modified:
   gnunet/src/mesh/gnunet-service-mesh_connection.c
   gnunet/src/mesh/test_mesh.conf
Log:
- add separate encryption enabled mesh to avoid breakage during developement

Modified: gnunet/src/mesh/gnunet-service-mesh_connection.c
===================================================================
--- gnunet/src/mesh/gnunet-service-mesh_connection.c    2013-10-17 15:18:29 UTC 
(rev 30263)
+++ gnunet/src/mesh/gnunet-service-mesh_connection.c    2013-10-17 15:22:51 UTC 
(rev 30264)
@@ -584,11 +584,13 @@
  * or a first CONNECTION_ACK directed to us.
  *
  * @param connection Connection to confirm.
- * @param fwd Is this a fwd ACK? (First is bck (SYNACK), second is fwd (ACK))
+ * @param fwd Should we send it FWD?
+ *            (First (~SYNACK) goes BCK, second (~ACK) goes FWD)
  */
 static void
 send_connection_ack (struct MeshConnection *connection, int fwd)
 {
+  struct MeshFlowControl *fc;
   struct MeshTunnel3 *t;
 
   t = connection->t;
@@ -602,7 +604,8 @@
     GMT_change_state (t, MESH_TUNNEL3_WAITING);
   if (MESH_CONNECTION_READY != connection->state)
     connection_change_state (connection, MESH_CONNECTION_SENT);
-  
+  fc = fwd ? &connection->fwd_fc : &connection->bck_fc;
+  fc->queue_n++;
 }
 
 

Modified: gnunet/src/mesh/test_mesh.conf
===================================================================
--- gnunet/src/mesh/test_mesh.conf      2013-10-17 15:18:29 UTC (rev 30263)
+++ gnunet/src/mesh/test_mesh.conf      2013-10-17 15:22:51 UTC (rev 30264)
@@ -7,7 +7,7 @@
 ACCEPT_FROM = 127.0.0.1;
 HOSTNAME = localhost
 PORT = 10511
-#PREFIX = valgrind --leak-check=full
+PREFIX = valgrind --leak-check=full
 #PREFIX = xterm -geometry 100x85 -T peer1 -e gdb --args
 REFRESH_PATH_TIME = 2 s
 ID_ANNOUNCE_TIME = 5 s