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

[gnunet]

Author: wachs
Date: 2011-04-20 10:29:52 +0200 (Wed, 20 Apr 2011)
New Revision: 15043

Modified:
   gnunet/src/dht/gnunet-dht-driver.c
   gnunet/src/dht/test_dht_api.c
Log:
timeout


Modified: gnunet/src/dht/gnunet-dht-driver.c
===================================================================
--- gnunet/src/dht/gnunet-dht-driver.c  2011-04-20 08:26:19 UTC (rev 15042)
+++ gnunet/src/dht/gnunet-dht-driver.c  2011-04-20 08:29:52 UTC (rev 15043)
@@ -2042,7 +2042,7 @@
 {
   struct TestGetContext *test_get = cls;
 
-  if (tc->reason == GNUNET_SCHEDULER_REASON_TIMEOUT)
+  if ( (tc->reason & GNUNET_SCHEDULER_REASON_TIMEOUT) != 0)
     gets_failed++;
   else
     cumulative_successful_gets++;
@@ -2180,7 +2180,7 @@
   outstanding_puts--;
   puts_completed++;
 
-  if (tc->reason == GNUNET_SCHEDULER_REASON_TIMEOUT)
+  if ( (tc->reason & GNUNET_SCHEDULER_REASON_TIMEOUT) != 0)
     fprintf (stderr, "PUT Request failed!\n");
 
   /* Reset the daemon (which peer to insert at) for later put request 
iterations */

Modified: gnunet/src/dht/test_dht_api.c
===================================================================
--- gnunet/src/dht/test_dht_api.c       2011-04-20 08:26:19 UTC (rev 15042)
+++ gnunet/src/dht/test_dht_api.c       2011-04-20 08:29:52 UTC (rev 15043)
@@ -169,7 +169,7 @@
   struct PeerContext *peer = cls;
 
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Called test_find_peer_stop!\n");
-  if (tc->reason == GNUNET_SCHEDULER_REASON_TIMEOUT)
+  if ( (tc->reason & GNUNET_SCHEDULER_REASON_TIMEOUT) != 0)
     {
       GNUNET_break (0);
       GNUNET_SCHEDULER_cancel (die_task);
@@ -348,7 +348,7 @@
   struct PeerContext *peer = cls;
 
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Called test_get_stop!\n");
-  if (tc->reason == GNUNET_SCHEDULER_REASON_TIMEOUT)
+  if ( (tc->reason & GNUNET_SCHEDULER_REASON_TIMEOUT) != 0)
     {
       GNUNET_break (0);
       GNUNET_SCHEDULER_cancel (die_task);