logging

diff --git a/src/dv/gnunet-service-dv.c b/src/dv/gnunet-service-dv.c
index f95a2ac5922cf359dac8d5034c6f4a345ba0ad69..2647e34823db4665cfe5ddcd7945fecff008934f 100644 (file)
--- a/src/dv/gnunet-service-dv.c
+++ b/src/dv/gnunet-service-dv.c
@@ -1213,7 +1213,7 @@ void tokenized_message_handler (void *cls,
   {
 #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 @@ static int handle_dv_data_message (void *cls,
   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;

diff --git a/src/dv/plugin_transport_dv.c b/src/dv/plugin_transport_dv.c
index 38826e47fb168c3d81521fa5d2206290ad57f78d..578e0943a92df6297ea6668481a2d5cdc5752f1d 100644 (file)
--- a/src/dv/plugin_transport_dv.c
+++ b/src/dv/plugin_transport_dv.c
@@ -158,7 +158,7 @@ void handle_dv_message_received (void *cls,
   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