stuff

8 files changed, 37 insertions, 41 deletions

diff --git a/src/arm/arm_api.c b/src/arm/arm_api.c
index 26ed590a2..ee53fd87b 100644
--- a/src/arm/arm_api.c
+++ b/src/arm/arm_api.c
@@ -482,19 +482,19 @@ GNUNET_ARM_stop_service (struct GNUNET_ARM_Handle *h,
   GNUNET_log (GNUNET_ERROR_TYPE_INFO,
               _("Stopping service `%s' within %llu ms\n"), service_name,
               (unsigned long long) timeout.value);
-  if (0 == strcasecmp ("arm", service_name))
+  if (h->client == NULL)
     {
-      if (h->client == NULL)
+      client = GNUNET_CLIENT_connect (h->sched, "arm", h->cfg);
+      if (client == NULL)
         {
-          client = GNUNET_CLIENT_connect (h->sched, "arm", h->cfg);
-          if (client == NULL)
-            {
-              cb (cb_cls, GNUNET_SYSERR);
-              return;
-            }
-          GNUNET_CLIENT_ignore_shutdown (client, GNUNET_YES);
-          h->client = client;
+          cb (cb_cls, GNUNET_SYSERR);
+          return;
         }
+      GNUNET_CLIENT_ignore_shutdown (client, GNUNET_YES);
+      h->client = client;
+    }
+  if (0 == strcasecmp ("arm", service_name))
+    {
       arm_shutdown_ctx = GNUNET_malloc(sizeof(struct ARM_ShutdownContext));
       arm_shutdown_ctx->cb = cb;
       arm_shutdown_ctx->cb_cls = cb_cls;
diff --git a/src/arm/gnunet-service-manager.c b/src/arm/gnunet-service-manager.c
index 8eb3847c4..a55991050 100644
--- a/src/arm/gnunet-service-manager.c
+++ b/src/arm/gnunet-service-manager.c
@@ -571,8 +571,6 @@ void stop_listening (const char *serviceName)
            (strcmp (pos->serviceName, serviceName) != 0) )
         continue;
       GNUNET_SCHEDULER_cancel (scheduler, pos->acceptTask);
-      fprintf (stderr, "Closing listening socket %p\n", 
-               pos->listeningSocket);
       GNUNET_NETWORK_socket_close (pos->listeningSocket);
       GNUNET_CONTAINER_DLL_remove (serviceListeningInfoList_head,
                                    serviceListeningInfoList_tail, 
@@ -623,8 +621,6 @@ acceptConnection (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
                                        serviceListeningInfo);
       return;
     }
-  fprintf (stderr, "Closing listening socket %p\n", 
-           serviceListeningInfo->listeningSocket);
   GNUNET_NETWORK_socket_close (serviceListeningInfo->listeningSocket);
   GNUNET_CONTAINER_DLL_remove (serviceListeningInfoList_head,
                                serviceListeningInfoList_tail, 
@@ -660,13 +656,9 @@ createListeningSocket (struct sockaddr *sa,
     {
     case AF_INET:
       sock = GNUNET_NETWORK_socket_create (PF_INET, SOCK_STREAM, 0);
-      fprintf (stderr, "IPv4 listening at %p\n", 
-               sock);
       break;
     case AF_INET6:
       sock = GNUNET_NETWORK_socket_create (PF_INET6, SOCK_STREAM, 0);
-      fprintf (stderr, "IPv6 listening at %p\n", 
-               sock);
       break;
     default:
       sock = NULL;
diff --git a/src/arm/mockup-service.c b/src/arm/mockup-service.c
index 2de957ba9..fbc6b04ba 100644
--- a/src/arm/mockup-service.c
+++ b/src/arm/mockup-service.c
@@ -41,13 +41,12 @@ run (void *cls,
 
 int main(int argc, char *const *argv)
 {
-        int ret;
-
-        ret = (GNUNET_OK ==
-          GNUNET_SERVICE_run (argc,
+  int ret;
+  
+  ret = (GNUNET_OK ==
+         GNUNET_SERVICE_run (argc,
                              argv,
                              "do-nothing", GNUNET_SERVICE_OPTION_NONE,
-                             &run, NULL)) ? 0 : 1;
-        
-        return ret;
+                             &run, NULL)) ? 0 : 1;  
+  return ret;
 }
diff --git a/src/arm/test_arm_api_data.conf b/src/arm/test_arm_api_data.conf
index adfab9b8f..17a8ac613 100644
--- a/src/arm/test_arm_api_data.conf
+++ b/src/arm/test_arm_api_data.conf
@@ -6,7 +6,7 @@ DEFAULTCONFIG = test_arm_api_data.conf
 PORT = 23354
 DEFAULTSERVICES =
 BINARY = gnunet-service-arm
-OPTIONS = -L DEBUG
+OPTIONS = -L ERROR
 #DEBUG = YES
 
 [resolver]
diff --git a/src/arm/test_exponential_backoff.c b/src/arm/test_exponential_backoff.c
index 357a5e71a..8657563fc 100644
--- a/src/arm/test_exponential_backoff.c
+++ b/src/arm/test_exponential_backoff.c
@@ -147,17 +147,20 @@ kill_task (void *cbData,
 {
   static struct GNUNET_CLIENT_Connection * doNothingConnection = NULL;
 
-  if (NULL != cbData) {
-    waitedFor = GNUNET_TIME_absolute_get_duration (startedWaitingAt);
-
+  if (NULL != cbData) 
+    {
+      waitedFor = GNUNET_TIME_absolute_get_duration (startedWaitingAt);
+      
 #if LOG_BACKOFF
-    fprintf(killLogFilePtr, 
-            "Waited for: %llu ms\n", 
-            (unsigned long long) waitedFor.value);
+      fprintf(killLogFilePtr, 
+              "Waited for: %llu ms\n", 
+              (unsigned long long) waitedFor.value);
 #endif
-  }
+    }
   else
-    waitedFor.value = 0;
+    {
+      waitedFor.value = 0;
+    }
   /* Connect to the doNothing task */
   doNothingConnection = GNUNET_CLIENT_connect (sched, "do-nothing", cfg);
 #if LOG_BACKOFF
@@ -175,8 +178,10 @@ kill_task (void *cbData,
   }
   
   /* Use the created connection to kill the doNothingTask */
-  GNUNET_CLIENT_service_shutdown(sched, doNothingConnection, TIMEOUT, &shutdown_cont, NULL);
-
+  GNUNET_CLIENT_service_shutdown(sched,
+                                 doNothingConnection, 
+                                 TIMEOUT, 
+                                 &shutdown_cont, NULL);
 }
 
        
diff --git a/src/arm/test_gnunet_service_manager.c b/src/arm/test_gnunet_service_manager.c
index 9878dca17..454fa0e98 100644
--- a/src/arm/test_gnunet_service_manager.c
+++ b/src/arm/test_gnunet_service_manager.c
@@ -38,7 +38,7 @@
 
 #define START_ARM GNUNET_YES
 
-#define VERBOSE GNUNET_YES
+#define VERBOSE GNUNET_NO
 
 static int ret = 1;
 
diff --git a/src/util/client.c b/src/util/client.c
index 588957d85..55eb68d13 100644
--- a/src/util/client.c
+++ b/src/util/client.c
@@ -602,8 +602,8 @@ service_shutdown_handler (void *cls, const struct GNUNET_MessageHeader *msg)
   if ((msg == NULL) && (shutdown_ctx->confirmed != GNUNET_YES))   
     {
       /* Means the other side closed the connection and never confirmed a shutdown */
-      GNUNET_log(GNUNET_ERROR_TYPE_WARNING, 
-                 "Service handle shutdown before ACK!\n");
+      GNUNET_log (GNUNET_ERROR_TYPE_WARNING, 
+                  "Service handle shutdown before ACK!\n");
       if (shutdown_ctx->cont != NULL)
         shutdown_ctx->cont(shutdown_ctx->cont_cls, GNUNET_SYSERR);      
       GNUNET_SCHEDULER_cancel(shutdown_ctx->sched, shutdown_ctx->cancel_task);
@@ -612,7 +612,8 @@ service_shutdown_handler (void *cls, const struct GNUNET_MessageHeader *msg)
     }
   else if ((msg == NULL) && (shutdown_ctx->confirmed == GNUNET_YES))
     {
-      GNUNET_log(GNUNET_ERROR_TYPE_WARNING, "Service shutdown complete.\n");
+      GNUNET_log(GNUNET_ERROR_TYPE_WARNING, 
+                 "Service shutdown complete.\n");
       if (shutdown_ctx->cont != NULL)
         shutdown_ctx->cont(shutdown_ctx->cont_cls, GNUNET_NO);
 
diff --git a/src/util/service.c b/src/util/service.c
index 2c2e7d8df..2214efe10 100644
--- a/src/util/service.c
+++ b/src/util/service.c
@@ -628,7 +628,6 @@ handle_shutdown (void *cls,
 {
   struct GNUNET_SERVICE_Context *service = cls;
 
-  /* FIXME: why is this call necessary???? */
   GNUNET_SERVER_client_keep(client);
   if (!service->allow_shutdown)
     {