gnunet-svn
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[GNUnet-SVN] r15357 - gnunet/src/datastore


From: gnunet
Subject: [GNUnet-SVN] r15357 - gnunet/src/datastore
Date: Mon, 30 May 2011 17:57:15 +0200

Author: grothoff
Date: 2011-05-30 17:57:15 +0200 (Mon, 30 May 2011)
New Revision: 15357

Modified:
   gnunet/src/datastore/datastore_api.c
Log:
do not reset in_receive unless called from receive

Modified: gnunet/src/datastore/datastore_api.c
===================================================================
--- gnunet/src/datastore/datastore_api.c        2011-05-30 15:51:45 UTC (rev 
15356)
+++ gnunet/src/datastore/datastore_api.c        2011-05-30 15:57:15 UTC (rev 
15357)
@@ -371,14 +371,17 @@
                     const struct GNUNET_SCHEDULER_TaskContext *tc)
 {
   struct GNUNET_DATASTORE_QueueEntry *qe = cls;
+  int in_receive;
 
   GNUNET_STATISTICS_update (qe->h->stats,
                            gettext_noop ("# queue entry timeouts"),
                            1,
                            GNUNET_NO);
   qe->task = GNUNET_SCHEDULER_NO_TASK;
-  GNUNET_assert (qe->was_transmitted == GNUNET_NO);
+  GNUNET_assert (qe->was_transmitted == GNUNET_NO); 
+  in_receive = qe->h->in_receive;
   qe->response_proc (qe->h, NULL);
+  qe->h->in_receive = in_receive;
 }
 
 
@@ -408,6 +411,7 @@
   struct GNUNET_DATASTORE_QueueEntry *ret;
   struct GNUNET_DATASTORE_QueueEntry *pos;
   unsigned int c;
+  int in_receive;
 
   c = 0;
   pos = h->queue_head;
@@ -462,6 +466,7 @@
   ret->task = GNUNET_SCHEDULER_add_delayed (timeout,
                                            &timeout_queue_entry,
                                            ret);
+  in_receive = h->in_receive;
   pos = ret->next;
   while (pos != NULL) 
     {
@@ -486,6 +491,7 @@
        }
       pos = pos->next;
     }
+  h->in_receive = in_receive;
   return ret;
 }
 




reply via email to

[Prev in Thread] Current Thread [Next in Thread]