reduce verbosity of testcases, minor fix

diff --git a/src/dht/gnunet-service-dht.c b/src/dht/gnunet-service-dht.c
index 1f78ccf989dd86e5e5101c4906f9b5aa01ce2fa7..5cc3bcfbfe54af89f8da77faeccba4d6256f2b8d 100644 (file)
--- a/src/dht/gnunet-service-dht.c
+++ b/src/dht/gnunet-service-dht.c
@@ -2342,7 +2342,6 @@ handle_dht_get (void *cls,
     }
   else
     {
-
       /* check query valid */
       if (GNUNET_BLOCK_EVALUATION_REQUEST_INVALID
          == GNUNET_BLOCK_evaluate (block_context,
@@ -2725,7 +2724,7 @@ get_forward_count (unsigned int hop_count, size_t target_replication)
    * full routing tables, which for our RR topologies may not be the case!
    */
   diameter = estimate_diameter ();
-  if ((hop_count > (diameter + 1) * 2) && (MINIMUM_PEER_THRESHOLD < estimate_diameter() * bucket_size))
+  if ((hop_count > (diameter + 1) * 2) && (MINIMUM_PEER_THRESHOLD < estimate_diameter() * bucket_size) && (use_max_hops == GNUNET_NO))
     {
 #if DEBUG_DHT
       GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
@@ -3604,7 +3603,7 @@ route_message(void *cls,
       cache_response (cls, message_context);
       handle_dht_get (cls, msg, message_context);
       break;
-    case GNUNET_MESSAGE_TYPE_DHT_PUT: /* Check if closest, if so insert data. FIXME: thresholding to reduce complexity?*/
+    case GNUNET_MESSAGE_TYPE_DHT_PUT: /* Check if closest, if so insert data. */
       increment_stats(STAT_PUTS);
       handle_dht_put (cls, msg, message_context);
       break;

diff --git a/src/dht/test_dht_api.c b/src/dht/test_dht_api.c
index 465a9246a248b0c575414fc23784cb67774c4109..3d4e8dfb10f2ffe39e5db52b3c8612ebd8611283 100644 (file)
--- a/src/dht/test_dht_api.c
+++ b/src/dht/test_dht_api.c
@@ -34,7 +34,7 @@
 #include "gnunet_dht_service.h"
 #include "gnunet_hello_lib.h"
 
-#define VERBOSE GNUNET_YES
+#define VERBOSE GNUNET_NO
 
 #define VERBOSE_ARM GNUNET_NO
 

diff --git a/src/dht/test_dht_api_data.conf b/src/dht/test_dht_api_data.conf
index df2c53d2a2d03768cfe5bb11fd651326dc65d89c..24e3bca30bc1d734e6c0616038a86b069f7e8bf2 100644 (file)
--- a/src/dht/test_dht_api_data.conf
+++ b/src/dht/test_dht_api_data.conf
@@ -23,9 +23,12 @@ TOTAL_QUOTA_IN = 3932160
 PORT = 2092
 
 [dht]
-DEBUG = YES
+DEBUG = NO
 PORT = 12370
 
+[block]
+plugins = dht test
+
 [transport]
 plugins = tcp
 DEBUG = NO

diff --git a/src/dht/test_dht_api_peer1.conf b/src/dht/test_dht_api_peer1.conf
index b6fbe20cfed278d474fa165a8a4f831501314798..597e7af8f978c7254a047a0051f216271b3ff954 100644 (file)
--- a/src/dht/test_dht_api_peer1.conf
+++ b/src/dht/test_dht_api_peer1.conf
@@ -2,7 +2,7 @@
 AUTOSTART = NO
 
 [dht]
-DEBUG = YES
+DEBUG = NO
 AUTOSTART = YES
 ACCEPT_FROM6 = ::1;
 ACCEPT_FROM = 127.0.0.1;

diff --git a/src/dht/test_dht_multipeer.c b/src/dht/test_dht_multipeer.c
index 293829bc753050222100dcad478078bbe469ea36..65eb213e26697c456dc9f09ffd8667a1e6aa588f 100644 (file)
--- a/src/dht/test_dht_multipeer.c
+++ b/src/dht/test_dht_multipeer.c
@@ -28,7 +28,7 @@
 #include "gnunet_dht_service.h"
 
 /* DEFINES */
-#define VERBOSE GNUNET_YES
+#define VERBOSE GNUNET_NO
 
 /* Timeout for entire testcase */
 #define TIMEOUT GNUNET_TIME_relative_multiply(GNUNET_TIME_UNIT_MINUTES, 5)

diff --git a/src/dht/test_dht_twopeer.c b/src/dht/test_dht_twopeer.c
index b9f95eb5113c5258d60612f64dab7a5819057e20..02e789069a2269c0d8ac9d8602f08e3f550d1629 100644 (file)
--- a/src/dht/test_dht_twopeer.c
+++ b/src/dht/test_dht_twopeer.c
@@ -28,7 +28,7 @@
 #include "gnunet_dht_service.h"
 
 /* DEFINES */
-#define VERBOSE GNUNET_YES
+#define VERBOSE GNUNET_NO
 
 #define MAX_GET_ATTEMPTS 10
 

diff --git a/src/dht/test_dht_twopeer_data.conf b/src/dht/test_dht_twopeer_data.conf
index ea90b3c000f08b5bdb6db7af43c57458208a6e78..5110b300118f95d68b38e13cfe62290ad5253f1f 100644 (file)
--- a/src/dht/test_dht_twopeer_data.conf
+++ b/src/dht/test_dht_twopeer_data.conf
@@ -2,7 +2,7 @@
 AUTOSTART = NO
 
 [dht]
-DEBUG = YES
+DEBUG = NO
 AUTOSTART = YES
 #PREFIX = xterm -T dht -e gdb --args
 PORT = 2100

diff --git a/src/dht/test_dht_twopeer_put_get.c b/src/dht/test_dht_twopeer_put_get.c
index 9ff2ae18ef922f0dcddbb646fcb0d91e62298331..1aa83716b0a2f9bd700561691bbbe8cfe722728d 100644 (file)
--- a/src/dht/test_dht_twopeer_put_get.c
+++ b/src/dht/test_dht_twopeer_put_get.c
@@ -42,7 +42,7 @@
 #include "gnunet_dht_service.h"
 
 /* DEFINES */
-#define VERBOSE GNUNET_YES
+#define VERBOSE GNUNET_NO
 
 /* Timeout for entire testcase */
 #define TIMEOUT GNUNET_TIME_relative_multiply(GNUNET_TIME_UNIT_MINUTES, 5)