[GNUnet-SVN] r15045 - in gnunet/src: dht vpn

[gnunet]

Author: wachs
Date: 2011-04-20 10:33:44 +0200 (Wed, 20 Apr 2011)
New Revision: 15045

Modified:
   gnunet/src/dht/test_dht_multipeer.c
   gnunet/src/vpn/gnunet-daemon-exit.c
Log:
scheduler


Modified: gnunet/src/dht/test_dht_multipeer.c
===================================================================
--- gnunet/src/dht/test_dht_multipeer.c 2011-04-20 08:31:54 UTC (rev 15044)
+++ gnunet/src/dht/test_dht_multipeer.c 2011-04-20 08:33:44 UTC (rev 15045)
@@ -364,7 +364,7 @@
   memset(original_data, test_get->uid, sizeof(original_data));
   GNUNET_CRYPTO_hash(original_data, TEST_DATA_SIZE, &search_key);
 
-  if (tc->reason == GNUNET_SCHEDULER_REASON_TIMEOUT)
+  if ( (tc->reason & GNUNET_SCHEDULER_REASON_TIMEOUT) != 0)
     {
       gets_failed++;
       GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Get from peer %s for key %s 
failed!\n", test_get->daemon->shortname, GNUNET_h2s(&search_key));

Modified: gnunet/src/vpn/gnunet-daemon-exit.c
===================================================================
--- gnunet/src/vpn/gnunet-daemon-exit.c 2011-04-20 08:31:54 UTC (rev 15044)
+++ gnunet/src/vpn/gnunet-daemon-exit.c 2011-04-20 08:33:44 UTC (rev 15045)
@@ -176,7 +176,7 @@
 
 static void
 collect_connections(void* cls, const struct GNUNET_SCHEDULER_TaskContext* t) {
-    if (GNUNET_SCHEDULER_REASON_SHUTDOWN == t->reason)
+         if ( (tc->reason & GNUNET_SCHEDULER_REASON_SHUTDOWN) != 0)
       return;