[GNUnet-SVN] r14361 - in gnunet/src: block vpn

[gnunet]

Author: toelke
Date: 2011-02-05 22:52:36 +0100 (Sat, 05 Feb 2011)
New Revision: 14361

Modified:
   gnunet/src/block/plugin_block_dns.c
   gnunet/src/vpn/gnunet-service-dns.c
Log:
debug DNS-DHT

Modified: gnunet/src/block/plugin_block_dns.c
===================================================================
--- gnunet/src/block/plugin_block_dns.c 2011-02-05 21:52:34 UTC (rev 14360)
+++ gnunet/src/block/plugin_block_dns.c 2011-02-05 21:52:36 UTC (rev 14361)
@@ -67,21 +67,36 @@
       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;

Modified: gnunet/src/vpn/gnunet-service-dns.c
===================================================================
--- gnunet/src/vpn/gnunet-service-dns.c 2011-02-05 21:52:34 UTC (rev 14360)
+++ gnunet/src/vpn/gnunet-service-dns.c 2011-02-05 21:52:36 UTC (rev 14361)
@@ -552,8 +552,9 @@
     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,