[GNUnet-SVN] r10464 - gnunet/src/fs

[gnunet]

Author: grothoff
Date: 2010-03-01 18:41:07 +0100 (Mon, 01 Mar 2010)
New Revision: 10464

Modified:
   gnunet/src/fs/gnunet-service-fs.c
Log:
debugging

Modified: gnunet/src/fs/gnunet-service-fs.c
===================================================================
--- gnunet/src/fs/gnunet-service-fs.c   2010-03-01 17:29:45 UTC (rev 10463)
+++ gnunet/src/fs/gnunet-service-fs.c   2010-03-01 17:41:07 UTC (rev 10464)
@@ -1696,7 +1696,8 @@
 
 #if DEBUG_FS
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-             "Matched result for query `%s' with pending request\n",
+             "Matched result (type %u) for query `%s' with pending request\n",
+             (unsigned int) prq->type,
              GNUNET_h2s (key));
 #endif  
   do_remove = GNUNET_NO;
@@ -1818,10 +1819,18 @@
       add_to_pending_messages_for_peer (cp, reply, pr);
     }
   if (GNUNET_YES == do_remove)
-    GNUNET_break (GNUNET_YES ==
-                 GNUNET_CONTAINER_multihashmap_remove (query_request_map,
-                                                       key,
-                                                       pr));
+    {
+      GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+                 "Removing request `%s' from request map (has been 
satisfied)\n",
+                 GNUNET_h2s (key));
+      GNUNET_break (GNUNET_YES ==
+                   GNUNET_CONTAINER_multihashmap_remove (query_request_map,
+                                                         key,
+                                                         pr));
+      // FIXME: request somehow does not fully
+      // disappear; how to fix? 
+      // destroy_pending_request (pr); (not like this!)
+    }
 
   // FIXME: implement hot-path routing statistics keeping!
   return GNUNET_YES;