From 0f6d24a229e9149db26a4e667ed25032d19f533a Mon Sep 17 00:00:00 2001 From: Bart Polot Date: Thu, 17 Oct 2013 15:22:51 +0000 Subject: [PATCH] - add separate encryption enabled mesh to avoid breakage during developement --- src/mesh/gnunet-service-mesh_connection.c | 7 +++++-- src/mesh/test_mesh.conf | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/src/mesh/gnunet-service-mesh_connection.c b/src/mesh/gnunet-service-mesh_connection.c index b57470339..7ce26082a 100644 --- a/src/mesh/gnunet-service-mesh_connection.c +++ b/src/mesh/gnunet-service-mesh_connection.c @@ -584,11 +584,13 @@ send_ack (struct MeshConnection *c, unsigned int buffer, int fwd) * 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 @@ send_connection_ack (struct MeshConnection *connection, int fwd) 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++; } diff --git a/src/mesh/test_mesh.conf b/src/mesh/test_mesh.conf index e7d265bea..adec6a683 100644 --- a/src/mesh/test_mesh.conf +++ b/src/mesh/test_mesh.conf @@ -7,7 +7,7 @@ AUTOSTART = NO 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 -- 2.25.1