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

[gnunet]

Author: bartpolot
Date: 2014-02-19 21:02:24 +0100 (Wed, 19 Feb 2014)
New Revision: 32439

Modified:
   gnunet/src/mesh/gnunet-service-mesh_connection.c
   gnunet/src/mesh/gnunet-service-mesh_tunnel.c
Log:
- log

Modified: gnunet/src/mesh/gnunet-service-mesh_connection.c
===================================================================
--- gnunet/src/mesh/gnunet-service-mesh_connection.c    2014-02-19 20:02:23 UTC 
(rev 32438)
+++ gnunet/src/mesh/gnunet-service-mesh_connection.c    2014-02-19 20:02:24 UTC 
(rev 32439)
@@ -773,7 +773,7 @@
   struct MeshTunnel3 *t;
 
   t = connection->t;
-  LOG (GNUNET_ERROR_TYPE_INFO, "Send %s ACK on connection %s\n",
+  LOG (GNUNET_ERROR_TYPE_INFO, "=> {%18s ACK} on connection %s\n",
        GM_f2s (!fwd), GMC_2s (connection));
   GMP_queue_add (get_hop (connection, fwd), NULL,
                  GNUNET_MESSAGE_TYPE_MESH_CONNECTION_ACK,
@@ -2962,9 +2962,9 @@
   size = sizeof (struct GNUNET_MESH_ConnectionCreate);
   size += connection->path->length * sizeof (struct GNUNET_PeerIdentity);
 
-  LOG (GNUNET_ERROR_TYPE_INFO, "Send %s (%u bytes) on connection %s\n",
+  LOG (GNUNET_ERROR_TYPE_INFO, "=> %s on connection %s  (%u bytes)\n",
        GM_m2s (GNUNET_MESSAGE_TYPE_MESH_CONNECTION_CREATE),
-       size, GMC_2s (connection));
+       GMC_2s (connection), size);
   LOG (GNUNET_ERROR_TYPE_DEBUG, "  C_P+ %p %u (create)\n",
        connection, connection->pending_messages);
   connection->pending_messages++;

Modified: gnunet/src/mesh/gnunet-service-mesh_tunnel.c
===================================================================
--- gnunet/src/mesh/gnunet-service-mesh_tunnel.c        2014-02-19 20:02:23 UTC 
(rev 32438)
+++ gnunet/src/mesh/gnunet-service-mesh_tunnel.c        2014-02-19 20:02:24 UTC 
(rev 32439)
@@ -960,7 +960,7 @@
 static void
 send_ephemeral (struct MeshTunnel3 *t)
 {
-  LOG (GNUNET_ERROR_TYPE_DEBUG, "%s()\n", __FUNCTION__);
+  LOG (GNUNET_ERROR_TYPE_INFO, "=> EPHM for %s\n", GMT_2s (t));
 
   kx_msg.sender_status = htonl (t->estate);
   send_kx (t, &kx_msg.header);
@@ -976,7 +976,7 @@
 {
   struct GNUNET_MESH_KX_Ping msg;
 
-  LOG (GNUNET_ERROR_TYPE_DEBUG, "%s()\n", __FUNCTION__);
+  LOG (GNUNET_ERROR_TYPE_INFO, "=> PING for %s\n", GMT_2s (t));
   msg.header.size = htons (sizeof (msg));
   msg.header.type = htons (GNUNET_MESSAGE_TYPE_MESH_KX_PING);
   msg.iv = GNUNET_CRYPTO_random_u32 (GNUNET_CRYPTO_QUALITY_NONCE, UINT32_MAX);
@@ -1004,7 +1004,7 @@
 {
   struct GNUNET_MESH_KX_Pong msg;
 
-  LOG (GNUNET_ERROR_TYPE_DEBUG, "%s()\n", __FUNCTION__);
+  LOG (GNUNET_ERROR_TYPE_INFO, "=> PONG for %s\n", GMT_2s (t));
   msg.header.size = htons (sizeof (msg));
   msg.header.type = htons (GNUNET_MESSAGE_TYPE_MESH_KX_PONG);
   msg.iv = GNUNET_CRYPTO_random_u32 (GNUNET_CRYPTO_QUALITY_NONCE, UINT32_MAX);
@@ -1435,7 +1435,7 @@
                   const struct GNUNET_MESH_KX_Ephemeral *msg)
 {
   struct GNUNET_HashCode km;
-  LOG (GNUNET_ERROR_TYPE_DEBUG, "  ephemeral key message\n");
+  LOG (GNUNET_ERROR_TYPE_INFO, "<= EPHM for %s\n", GMT_2s (t));
 
   if (GNUNET_OK != check_ephemeral (t, msg))
   {
@@ -1474,7 +1474,7 @@
     return;
   }
 
-  LOG (GNUNET_ERROR_TYPE_DEBUG, "  ping message\n");
+  LOG (GNUNET_ERROR_TYPE_INFO, "<= PING for %s\n", GMT_2s (t));
   t_decrypt (t, &res.target, &msg->target, ping_encryption_size (), msg->iv);
   if (0 != memcmp (&my_full_id, &res.target, sizeof (my_full_id)))
   {
@@ -1505,7 +1505,7 @@
 {
   uint32_t challenge;
 
-  LOG (GNUNET_ERROR_TYPE_DEBUG, "PONG received\n");
+  LOG (GNUNET_ERROR_TYPE_INFO, "<= PONG for %s\n", GMT_2s (t));
   if (GNUNET_SCHEDULER_NO_TASK == t->rekey_task)
   {
     GNUNET_STATISTICS_update (stats, "# duplicate PONG messages", 1, 
GNUNET_NO);
@@ -1548,7 +1548,7 @@
   uint16_t type;
 
   type = ntohs (msgh->type);
-  LOG (GNUNET_ERROR_TYPE_INFO, "<- %s message\n", GM_m2s (type));
+  LOG (GNUNET_ERROR_TYPE_INFO, "<= %s on %s\n", GM_m2s (type), GMT_2s (t));
 
   switch (type)
   {