[GNUnet-SVN] r17375 - gnunet/src/core

[gnunet]

Author: grothoff
Date: 2011-10-11 15:14:49 +0200 (Tue, 11 Oct 2011)
New Revision: 17375

Modified:
   gnunet/src/core/gnunet-service-core_clients.c
   gnunet/src/core/gnunet-service-core_sessions.c
Log:
do not dequeue here

Modified: gnunet/src/core/gnunet-service-core_clients.c
===================================================================
--- gnunet/src/core/gnunet-service-core_clients.c       2011-10-11 13:11:26 UTC 
(rev 17374)
+++ gnunet/src/core/gnunet-service-core_clients.c       2011-10-11 13:14:49 UTC 
(rev 17375)
@@ -594,7 +594,10 @@
 GSC_CLIENTS_reject_request (struct GSC_ClientActiveRequest *car)
 {
   GNUNET_assert (GNUNET_YES ==
-                destroy_active_client_request (NULL, &car->target.hashPubKey, 
car));  
+                GNUNET_CONTAINER_multihashmap_remove 
(car->client_handle->requests,
+                                                      &car->target.hashPubKey,
+                                                      car));
+  GNUNET_free (car);
 }
 
 

Modified: gnunet/src/core/gnunet-service-core_sessions.c
===================================================================
--- gnunet/src/core/gnunet-service-core_sessions.c      2011-10-11 13:11:26 UTC 
(rev 17374)
+++ gnunet/src/core/gnunet-service-core_sessions.c      2011-10-11 13:14:49 UTC 
(rev 17375)
@@ -174,9 +174,6 @@
     GNUNET_SCHEDULER_cancel (session->cork_task);
     session->cork_task = GNUNET_SCHEDULER_NO_TASK;
   }
-  GNUNET_assert (GNUNET_YES ==
-                 GNUNET_CONTAINER_multihashmap_remove (sessions,
-                                                       
&session->peer.hashPubKey, session));
   while (NULL != (car = session->active_client_request_head))
   {
     GNUNET_CONTAINER_DLL_remove (session->active_client_request_head,
@@ -184,6 +181,9 @@
                                 car);
     GSC_CLIENTS_reject_request (car);
   }
+  GNUNET_assert (GNUNET_YES ==
+                 GNUNET_CONTAINER_multihashmap_remove (sessions,
+                                                       
&session->peer.hashPubKey, session));
   GNUNET_STATISTICS_set (GSC_stats, 
                         gettext_noop ("# established sessions"),
                         GNUNET_CONTAINER_multihashmap_size (sessions),