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

[gnunet]

Author: nevans
Date: 2010-10-06 13:16:35 +0200 (Wed, 06 Oct 2010)
New Revision: 13180

Modified:
   gnunet/src/dht/gnunet-service-dht.c
Log:
missing route2 call

Modified: gnunet/src/dht/gnunet-service-dht.c
===================================================================
--- gnunet/src/dht/gnunet-service-dht.c 2010-10-06 10:04:41 UTC (rev 13179)
+++ gnunet/src/dht/gnunet-service-dht.c 2010-10-06 11:16:35 UTC (rev 13180)
@@ -2316,13 +2316,13 @@
                              &message_context->key, type,
                              &datacache_get_iterator,
                              message_context);
-  if (results >= 1)
-    {
 #if DEBUG_DHT
       GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
                   "`%s:%s': Found %d results for `%s' request uid %llu\n", 
my_short_id, "DHT",
                   results, "GET", message_context->unique_id);
 #endif
+  if (results >= 1)
+    {
 #if DEBUG_DHT_ROUTING
       if ((debug_routes) && (dhtlog_handle != NULL))
         {
@@ -2342,6 +2342,7 @@
     }
   else
     {
+
       /* check query valid */
       if (GNUNET_BLOCK_EVALUATION_REQUEST_INVALID
          == GNUNET_BLOCK_evaluate (block_context,
@@ -2601,11 +2602,7 @@
     return;
 
   data_size = ntohs (put_msg->header.size) - sizeof (struct 
GNUNET_DHT_PutMessage);
-#if DEBUG_DHT
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-              "`%s:%s': Received `%s' request (inserting data!), message type 
%d, key %s, uid %llu\n",
-              my_short_id, "DHT", "PUT", put_type, GNUNET_h2s 
(&message_context->key), message_context->unique_id);
-#endif
+
 #if DEBUG_DHT_ROUTING
   if (message_context->hop_count == 0) /* Locally initiated request */
     {
@@ -2619,8 +2616,17 @@
 #endif
 
   if (message_context->closest != GNUNET_YES)
-    return;
+    {
+      route_message2 (msg, message_context);
+      return;
+    }
 
+#if DEBUG_DHT
+  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+              "`%s:%s': Received `%s' request (inserting data!), message type 
%d, key %s, uid %llu\n",
+              my_short_id, "DHT", "PUT", put_type, GNUNET_h2s 
(&message_context->key), message_context->unique_id);
+#endif
+
 #if DEBUG_DHT_ROUTING
   if ((debug_routes_extended) && (dhtlog_handle != NULL))
     {
@@ -2657,7 +2663,9 @@
     GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
                 "`%s:%s': %s request received, but have no datacache!\n",
                 my_short_id, "DHT", "PUT");
-  route_message2 (msg, message_context);
+
+  if (stop_on_closest == GNUNET_NO)
+    route_message2 (msg, message_context);
 }
 
 /**