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

[gnunet]

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

Modified:
   gnunet/src/dht/gnunet-service-dht.c
Log:
SHUTDOWN


Modified: gnunet/src/dht/gnunet-service-dht.c
===================================================================
--- gnunet/src/dht/gnunet-service-dht.c 2011-04-20 08:21:48 UTC (rev 15040)
+++ gnunet/src/dht/gnunet-service-dht.c 2011-04-20 08:22:44 UTC (rev 15041)
@@ -1056,7 +1056,7 @@
 
   peer->send_task = GNUNET_SCHEDULER_NO_TASK;
 
-  if (tc->reason == GNUNET_SCHEDULER_REASON_SHUTDOWN)
+  if ( (tc->reason & GNUNET_SCHEDULER_REASON_SHUTDOWN) != 0)
     return;
 
   if (peer->th != NULL)
@@ -1491,7 +1491,7 @@
   struct PeerInfo *peer = cls;
   uint64_t preference;
   unsigned int matching;
-  if (tc->reason == GNUNET_SCHEDULER_REASON_SHUTDOWN)
+  if ( (tc->reason & GNUNET_SCHEDULER_REASON_SHUTDOWN) != 0)
     {
       return;
     }
@@ -1843,7 +1843,7 @@
   struct GNUNET_MessageHeader ping_message;
   struct DHT_MessageContext msg_ctx;
 
-  if (tc->reason == GNUNET_SCHEDULER_REASON_SHUTDOWN)
+  if ( (tc->reason & GNUNET_SCHEDULER_REASON_SHUTDOWN) != 0)
     return;
 
   ping_message.size = htons (sizeof (struct GNUNET_MessageHeader));
@@ -3741,7 +3741,7 @@
   GNUNET_free (req);
 
   /*
-     if ((tc->reason == GNUNET_SCHEDULER_REASON_SHUTDOWN) && (0 == 
GNUNET_CONTAINER_multihashmap_size(recent.hashmap)) && (0 == 
GNUNET_CONTAINER_heap_get_size(recent.minHeap)))
+       if ( (tc->reason & GNUNET_SCHEDULER_REASON_SHUTDOWN) != 0) && (0 == 
GNUNET_CONTAINER_multihashmap_size(recent.hashmap)) && (0 == 
GNUNET_CONTAINER_heap_get_size(recent.minHeap)))
      {
      GNUNET_CONTAINER_multihashmap_destroy(recent.hashmap);
      GNUNET_CONTAINER_heap_destroy(recent.minHeap);
@@ -4199,7 +4199,7 @@
 
   unsigned int results;
 
-  if (tc->reason == GNUNET_SCHEDULER_REASON_SHUTDOWN)
+  if ( (tc->reason & GNUNET_SCHEDULER_REASON_SHUTDOWN) != 0)
     {
       GNUNET_free (put_context);
       return;
@@ -4358,7 +4358,7 @@
   static GNUNET_HashCode key;
   uint32_t random_key;
 
-  if (tc->reason == GNUNET_SCHEDULER_REASON_SHUTDOWN)
+  if ( (tc->reason & GNUNET_SCHEDULER_REASON_SHUTDOWN) != 0)
     return;
   put_message.header.size = htons (sizeof (struct GNUNET_DHT_PutMessage));
   put_message.header.type = htons (GNUNET_MESSAGE_TYPE_DHT_PUT);
@@ -4409,7 +4409,7 @@
   static GNUNET_HashCode key;
   uint32_t random_key;
 
-  if (tc->reason == GNUNET_SCHEDULER_REASON_SHUTDOWN)
+  if ( (tc->reason & GNUNET_SCHEDULER_REASON_SHUTDOWN) != 0)
     return;
 
   get_message.header.size = htons (sizeof (struct GNUNET_DHT_GetMessage));
@@ -4486,7 +4486,7 @@
   double multiplier;
   double count_per_interval;
 #endif
-  if (tc->reason == GNUNET_SCHEDULER_REASON_SHUTDOWN)
+  if ( (tc->reason & GNUNET_SCHEDULER_REASON_SHUTDOWN) != 0)
     return;
 
   if ((newly_found_peers > bucket_size) && (GNUNET_YES == do_find_peer))       
 /* If we are finding peers already, no need to send out our request right now! 
*/