From 6d38e5b12b460d1d7f0a6eafe1410f7121e04002 Mon Sep 17 00:00:00 2001 From: Bart Polot Date: Fri, 11 Oct 2013 18:02:52 +0000 Subject: - use server<->client ACKs, not reliable --- src/mesh/gnunet-service-mesh_channel.c | 9 ++++----- src/mesh/gnunet-service-mesh_tunnel.c | 2 +- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/src/mesh/gnunet-service-mesh_channel.c b/src/mesh/gnunet-service-mesh_channel.c index d3b66c501..b142ea054 100644 --- a/src/mesh/gnunet-service-mesh_channel.c +++ b/src/mesh/gnunet-service-mesh_channel.c @@ -652,7 +652,7 @@ channel_confirm (struct MeshChannel *ch, int fwd) /* TODO return? */ } } - GMCH_send_data_ack (ch, fwd); + GML_send_ack (fwd ? ch->root : ch->dest, fwd ? ch->lid_root : ch->lid_dest); /* In case of a FWD ACk (SYNACK) send a BCK ACK (ACK). */ if (fwd) @@ -1626,10 +1626,9 @@ void GMCH_send_prebuilt_message (const struct GNUNET_MessageHeader *message, struct MeshChannel *ch, int fwd) { - LOG (GNUNET_ERROR_TYPE_DEBUG, "Send %s on channel %s\n", - fwd ? "FWD" : "BCK", GMCH_2s (ch)); - LOG (GNUNET_ERROR_TYPE_DEBUG, " %s\n", - GNUNET_MESH_DEBUG_M2S (ntohs (message->type))); + LOG (GNUNET_ERROR_TYPE_DEBUG, "GMCH Send %s %s on channel %s\n", + fwd ? "FWD" : "BCK", GNUNET_MESH_DEBUG_M2S (ntohs (message->type)), + GMCH_2s (ch)); if (GMT_is_loopback (ch->t)) { diff --git a/src/mesh/gnunet-service-mesh_tunnel.c b/src/mesh/gnunet-service-mesh_tunnel.c index 9bcfc8365..a5220a04f 100644 --- a/src/mesh/gnunet-service-mesh_tunnel.c +++ b/src/mesh/gnunet-service-mesh_tunnel.c @@ -1182,7 +1182,7 @@ GMT_send_prebuilt_message (const struct GNUNET_MessageHeader *message, uint64_t iv; uint16_t type; - LOG (GNUNET_ERROR_TYPE_DEBUG, "Send on Tunnel %s\n", GMP_2s (t->peer)); + LOG (GNUNET_ERROR_TYPE_DEBUG, "GMT Send on Tunnel %s\n", GMP_2s (t->peer)); iv = GNUNET_CRYPTO_random_u64 (GNUNET_CRYPTO_QUALITY_NONCE, UINT64_MAX); msg = (struct GNUNET_MESH_Encrypted *) cbuf; -- cgit v1.2.3