-adding logging, minor dthu bugfixes

3 files changed, 29 insertions, 0 deletions

diff --git a/src/dht/gnunet-service-dht.c b/src/dht/gnunet-service-dht.c
index 4b0a290b9..39433791d 100644
--- a/src/dht/gnunet-service-dht.c
+++ b/src/dht/gnunet-service-dht.c
@@ -265,6 +265,9 @@ u_address_add (void *cls,
   struct GDS_Underlay *u = cls;
   struct MyAddress *a;
 
+  GNUNET_log (GNUNET_ERROR_TYPE_INFO,
+              "Underlay adds address %s for this peer\n",
+              address);
   a = GNUNET_new (struct MyAddress);
   a->source = source;
   a->url = GNUNET_strdup (address);
@@ -292,6 +295,9 @@ u_address_del (void *ctx)
 {
   struct MyAddress *a = ctx;
 
+  GNUNET_log (GNUNET_ERROR_TYPE_INFO,
+              "Underlay deletes address %s for this peer\n",
+              a->url);
   GNUNET_HELLO_builder_del_address (GDS_my_hello,
                                     a->url);
   GNUNET_CONTAINER_DLL_remove (a_head,
diff --git a/src/dht/gnunet-service-dht_clients.c b/src/dht/gnunet-service-dht_clients.c
index e5819b193..dc451ed15 100644
--- a/src/dht/gnunet-service-dht_clients.c
+++ b/src/dht/gnunet-service-dht_clients.c
@@ -562,6 +562,9 @@ handle_local_result (void *cls,
                      const struct GDS_DATACACHE_BlockData *bd)
 {
   /* FIXME: use 'cls' instead of looking up the client? */
+  GNUNET_log (GNUNET_ERROR_TYPE_INFO,
+              "Datacache provided result for query key %s\n",
+              GNUNET_h2s (&bd->key));
   GDS_CLIENTS_handle_reply (bd,
                             &bd->key,
                             0, NULL /* get_path */);
@@ -1081,6 +1084,8 @@ handle_dht_local_hello_get (void *cls,
   struct GNUNET_MessageHeader *hdr;
   struct GNUNET_MQ_Envelope *env;
 
+  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+              "Handling request from local client for my HELLO\n");
   env = GNUNET_MQ_msg_extra (hdr,
                              slen,
                              GNUNET_MESSAGE_TYPE_DHT_CLIENT_HELLO_URL);
@@ -1134,6 +1139,9 @@ handle_dht_local_hello_offer (void *cls,
   struct GNUNET_HELLO_Builder *b;
   struct GNUNET_PeerIdentity pid;
 
+  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+              "Local client provided HELLO URL %s\n",
+              url);
   b = GNUNET_HELLO_builder_from_url (url);
   if (NULL == b)
   {
diff --git a/src/dht/gnunet-service-dht_neighbours.c b/src/dht/gnunet-service-dht_neighbours.c
index 63307dea2..c4d6b7428 100644
--- a/src/dht/gnunet-service-dht_neighbours.c
+++ b/src/dht/gnunet-service-dht_neighbours.c
@@ -2260,7 +2260,11 @@ GDS_try_connect (void *cls,
 
   if (0 == GNUNET_memcmp (&GDS_my_identity,
                           pid))
+  {
+    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+                "Got a HELLO for my own PID, ignoring it\n");
     return; /* that's us! */
+  }
   GNUNET_CRYPTO_hash (pid,
                       sizeof(*pid),
                       &phash);
@@ -2282,6 +2286,13 @@ GDS_try_connect (void *cls,
          alternative address??? */
       return;
     }
+  GNUNET_log (GNUNET_ERROR_TYPE_INFO,
+              "Discovered peer %s at %s suitable for bucket %d (%u/%u), trying to connect\n",
+              GNUNET_i2s (pid),
+              uri,
+              peer_bucket,
+              bucket->peers_size,
+              bucket_size);
   /* new peer that we like! */
   GDS_u_try_connect (pid,
                      uri);
@@ -2492,6 +2503,10 @@ GDS_u_receive (void *cls,
     GNUNET_break_op (0);
     return;
   }
+  GNUNET_log (GNUNET_ERROR_TYPE_INFO,
+              "Handling message of type %u from peer %s\n",
+              ntohs (mh->type),
+              GNUNET_i2s (&pi->id));
   if (GNUNET_OK !=
       GNUNET_MQ_handle_message (core_handlers,
                                 mh))