-minor fixes to arm service list API (#2141)

4 files changed, 123 insertions, 112 deletions

diff --git a/doc/man/gnunet-arm.1 b/doc/man/gnunet-arm.1
index 1bd44677d..86a748e2f 100644
--- a/doc/man/gnunet-arm.1
+++ b/doc/man/gnunet-arm.1
@@ -34,6 +34,9 @@ Stop the specified SERVICE if it is running.  While this will kill the service r
 .IP "\-s, \-\-start"
 Start all GNUnet default services on this system (and also ARM).  Naturally, if a service is demanded by a default service, it will then also be started.  Running "gnunet-arm -s" is the usual way to start a GNUnet peer.
 .B
+.IP "\-I, \-\-info"
+List all running services.
+.B
 .IP "\-v, \-\-version"
 Print GNUnet version number.
 
diff --git a/src/arm/arm_api.c b/src/arm/arm_api.c
index d0babf0ae..16de88929 100644
--- a/src/arm/arm_api.c
+++ b/src/arm/arm_api.c
@@ -486,94 +486,6 @@ handle_response (void *cls, const struct GNUNET_MessageHeader *msg)
   GNUNET_free (sc);
 }
 
-/**
- * Internal state for a list request with ARM.
- */
-struct ListRequestContext
-{
-
-  /**
-   * Pointer to our handle with ARM.
-   */
-  struct GNUNET_ARM_Handle *h;
-
-  /**
-   * Function to call with a status code for the requested operation.
-   */
-  GNUNET_ARM_List_Callback callback;
-
-  /**
-   * Closure for "callback".
-   */
-  void *cls;
-
-  /**
-   * Timeout for the operation.
-   */
-  struct GNUNET_TIME_Absolute timeout;
-};
-
-/**
- * Process a response from ARM for the list request.
- *
- * @param cls the list request context
- * @param msg the response
- */
-static void
-handle_list_response (void *cls, const struct GNUNET_MessageHeader *msg)
-{
-  struct ListRequestContext *sc = cls;
-  const struct GNUNET_ARM_ListResultMessage *res;
-  int success;
-  
-   if (msg == NULL)
-   {
-      LOG (GNUNET_ERROR_TYPE_WARNING,
-           "Error receiving response to LIST request from ARM\n");
-      GNUNET_CLIENT_disconnect (sc->h->client, GNUNET_NO);
-      sc->h->client = GNUNET_CLIENT_connect ("arm", sc->h->cfg);
-      GNUNET_assert (NULL != sc->h->client);
-      if (sc->callback != NULL)
-        sc->callback (sc->cls, GNUNET_ARM_PROCESS_COMMUNICATION_ERROR, 0, NULL);
-      GNUNET_free (sc);
-      return;
-   }
-   
-   if (sc->callback != NULL) 
-   {
-     char **list;
-     const char *pos;
-     uint16_t size_check;
-     
-     size_check = 0;
-     res = (const struct GNUNET_ARM_ListResultMessage *) msg;
-     success = (ntohs (res->header.type) 
-                == GNUNET_MESSAGE_TYPE_ARM_LIST_RESULT ? 
-                GNUNET_YES : GNUNET_NO);
-     list = GNUNET_malloc (ntohs (res->count) * sizeof (char *));
-     pos = (const char *)&res[1];
-     
-     int i;
-     for (i=0; i<ntohs (res->count); i++)
-     {
-       list[i] = GNUNET_malloc (strlen (pos) + 1);
-       memcpy (list[i], pos, strlen (pos) + 1);
-       pos += strlen (pos) + 1;
-       size_check += strlen (pos) +1;
-       
-       if (size_check > ntohs (res->header.size))
-       {
-          GNUNET_free (list);
-          GNUNET_free (sc);
-          sc->callback (sc->cls, GNUNET_NO, 0, NULL);
-          return;
-       }
-     }
-     
-     sc->callback (sc->cls, success, ntohs (res->count), (const char**)list);
-   }
-   GNUNET_free (sc);
-}
 
 /**
  * Start or stop a service.
@@ -764,6 +676,107 @@ GNUNET_ARM_stop_service (struct GNUNET_ARM_Handle *h,
                   GNUNET_MESSAGE_TYPE_ARM_STOP);
 }
 
+
+/**
+ * Internal state for a list request with ARM.
+ */
+struct ListRequestContext
+{
+
+  /**
+   * Pointer to our handle with ARM.
+   */
+  struct GNUNET_ARM_Handle *h;
+
+  /**
+   * Function to call with a status code for the requested operation.
+   */
+  GNUNET_ARM_List_Callback callback;
+
+  /**
+   * Closure for "callback".
+   */
+  void *cls;
+
+  /**
+   * Timeout for the operation.
+   */
+  struct GNUNET_TIME_Absolute timeout;
+};
+
+
+/**
+ * Process a response from ARM for the list request.
+ *
+ * @param cls the list request context
+ * @param msg the response
+ */
+static void
+handle_list_response (void *cls, const struct GNUNET_MessageHeader *msg)
+{
+  struct ListRequestContext *sc = cls;
+  const struct GNUNET_ARM_ListResultMessage *res;
+  const char *pos;
+  uint16_t size_check;
+  uint16_t rcount;
+  uint16_t msize;
+  
+  if (NULL == msg)
+  {
+    LOG (GNUNET_ERROR_TYPE_WARNING,
+         "Error receiving response to LIST request from ARM\n");
+    GNUNET_CLIENT_disconnect (sc->h->client, GNUNET_NO);
+    sc->h->client = GNUNET_CLIENT_connect ("arm", sc->h->cfg);
+    GNUNET_assert (NULL != sc->h->client);
+    if (sc->callback != NULL)
+      sc->callback (sc->cls, GNUNET_ARM_PROCESS_COMMUNICATION_ERROR, 0, NULL);
+    GNUNET_free (sc);
+    return;
+  }
+   
+  if (NULL == sc->callback) 
+  {
+    GNUNET_break (0);
+    GNUNET_free (sc);
+    return;
+  }  
+  msize = ntohs (msg->size);
+  if ( (msize < sizeof ( struct GNUNET_ARM_ListResultMessage)) ||
+       (ntohs (msg->type) != GNUNET_MESSAGE_TYPE_ARM_LIST_RESULT) )
+  {
+    GNUNET_break (0);
+    sc->callback (sc->cls, GNUNET_NO, 0, NULL);
+    GNUNET_free (sc);
+    return;
+  }
+  size_check = 0;
+  res = (const struct GNUNET_ARM_ListResultMessage *) msg;
+  rcount = ntohs (res->count);
+  {
+    const char *list[rcount];
+    unsigned int i;
+    
+    pos = (const char *)&res[1];   
+    for (i=0; i<rcount; i++)
+    {
+      const char *end = memchr (pos, 0, msize - size_check);
+      if (NULL == end)
+      {
+        GNUNET_break (0);
+        GNUNET_free (sc);
+        sc->callback (sc->cls, GNUNET_NO, 0, NULL);
+        return;
+      }
+      list[i] = pos;
+      size_check += (end - pos) + 1;
+      pos = end + 1;
+    }
+    sc->callback (sc->cls, GNUNET_YES, rcount, list);
+  }
+  GNUNET_free (sc);
+}
+
+
 /**
  * List all running services.
  * 
@@ -778,7 +791,7 @@ GNUNET_ARM_list_running_services (struct GNUNET_ARM_Handle *h,
                                   GNUNET_ARM_List_Callback cb, void *cb_cls)
 {
   struct ListRequestContext *sctx;
-  struct GNUNET_MessageHeader *msg;
+  struct GNUNET_MessageHeader msg;
   struct GNUNET_CLIENT_Connection *client;
   
     if (h->client == NULL)
@@ -801,17 +814,16 @@ GNUNET_ARM_list_running_services (struct GNUNET_ARM_Handle *h,
   sctx->callback = cb;
   sctx->cls = cb_cls;
   sctx->timeout = GNUNET_TIME_relative_to_absolute (timeout);
-  msg = GNUNET_malloc (sizeof (struct GNUNET_MessageHeader));
-  msg->size = htons (sizeof (struct GNUNET_MessageHeader));
-  msg->type = htons (GNUNET_MESSAGE_TYPE_ARM_LIST);
+  msg.size = htons (sizeof (struct GNUNET_MessageHeader));
+  msg.type = htons (GNUNET_MESSAGE_TYPE_ARM_LIST);
   
-  LOG(GNUNET_ERROR_TYPE_DEBUG, 
-      "Requesting LIST from ARM service with timeout: %llu ms\n", 
-      (unsigned long long)timeout.rel_value);
+  LOG (GNUNET_ERROR_TYPE_DEBUG, 
+       "Requesting LIST from ARM service with timeout: %llu ms\n", 
+       (unsigned long long)timeout.rel_value);
   
     if (GNUNET_OK !=
       GNUNET_CLIENT_transmit_and_get_response (sctx->h->client, 
-                                               msg,
+                                               &msg,
                                                GNUNET_TIME_absolute_get_remaining
                                                (sctx->timeout), 
                                                GNUNET_YES,
@@ -823,10 +835,8 @@ GNUNET_ARM_list_running_services (struct GNUNET_ARM_Handle *h,
       if (cb != NULL)
         cb (cb_cls, GNUNET_SYSERR, 0, NULL);
       GNUNET_free (sctx);
-      GNUNET_free (msg);
       return;
     }
-  GNUNET_free (msg);
 }
 
 /* end of arm_api.c */
diff --git a/src/arm/gnunet-arm.c b/src/arm/gnunet-arm.c
index b3ab2dc0e..f236a65de 100644
--- a/src/arm/gnunet-arm.c
+++ b/src/arm/gnunet-arm.c
@@ -213,20 +213,18 @@ confirm_cb (void *cls,
  * @param list copy of the list of running services
  */
 static void
-list_cb (void *cls, int result, uint16_t count, const char **list)
+list_cb (void *cls, int result, unsigned int count, const char *const*list)
 {
-  if (result == GNUNET_YES && list != NULL)
+  unsigned int i;
+
+  if ( (result != GNUNET_YES) || (NULL == list) )
   {
-    FPRINTF (stdout, "%s", _("Running services:\n-----------------\n"));
-    int i;
-    for (i=0; i<count; i++)
-    {
-      FPRINTF (stdout, "%s\n", list[i]);
-    }
-    GNUNET_free (list);
-  } else {
     FPRINTF (stderr, "%s", _("Error communicating with ARM. ARM not running?\n"));
+    return;
   }
+  FPRINTF (stdout, "%s", _("Running services:\n"));
+  for (i=0; i<count; i++)
+    FPRINTF (stdout, "%s\n", list[i]);
 }
 
 /**
@@ -353,7 +351,7 @@ cps_loop (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
               start = 1;
               restart = 0;
               h = GNUNET_ARM_connect (cfg, NULL);
-              if (h == NULL)
+              if (NULL == h)
                 {
                   GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
                               _("Fatal error initializing ARM API.\n"));
@@ -368,7 +366,7 @@ cps_loop (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
               GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
               "Going to list all running services controlled by ARM.\n");
   
-              if (h == NULL) 
+              if (NULL == h) 
               {
                GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
                               _("Fatal error initializing ARM API.\n"));
diff --git a/src/include/gnunet_arm_service.h b/src/include/gnunet_arm_service.h
index 42d42a0cd..116bfc5b4 100644
--- a/src/include/gnunet_arm_service.h
+++ b/src/include/gnunet_arm_service.h
@@ -121,8 +121,8 @@ typedef void (*GNUNET_ARM_Callback) (void *cls,
  */
 typedef void (*GNUNET_ARM_List_Callback) (void *cls, 
                                           int result,
-                                          uint16_t count,
-                                          const char **list);
+                                          unsigned int count,
+                                          const char *const *list);
 
 
 /**