[GNUnet-SVN] r11924 - gnunet/src/dv

[gnunet]

Author: nevans
Date: 2010-06-24 14:53:28 +0200 (Thu, 24 Jun 2010)
New Revision: 11924

Modified:
   gnunet/src/dv/gnunet-service-dv.c
   gnunet/src/dv/plugin_transport_dv.c
Log:
logging

Modified: gnunet/src/dv/gnunet-service-dv.c
===================================================================
--- gnunet/src/dv/gnunet-service-dv.c   2010-06-24 12:12:31 UTC (rev 11923)
+++ gnunet/src/dv/gnunet-service-dv.c   2010-06-24 12:53:28 UTC (rev 11924)
@@ -1213,7 +1213,7 @@
   {
 #if DEBUG_DV_MESSAGES
     GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-                "%s: Receives %s message for me, uid %u, total size %d cost %u 
from %s!\n", my_short_id, "DV DATA", ctx->uid, ntohs(message->size), 
ctx->distant->cost, GNUNET_i2s(&ctx->distant->identity));
+                "%s: Receives %s message for me, uid %u, size %d, type %d cost 
%u from %s!\n", my_short_id, "DV DATA", ctx->uid, ntohs(message->size), 
ntohs(message->type), ctx->distant->cost, GNUNET_i2s(&ctx->distant->identity));
 #endif
     GNUNET_assert(memcmp(ctx->peer, &ctx->distant->identity, sizeof(struct 
GNUNET_PeerIdentity)) != 0);
     send_to_plugin(ctx->peer, message, ntohs(message->size), 
&ctx->distant->identity, ctx->distant->cost);
@@ -1310,9 +1310,9 @@
   if (pos == NULL)
     {
       direct_id = GNUNET_strdup(GNUNET_i2s(&dn->identity));
-#if DEBUG_DV
+#if DEBUG_DV_MESSAGES
       GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-                  "%s: unknown sender (%u), Message from %s!\n", 
GNUNET_i2s(&my_identity), ntohl(incoming->sender), direct_id);
+                  "%s: unknown sender (%u), Message uid %llu from %s!\n", 
GNUNET_i2s(&my_identity), ntohl(incoming->sender), ntohl(incoming->uid), 
direct_id);
 #endif
       GNUNET_free(direct_id);
       pos = dn->referee_head;

Modified: gnunet/src/dv/plugin_transport_dv.c
===================================================================
--- gnunet/src/dv/plugin_transport_dv.c 2010-06-24 12:12:31 UTC (rev 11923)
+++ gnunet/src/dv/plugin_transport_dv.c 2010-06-24 12:53:28 UTC (rev 11924)
@@ -158,7 +158,7 @@
   my_id = GNUNET_strdup(GNUNET_i2s(plugin->env->my_identity));
   GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG,
                    "plugin_transport_dv",
-                   _("%s Received message from %s) of type %d, distance 
%u!\n"),
+                   _("%s Received message from %s of type %d, distance %u!\n"),
                    my_id, GNUNET_i2s(sender), ntohs(((struct 
GNUNET_MessageHeader *)msg)->type), distance);
   GNUNET_free_non_null(my_id);
 #endif