diff options
-rw-r--r-- | src/mesh/gnunet-service-mesh_channel.c | 9 | ||||
-rw-r--r-- | 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) | |||
652 | /* TODO return? */ | 652 | /* TODO return? */ |
653 | } | 653 | } |
654 | } | 654 | } |
655 | GMCH_send_data_ack (ch, fwd); | 655 | GML_send_ack (fwd ? ch->root : ch->dest, fwd ? ch->lid_root : ch->lid_dest); |
656 | 656 | ||
657 | /* In case of a FWD ACk (SYNACK) send a BCK ACK (ACK). */ | 657 | /* In case of a FWD ACk (SYNACK) send a BCK ACK (ACK). */ |
658 | if (fwd) | 658 | if (fwd) |
@@ -1626,10 +1626,9 @@ void | |||
1626 | GMCH_send_prebuilt_message (const struct GNUNET_MessageHeader *message, | 1626 | GMCH_send_prebuilt_message (const struct GNUNET_MessageHeader *message, |
1627 | struct MeshChannel *ch, int fwd) | 1627 | struct MeshChannel *ch, int fwd) |
1628 | { | 1628 | { |
1629 | LOG (GNUNET_ERROR_TYPE_DEBUG, "Send %s on channel %s\n", | 1629 | LOG (GNUNET_ERROR_TYPE_DEBUG, "GMCH Send %s %s on channel %s\n", |
1630 | fwd ? "FWD" : "BCK", GMCH_2s (ch)); | 1630 | fwd ? "FWD" : "BCK", GNUNET_MESH_DEBUG_M2S (ntohs (message->type)), |
1631 | LOG (GNUNET_ERROR_TYPE_DEBUG, " %s\n", | 1631 | GMCH_2s (ch)); |
1632 | GNUNET_MESH_DEBUG_M2S (ntohs (message->type))); | ||
1633 | 1632 | ||
1634 | if (GMT_is_loopback (ch->t)) | 1633 | if (GMT_is_loopback (ch->t)) |
1635 | { | 1634 | { |
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, | |||
1182 | uint64_t iv; | 1182 | uint64_t iv; |
1183 | uint16_t type; | 1183 | uint16_t type; |
1184 | 1184 | ||
1185 | LOG (GNUNET_ERROR_TYPE_DEBUG, "Send on Tunnel %s\n", GMP_2s (t->peer)); | 1185 | LOG (GNUNET_ERROR_TYPE_DEBUG, "GMT Send on Tunnel %s\n", GMP_2s (t->peer)); |
1186 | 1186 | ||
1187 | iv = GNUNET_CRYPTO_random_u64 (GNUNET_CRYPTO_QUALITY_NONCE, UINT64_MAX); | 1187 | iv = GNUNET_CRYPTO_random_u64 (GNUNET_CRYPTO_QUALITY_NONCE, UINT64_MAX); |
1188 | msg = (struct GNUNET_MESH_Encrypted *) cbuf; | 1188 | msg = (struct GNUNET_MESH_Encrypted *) cbuf; |