[GNUnet-SVN] r13182 - gnunet/src/dht

[gnunet]

Author: nevans
Date: 2010-10-06 13:26:49 +0200 (Wed, 06 Oct 2010)
New Revision: 13182

Modified:
   gnunet/src/dht/gnunet-service-dht.c
   gnunet/src/dht/test_dht_api.c
   gnunet/src/dht/test_dht_api_data.conf
   gnunet/src/dht/test_dht_api_peer1.conf
   gnunet/src/dht/test_dht_multipeer.c
   gnunet/src/dht/test_dht_twopeer.c
   gnunet/src/dht/test_dht_twopeer_data.conf
   gnunet/src/dht/test_dht_twopeer_put_get.c
Log:
reduce verbosity of testcases, minor fix

Modified: gnunet/src/dht/gnunet-service-dht.c
===================================================================
--- gnunet/src/dht/gnunet-service-dht.c 2010-10-06 11:17:16 UTC (rev 13181)
+++ gnunet/src/dht/gnunet-service-dht.c 2010-10-06 11:26:49 UTC (rev 13182)
@@ -2342,7 +2342,6 @@
     }
   else
     {
-
       /* check query valid */
       if (GNUNET_BLOCK_EVALUATION_REQUEST_INVALID
          == GNUNET_BLOCK_evaluate (block_context,
@@ -2725,7 +2724,7 @@
    * 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 @@
       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;

Modified: gnunet/src/dht/test_dht_api.c
===================================================================
--- gnunet/src/dht/test_dht_api.c       2010-10-06 11:17:16 UTC (rev 13181)
+++ gnunet/src/dht/test_dht_api.c       2010-10-06 11:26:49 UTC (rev 13182)
@@ -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
 

Modified: gnunet/src/dht/test_dht_api_data.conf
===================================================================
--- gnunet/src/dht/test_dht_api_data.conf       2010-10-06 11:17:16 UTC (rev 
13181)
+++ gnunet/src/dht/test_dht_api_data.conf       2010-10-06 11:26:49 UTC (rev 
13182)
@@ -23,9 +23,12 @@
 PORT = 2092
 
 [dht]
-DEBUG = YES
+DEBUG = NO
 PORT = 12370
 
+[block]
+plugins = dht test
+
 [transport]
 plugins = tcp
 DEBUG = NO

Modified: gnunet/src/dht/test_dht_api_peer1.conf
===================================================================
--- gnunet/src/dht/test_dht_api_peer1.conf      2010-10-06 11:17:16 UTC (rev 
13181)
+++ gnunet/src/dht/test_dht_api_peer1.conf      2010-10-06 11:26:49 UTC (rev 
13182)
@@ -2,7 +2,7 @@
 AUTOSTART = NO
 
 [dht]
-DEBUG = YES
+DEBUG = NO
 AUTOSTART = YES
 ACCEPT_FROM6 = ::1;
 ACCEPT_FROM = 127.0.0.1;

Modified: gnunet/src/dht/test_dht_multipeer.c
===================================================================
--- gnunet/src/dht/test_dht_multipeer.c 2010-10-06 11:17:16 UTC (rev 13181)
+++ gnunet/src/dht/test_dht_multipeer.c 2010-10-06 11:26:49 UTC (rev 13182)
@@ -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)

Modified: gnunet/src/dht/test_dht_twopeer.c
===================================================================
--- gnunet/src/dht/test_dht_twopeer.c   2010-10-06 11:17:16 UTC (rev 13181)
+++ gnunet/src/dht/test_dht_twopeer.c   2010-10-06 11:26:49 UTC (rev 13182)
@@ -28,7 +28,7 @@
 #include "gnunet_dht_service.h"
 
 /* DEFINES */
-#define VERBOSE GNUNET_YES
+#define VERBOSE GNUNET_NO
 
 #define MAX_GET_ATTEMPTS 10
 

Modified: gnunet/src/dht/test_dht_twopeer_data.conf
===================================================================
--- gnunet/src/dht/test_dht_twopeer_data.conf   2010-10-06 11:17:16 UTC (rev 
13181)
+++ gnunet/src/dht/test_dht_twopeer_data.conf   2010-10-06 11:26:49 UTC (rev 
13182)
@@ -2,7 +2,7 @@
 AUTOSTART = NO
 
 [dht]
-DEBUG = YES
+DEBUG = NO
 AUTOSTART = YES
 #PREFIX = xterm -T dht -e gdb --args
 PORT = 2100

Modified: gnunet/src/dht/test_dht_twopeer_put_get.c
===================================================================
--- gnunet/src/dht/test_dht_twopeer_put_get.c   2010-10-06 11:17:16 UTC (rev 
13181)
+++ gnunet/src/dht/test_dht_twopeer_put_get.c   2010-10-06 11:26:49 UTC (rev 
13182)
@@ -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)