aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorBart Polot <bart@net.in.tum.de>2013-10-17 15:22:51 +0000
committerBart Polot <bart@net.in.tum.de>2013-10-17 15:22:51 +0000
commit0f6d24a229e9149db26a4e667ed25032d19f533a (patch)
tree94c2a89e1901cdba64edb74613b1c7ec1256136b /src
parentb77c3c0220c8b1945ee6c4173151847ad2fc4941 (diff)
downloadgnunet-0f6d24a229e9149db26a4e667ed25032d19f533a.tar.gz
gnunet-0f6d24a229e9149db26a4e667ed25032d19f533a.zip
- add separate encryption enabled mesh to avoid breakage during developement
Diffstat (limited to 'src')
-rw-r--r--src/mesh/gnunet-service-mesh_connection.c7
-rw-r--r--src/mesh/test_mesh.conf2
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)
584 * or a first CONNECTION_ACK directed to us. 584 * or a first CONNECTION_ACK directed to us.
585 * 585 *
586 * @param connection Connection to confirm. 586 * @param connection Connection to confirm.
587 * @param fwd Is this a fwd ACK? (First is bck (SYNACK), second is fwd (ACK)) 587 * @param fwd Should we send it FWD?
588 * (First (~SYNACK) goes BCK, second (~ACK) goes FWD)
588 */ 589 */
589static void 590static void
590send_connection_ack (struct MeshConnection *connection, int fwd) 591send_connection_ack (struct MeshConnection *connection, int fwd)
591{ 592{
593 struct MeshFlowControl *fc;
592 struct MeshTunnel3 *t; 594 struct MeshTunnel3 *t;
593 595
594 t = connection->t; 596 t = connection->t;
@@ -602,7 +604,8 @@ send_connection_ack (struct MeshConnection *connection, int fwd)
602 GMT_change_state (t, MESH_TUNNEL3_WAITING); 604 GMT_change_state (t, MESH_TUNNEL3_WAITING);
603 if (MESH_CONNECTION_READY != connection->state) 605 if (MESH_CONNECTION_READY != connection->state)
604 connection_change_state (connection, MESH_CONNECTION_SENT); 606 connection_change_state (connection, MESH_CONNECTION_SENT);
605 607 fc = fwd ? &connection->fwd_fc : &connection->bck_fc;
608 fc->queue_n++;
606} 609}
607 610
608 611
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
7ACCEPT_FROM = 127.0.0.1; 7ACCEPT_FROM = 127.0.0.1;
8HOSTNAME = localhost 8HOSTNAME = localhost
9PORT = 10511 9PORT = 10511
10#PREFIX = valgrind --leak-check=full 10PREFIX = valgrind --leak-check=full
11#PREFIX = xterm -geometry 100x85 -T peer1 -e gdb --args 11#PREFIX = xterm -geometry 100x85 -T peer1 -e gdb --args
12REFRESH_PATH_TIME = 2 s 12REFRESH_PATH_TIME = 2 s
13ID_ANNOUNCE_TIME = 5 s 13ID_ANNOUNCE_TIME = 5 s