[GNUnet-SVN] r11437 - gnunet/src/arm

[gnunet]

Author: grothoff
Date: 2010-05-19 21:30:06 +0200 (Wed, 19 May 2010)
New Revision: 11437

Modified:
   gnunet/src/arm/gnunet-service-manager.c
Log:
shutdown fix

Modified: gnunet/src/arm/gnunet-service-manager.c
===================================================================
--- gnunet/src/arm/gnunet-service-manager.c     2010-05-19 14:48:13 UTC (rev 
11436)
+++ gnunet/src/arm/gnunet-service-manager.c     2010-05-19 19:30:06 UTC (rev 
11437)
@@ -441,6 +441,13 @@
   struct GNUNET_TIME_Relative rem;
 
   fc->service_to_client_task = GNUNET_SCHEDULER_NO_TASK;
+  if ( (NULL != tc) &&
+       (0 != (tc->reason & GNUNET_SCHEDULER_REASON_SHUTDOWN)) &&
+       (fc->first_write_done != GNUNET_YES) )
+    {
+      closeClientAndServiceSockets (fc, REASON_ERROR);
+      return;
+    }
   if (GNUNET_YES != GNUNET_NETWORK_fdset_isset (tc->read_ready,
                                                fc->armServiceSocket))
     {
@@ -537,6 +544,13 @@
   struct GNUNET_TIME_Relative rem;
 
   fc->client_to_service_task = GNUNET_SCHEDULER_NO_TASK;
+  if ( (NULL != tc) &&
+       (0 != (tc->reason & GNUNET_SCHEDULER_REASON_SHUTDOWN)) &&
+       (fc->first_write_done != GNUNET_YES) )
+    {
+      closeClientAndServiceSockets (fc, REASON_ERROR);
+      return;
+    }
   if (GNUNET_YES != GNUNET_NETWORK_fdset_isset (tc->write_ready,
                                                fc->armServiceSocket))
     {