From: Matthias Wachs <wachs@net.in.tum.de>
Date: Wed, 20 Apr 2011 08:33:44 +0000 (+0000)
Subject: scheduler
X-Git-Tag: initial-import-from-subversion-38251~18638
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=dd7f08beaa21ec75960e502a7c8971b4287b0171;p=oweals%2Fgnunet.git

scheduler
---

diff --git a/src/dht/test_dht_multipeer.c b/src/dht/test_dht_multipeer.c
index 593e96527..d05901a2a 100644
--- a/src/dht/test_dht_multipeer.c
+++ b/src/dht/test_dht_multipeer.c
@@ -364,7 +364,7 @@ get_stop_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext * tc)
   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));
diff --git a/src/vpn/gnunet-daemon-exit.c b/src/vpn/gnunet-daemon-exit.c
index be9d0d053..368a891ae 100644
--- a/src/vpn/gnunet-daemon-exit.c
+++ b/src/vpn/gnunet-daemon-exit.c
@@ -176,7 +176,7 @@ cleanup(void* cls, const struct GNUNET_SCHEDULER_TaskContext* tskctx) {
 
 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;