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

[gnunet]

Author: bartpolot
Date: 2013-12-20 05:24:26 +0100 (Fri, 20 Dec 2013)
New Revision: 31592

Modified:
   gnunet/src/mesh/gnunet-mesh.c
   gnunet/src/mesh/mesh_api.c
Log:
- fix compilation issue


Modified: gnunet/src/mesh/gnunet-mesh.c
===================================================================
--- gnunet/src/mesh/gnunet-mesh.c       2013-12-20 04:17:08 UTC (rev 31591)
+++ gnunet/src/mesh/gnunet-mesh.c       2013-12-20 04:24:26 UTC (rev 31592)
@@ -182,8 +182,8 @@
   {
     struct GNUNET_HashCode hash;
     GNUNET_CRYPTO_hash (buf, data_size, &hash);
-    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "  hash SEND %s (%u)\n",
-                GNUNET_h2s_full (&hash), data_size);
+    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "  cli SEND %p hash %s (%u)\n",
+                buf, GNUNET_h2s_full (&hash), data_size);
   }
   if (data_size < 1)
   {
@@ -340,16 +340,16 @@
 
   len = ntohs (message->size) - sizeof (*message);
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Got %u bytes\n", len);
-  GNUNET_BIO_write (1, (char *) &message[1], len);
+  write (1, (char *) &message[1], len);
   {
     struct GNUNET_HashCode hash;
 
     GNUNET_CRYPTO_hash (message, ntohs (message->size), &hash);
-    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "  api hash RECV %s (%u)\n",
-                GNUNET_h2s_full (&hash), ntohs (message->size));
+    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "  api RECV %p hash %s (%u)\n",
+                message, GNUNET_h2s_full (&hash), ntohs (message->size));
     GNUNET_CRYPTO_hash (&message[1], len, &hash);
-    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "  hash RECV %s (%u)\n",
-                GNUNET_h2s_full (&hash), len);
+    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "  cli RECV %p hash %s (%u)\n",
+                &message[1], GNUNET_h2s_full (&hash), len);
   }
   return GNUNET_OK;
 }

Modified: gnunet/src/mesh/mesh_api.c
===================================================================
--- gnunet/src/mesh/mesh_api.c  2013-12-20 04:17:08 UTC (rev 31591)
+++ gnunet/src/mesh/mesh_api.c  2013-12-20 04:24:26 UTC (rev 31592)
@@ -856,18 +856,17 @@
   }
   type = ntohs (payload->type);
   size = ntohs (payload->size);
-  LOG (GNUNET_ERROR_TYPE_DEBUG, "  payload type %u\n", type);
+  LOG (GNUNET_ERROR_TYPE_DEBUG, "  payload type %s\n", GM_m2s (type));
   for (i = 0; i < h->n_handlers; i++)
   {
     handler = &h->message_handlers[i];
-    LOG (GNUNET_ERROR_TYPE_DEBUG,
-         "    checking handler for type %u\n",
+    LOG (GNUNET_ERROR_TYPE_DEBUG, "    checking handler for type %u\n",
          handler->type);
     if (handler->type == type)
     {
       GNUNET_CRYPTO_hash (payload, size, &hash);
-      LOG (GNUNET_ERROR_TYPE_DEBUG, "  hash recv %s (%u)\n",
-           GNUNET_h2s_full (&hash), size);
+      LOG (GNUNET_ERROR_TYPE_DEBUG, "  recv %p hash %s (%u)\n",
+           payload, GNUNET_h2s_full (&hash), size);
       if (GNUNET_OK !=
           handler->callback (h->cls, ch, &ch->ctx, payload))
       {