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

[gnunet]

Author: bartpolot
Date: 2013-10-11 20:02:52 +0200 (Fri, 11 Oct 2013)
New Revision: 30172

Modified:
   gnunet/src/mesh/gnunet-service-mesh_channel.c
   gnunet/src/mesh/gnunet-service-mesh_tunnel.c
Log:
- use server<->client ACKs, not reliable


Modified: gnunet/src/mesh/gnunet-service-mesh_channel.c
===================================================================
--- gnunet/src/mesh/gnunet-service-mesh_channel.c       2013-10-11 17:56:46 UTC 
(rev 30171)
+++ gnunet/src/mesh/gnunet-service-mesh_channel.c       2013-10-11 18:02:52 UTC 
(rev 30172)
@@ -652,7 +652,7 @@
       /* 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 @@
 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))
   {

Modified: gnunet/src/mesh/gnunet-service-mesh_tunnel.c
===================================================================
--- gnunet/src/mesh/gnunet-service-mesh_tunnel.c        2013-10-11 17:56:46 UTC 
(rev 30171)
+++ gnunet/src/mesh/gnunet-service-mesh_tunnel.c        2013-10-11 18:02:52 UTC 
(rev 30172)
@@ -1182,7 +1182,7 @@
   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;