[GNUnet-SVN] r8608 - in GNUnet/src/applications/dv_dht: module tools

[gnunet]

Author: nevans
Date: 2009-06-29 14:23:23 -0600 (Mon, 29 Jun 2009)
New Revision: 8608

Modified:
   GNUnet/src/applications/dv_dht/module/routing.c
   GNUnet/src/applications/dv_dht/tools/dv_test.conf
Log:


Modified: GNUnet/src/applications/dv_dht/module/routing.c
===================================================================
--- GNUnet/src/applications/dv_dht/module/routing.c     2009-06-28 17:08:07 UTC 
(rev 8607)
+++ GNUnet/src/applications/dv_dht/module/routing.c     2009-06-29 20:23:23 UTC 
(rev 8608)
@@ -473,6 +473,13 @@
                              "Routing result to local client\n");
 #endif
               pos->receiver (key, type, size, data, pos->receiver_closure);
+              if ((debug_routes) && (dhtlog != NULL))
+                {
+                  queryuid = ntohl (result->queryuid);
+                  dhtlog->insert_query (NULL, queryuid, DHTLOG_RESULT,
+                                        ntohl (result->hop_count), GNUNET_YES,
+                                        coreAPI->my_identity, key);
+                }
               if (stats != NULL)
                 stats->change (stat_replies_routed, 1);
             }
@@ -863,13 +870,6 @@
                  "Received REMOTE DV_DHT RESULT for key `%s'.\n", &enc);
 #endif
 
-  if ((debug_routes) && (dhtlog != NULL))
-    {
-      queryuid = ntohl (result->queryuid);
-      dhtlog->insert_query (NULL, queryuid, DHTLOG_RESULT,
-                            ntohl (result->hop_count), GNUNET_YES,
-                            coreAPI->my_identity, &result->key);
-    }
   route_result (&result->key,
                 ntohl (result->type),
                 ntohs (result->header.size) - sizeof (DV_DHT_MESSAGE),

Modified: GNUnet/src/applications/dv_dht/tools/dv_test.conf
===================================================================
--- GNUnet/src/applications/dv_dht/tools/dv_test.conf   2009-06-28 17:08:07 UTC 
(rev 8607)
+++ GNUnet/src/applications/dv_dht/tools/dv_test.conf   2009-06-29 20:23:23 UTC 
(rev 8608)
@@ -4,7 +4,7 @@
 STARTING_PORT=31387
 PORT_INCREMENT=2
 BASE_CONFIG=gnunetd_dv.conf
-TOPOLOGY=2
+TOPOLOGY=0
 #PERCENTAGE=.45
 MYSQL_HOST = localhost
 MYSQL_DB = dhttests