From: Philipp Tölke <toelke@in.tum.de>
Date: Sat, 5 Feb 2011 21:52:36 +0000 (+0000)
Subject: debug DNS-DHT
X-Git-Tag: initial-import-from-subversion-38251~19164
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=612235341a02beb9bcd00b7e83e7121612b23e45;p=oweals%2Fgnunet.git

debug DNS-DHT
---

diff --git a/src/block/plugin_block_dns.c b/src/block/plugin_block_dns.c
index 4321baf34..681a659ae 100644
--- a/src/block/plugin_block_dns.c
+++ b/src/block/plugin_block_dns.c
@@ -67,21 +67,36 @@ block_plugin_dns_evaluate (void *cls,
       return GNUNET_BLOCK_EVALUATION_REQUEST_VALID;
 
     if (reply_block_size != sizeof(struct GNUNET_DNS_Record))
-      return GNUNET_BLOCK_EVALUATION_RESULT_INVALID;
+      {
+        GNUNET_log(GNUNET_ERROR_TYPE_DEBUG, "DNS-Block is invalid: reply_block_size=%d != %d\n", reply_block_size, sizeof(struct GNUNET_DNS_Record));
+        return GNUNET_BLOCK_EVALUATION_RESULT_INVALID;
+      }
 
     const struct GNUNET_DNS_Record* rec = reply_block;
 
     if (ntohl(rec->purpose.size) != sizeof(struct GNUNET_DNS_Record) - sizeof(struct GNUNET_CRYPTO_RsaSignature))
-      return GNUNET_BLOCK_EVALUATION_RESULT_INVALID;
+      {
+        GNUNET_log(GNUNET_ERROR_TYPE_DEBUG,
+                   "DNS-Block is invalid: rec->purpose.size=%d != %d\n",
+                   ntohl(rec->purpose.size),
+                   sizeof(struct GNUNET_DNS_Record) - sizeof(struct GNUNET_CRYPTO_RsaSignature));
+        return GNUNET_BLOCK_EVALUATION_RESULT_INVALID;
+      }
 
     if (GNUNET_TIME_relative_get_zero().rel_value == GNUNET_TIME_absolute_get_remaining(rec->expiration_time).rel_value)
-      return GNUNET_BLOCK_EVALUATION_RESULT_INVALID;
+      {
+        GNUNET_log(GNUNET_ERROR_TYPE_DEBUG, "DNS-Block is invalid: Timeout\n");
+        return GNUNET_BLOCK_EVALUATION_RESULT_INVALID;
+      }
 
     if (GNUNET_OK != GNUNET_CRYPTO_rsa_verify (htonl(GNUNET_SIGNATURE_PURPOSE_DNS_RECORD),
 					       &rec->purpose,
 					       &rec->signature,
 					       &rec->peer))
-      return GNUNET_BLOCK_EVALUATION_RESULT_INVALID;
+      {
+        GNUNET_log(GNUNET_ERROR_TYPE_DEBUG, "DNS-Block is invalid: invalid signature\n");
+        return GNUNET_BLOCK_EVALUATION_RESULT_INVALID;
+      }
 
     /* How to decide whether there are no more? */
     return GNUNET_BLOCK_EVALUATION_OK_MORE;
diff --git a/src/vpn/gnunet-service-dns.c b/src/vpn/gnunet-service-dns.c
index 85ec9ac82..b8488d3e1 100644
--- a/src/vpn/gnunet-service-dns.c
+++ b/src/vpn/gnunet-service-dns.c
@@ -552,8 +552,9 @@ publish_name (void *cls,
     GNUNET_CRYPTO_rsa_key_free(my_private_key);
 
     GNUNET_log(GNUNET_ERROR_TYPE_DEBUG,
-	       "Putting with key %08x\n",
-	       *((unsigned int*)&data.service_descriptor));
+	       "Putting with key %08x, size = %d\n",
+	       *((unsigned int*)&data.service_descriptor),
+               size);
 
     GNUNET_DHT_put(dht,
 		   &data.service_descriptor,