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

[gnunet]

Author: grothoff
Date: 2011-10-20 19:43:13 +0200 (Thu, 20 Oct 2011)
New Revision: 17646

Modified:
   gnunet/src/arm/arm_api.c
   gnunet/src/arm/gnunet-arm.c
Log:
fixing bad fix

Modified: gnunet/src/arm/arm_api.c
===================================================================
--- gnunet/src/arm/arm_api.c    2011-10-20 17:39:53 UTC (rev 17645)
+++ gnunet/src/arm/arm_api.c    2011-10-20 17:43:13 UTC (rev 17646)
@@ -143,11 +143,6 @@
       shutdown_ctx->confirmed = GNUNET_YES;
       GNUNET_CLIENT_receive (shutdown_ctx->sock, &service_shutdown_handler,
                              shutdown_ctx, GNUNET_TIME_UNIT_FOREVER_REL);
-      if (shutdown_ctx->cont != NULL)
-        shutdown_ctx->cont (shutdown_ctx->cont_cls, GNUNET_NO);
-      GNUNET_SCHEDULER_cancel (shutdown_ctx->cancel_task);
-      GNUNET_CLIENT_disconnect (shutdown_ctx->sock, GNUNET_NO);
-      GNUNET_free (shutdown_ctx);
       break;
     default:
 #if DEBUG_ARM

Modified: gnunet/src/arm/gnunet-arm.c
===================================================================
--- gnunet/src/arm/gnunet-arm.c 2011-10-20 17:39:53 UTC (rev 17645)
+++ gnunet/src/arm/gnunet-arm.c 2011-10-20 17:43:13 UTC (rev 17646)
@@ -34,7 +34,7 @@
 /**
  * Timeout for stopping services.  Long to give some services a real chance.
  */
-#define STOP_TIMEOUT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 
1)
+#define STOP_TIMEOUT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 
15)
 
 /**
  * Timeout for stopping ARM.  Extra-long since ARM needs to stop everyone else.