[GNUnet-SVN] r31723 - in gnunet: po src/arm

[gnunet]

Author: grothoff
Date: 2013-12-23 23:34:19 +0100 (Mon, 23 Dec 2013)
New Revision: 31723

Modified:
   gnunet/po/de.po
   gnunet/po/es.po
   gnunet/po/sv.po
   gnunet/po/vi.po
   gnunet/po/zh_CN.po
   gnunet/src/arm/arm_api.c
   gnunet/src/arm/gnunet-service-arm.c
Log:
-fix issues with multi-user setup and ARM

Modified: gnunet/po/de.po
===================================================================
--- gnunet/po/de.po     2013-12-23 21:54:31 UTC (rev 31722)
+++ gnunet/po/de.po     2013-12-23 22:34:19 UTC (rev 31723)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: GNUnet 0.7.0b\n"
 "Report-Msgid-Bugs-To: address@hidden"
-"POT-Creation-Date: 2013-12-23 22:41+0100\n"
+"POT-Creation-Date: 2013-12-23 22:54+0100\n"
 "PO-Revision-Date: 2006-03-17 21:37+0100\n"
 "Last-Translator: Nils Durner <address@hidden>\n"
 "Language-Team: German <address@hidden>\n"
@@ -4082,6 +4082,10 @@
 msgid "Failed to connect to identity service\n"
 msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden.\n"
 
+#: src/gns/gnunet-gns-import.c:476
+msgid "This program will import some GNS authorities into your GNS namestore."
+msgstr ""
+
 #: src/gns/gnunet-gns-proxy.c:105 src/hostlist/hostlist-client.c:469
 #: src/hostlist/hostlist-client.c:683 src/hostlist/hostlist-client.c:689
 #: src/hostlist/hostlist-client.c:741 src/hostlist/hostlist-client.c:750

Modified: gnunet/po/es.po
===================================================================
--- gnunet/po/es.po     2013-12-23 21:54:31 UTC (rev 31722)
+++ gnunet/po/es.po     2013-12-23 22:34:19 UTC (rev 31723)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: gnunet 0.9.5a\n"
 "Report-Msgid-Bugs-To: address@hidden"
-"POT-Creation-Date: 2013-12-23 22:41+0100\n"
+"POT-Creation-Date: 2013-12-23 22:54+0100\n"
 "PO-Revision-Date: 2013-02-23 17:50+0100\n"
 "Last-Translator: Miguel Ángel Arruga Vivas <address@hidden>\n"
 "Language-Team: Spanish <address@hidden>\n"
@@ -4087,6 +4087,10 @@
 msgid "Failed to connect to identity service\n"
 msgstr "Fallo al conectar a gnunetd.\n"
 
+#: src/gns/gnunet-gns-import.c:476
+msgid "This program will import some GNS authorities into your GNS namestore."
+msgstr ""
+
 #: src/gns/gnunet-gns-proxy.c:105 src/hostlist/hostlist-client.c:469
 #: src/hostlist/hostlist-client.c:683 src/hostlist/hostlist-client.c:689
 #: src/hostlist/hostlist-client.c:741 src/hostlist/hostlist-client.c:750

Modified: gnunet/po/sv.po
===================================================================
--- gnunet/po/sv.po     2013-12-23 21:54:31 UTC (rev 31722)
+++ gnunet/po/sv.po     2013-12-23 22:34:19 UTC (rev 31723)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: GNUnet 0.7.0b\n"
 "Report-Msgid-Bugs-To: address@hidden"
-"POT-Creation-Date: 2013-12-23 22:41+0100\n"
+"POT-Creation-Date: 2013-12-23 22:54+0100\n"
 "PO-Revision-Date: 2006-01-21 17:16+0100\n"
 "Last-Translator: Daniel Nylander <address@hidden>\n"
 "Language-Team: Swedish <address@hidden>\n"
@@ -4031,6 +4031,10 @@
 msgid "Failed to connect to identity service\n"
 msgstr "Misslyckades att ansluta till gnunetd.\n"
 
+#: src/gns/gnunet-gns-import.c:476
+msgid "This program will import some GNS authorities into your GNS namestore."
+msgstr ""
+
 #: src/gns/gnunet-gns-proxy.c:105 src/hostlist/hostlist-client.c:469
 #: src/hostlist/hostlist-client.c:683 src/hostlist/hostlist-client.c:689
 #: src/hostlist/hostlist-client.c:741 src/hostlist/hostlist-client.c:750

Modified: gnunet/po/vi.po
===================================================================
--- gnunet/po/vi.po     2013-12-23 21:54:31 UTC (rev 31722)
+++ gnunet/po/vi.po     2013-12-23 22:34:19 UTC (rev 31723)
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: gnunet 0.8.0a\n"
 "Report-Msgid-Bugs-To: address@hidden"
-"POT-Creation-Date: 2013-12-23 22:41+0100\n"
+"POT-Creation-Date: 2013-12-23 22:54+0100\n"
 "PO-Revision-Date: 2008-09-10 22:05+0930\n"
 "Last-Translator: Clytie Siddall <address@hidden>\n"
 "Language-Team: Vietnamese <address@hidden>\n"
@@ -4082,6 +4082,10 @@
 msgid "Failed to connect to identity service\n"
 msgstr "Lỗi kết nối đến gnunetd.\n"
 
+#: src/gns/gnunet-gns-import.c:476
+msgid "This program will import some GNS authorities into your GNS namestore."
+msgstr ""
+
 #: src/gns/gnunet-gns-proxy.c:105 src/hostlist/hostlist-client.c:469
 #: src/hostlist/hostlist-client.c:683 src/hostlist/hostlist-client.c:689
 #: src/hostlist/hostlist-client.c:741 src/hostlist/hostlist-client.c:750

Modified: gnunet/po/zh_CN.po
===================================================================
--- gnunet/po/zh_CN.po  2013-12-23 21:54:31 UTC (rev 31722)
+++ gnunet/po/zh_CN.po  2013-12-23 22:34:19 UTC (rev 31723)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: gnunet-0.8.1\n"
 "Report-Msgid-Bugs-To: address@hidden"
-"POT-Creation-Date: 2013-12-23 22:41+0100\n"
+"POT-Creation-Date: 2013-12-23 22:54+0100\n"
 "PO-Revision-Date: 2011-07-09 12:12+0800\n"
 "Last-Translator: Wylmer Wang <address@hidden>\n"
 "Language-Team: Chinese (simplified) <address@hidden>\n"
@@ -3879,6 +3879,10 @@
 msgid "Failed to connect to identity service\n"
 msgstr "初始化“%s”服务失败。\n"
 
+#: src/gns/gnunet-gns-import.c:476
+msgid "This program will import some GNS authorities into your GNS namestore."
+msgstr ""
+
 #: src/gns/gnunet-gns-proxy.c:105 src/hostlist/hostlist-client.c:469
 #: src/hostlist/hostlist-client.c:683 src/hostlist/hostlist-client.c:689
 #: src/hostlist/hostlist-client.c:741 src/hostlist/hostlist-client.c:750

Modified: gnunet/src/arm/arm_api.c
===================================================================
--- gnunet/src/arm/arm_api.c    2013-12-23 21:54:31 UTC (rev 31722)
+++ gnunet/src/arm/arm_api.c    2013-12-23 22:34:19 UTC (rev 31723)
@@ -308,11 +308,12 @@
 /**
  * Handler for ARM replies.
  *
- * @param cls our "struct GNUNET_ARM_Handle"
+ * @param cls our `struct GNUNET_ARM_Handle`
  * @param msg the message received from the arm service
  */
 static void
-client_notify_handler (void *cls, const struct GNUNET_MessageHeader *msg)
+client_notify_handler (void *cls,
+                       const struct GNUNET_MessageHeader *msg)
 {
   struct GNUNET_ARM_Handle *h = cls;
   const struct GNUNET_ARM_Message *arm_msg;
@@ -353,7 +354,9 @@
   cm = find_cm_by_id (h, id);
   if (NULL == cm)
   {
-    LOG (GNUNET_ERROR_TYPE_DEBUG, "Message with unknown id %llu\n", id);
+    LOG (GNUNET_ERROR_TYPE_DEBUG,
+         "Message with unknown id %llu\n",
+         id);
     return;
   }
   fail = GNUNET_NO;
@@ -460,7 +463,7 @@
     if (NULL != cm->list_cont)
         cm->list_cont (cm->cont_cls, GNUNET_ARM_REQUEST_SENT_OK, rcount,
                        list);
-    GNUNET_free (list);
+    GNUNET_free_non_null (list);
     break;
   }
   GNUNET_free (cm->msg);

Modified: gnunet/src/arm/gnunet-service-arm.c
===================================================================
--- gnunet/src/arm/gnunet-service-arm.c 2013-12-23 21:54:31 UTC (rev 31722)
+++ gnunet/src/arm/gnunet-service-arm.c 2013-12-23 22:34:19 UTC (rev 31723)
@@ -260,7 +260,7 @@
   struct GNUNET_ARM_ResultMessage *msg = cls;
   size_t msize;
 
-  if (buf == NULL)
+  if (NULL == buf)
   {
     GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
                _("Could not send status result to client\n"));
@@ -296,7 +296,7 @@
   struct GNUNET_ARM_ListResultMessage *msg = cls;
   size_t rslt_size;
 
-  if (buf == NULL)
+  if (NULL == buf)
   {
     GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
                 _("Could not send list result to client\n"));
@@ -525,14 +525,19 @@
   GNUNET_free (quotedbinary);
   if (sl->proc == NULL)
   {
-    GNUNET_log (GNUNET_ERROR_TYPE_ERROR, _("Failed to start service `%s'\n"),
+    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+                _("Failed to start service `%s'\n"),
                sl->name);
     if (client)
-      signal_result (client, sl->name, request_id, 
GNUNET_ARM_RESULT_START_FAILED);
+      signal_result (client,
+                     sl->name,
+                     request_id,
+                     GNUNET_ARM_RESULT_START_FAILED);
   }
   else
   {
-    GNUNET_log (GNUNET_ERROR_TYPE_INFO, _("Starting service `%s'\n"),
+    GNUNET_log (GNUNET_ERROR_TYPE_INFO,
+                _("Starting service `%s'\n"),
                sl->name);
     broadcast_status (sl->name, GNUNET_ARM_SERVICE_STARTING, NULL);
     if (client)
@@ -903,7 +908,7 @@
   /* first count the running processes get their name's size */
   for (sl = running_head; NULL != sl; sl = sl->next)
   {
-    if (sl->proc != NULL)
+    if (NULL != sl->proc)
     {
       string_list_size += strlen (sl->name);
       string_list_size += strlen (sl->binary);
@@ -922,20 +927,19 @@
   msg->count = count;
 
   char *pos = (char *)&msg[1];
-  for (sl = running_head; sl != NULL; sl = sl->next)
+  for (sl = running_head; NULL != sl; sl = sl->next)
   {
-    if (sl->proc != NULL)
+    if (NULL != sl->proc)
     {
       size_t s = strlen (sl->name) + strlen (sl->binary) + 4;
-      GNUNET_snprintf(pos, s, "%s (%s)", sl->name, sl->binary);
+      GNUNET_snprintf (pos, s, "%s (%s)", sl->name, sl->binary);
       pos += s;
     }
   }
-
   GNUNET_SERVER_notify_transmit_ready (client,
                                        total_size,
                                        GNUNET_TIME_UNIT_FOREVER_REL,
-                                       write_list_result, msg);
+                                       &write_list_result, msg);
   GNUNET_SERVER_receive_done (client, GNUNET_OK);
 }
 
@@ -966,6 +970,12 @@
 }
 
 
+/**
+ * Count how many services are still active.
+ *
+ * @param running_head list of services
+ * @return number of active services found
+ */
 static unsigned int
 list_count (struct ServiceList *running_head)
 {
@@ -1442,8 +1452,9 @@
 
   cfg = c;
   server = serv;
-  GNUNET_assert (serv != NULL);
-  GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_FOREVER_REL, &shutdown_task,
+  GNUNET_assert (NULL != serv);
+  GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_FOREVER_REL,
+                                &shutdown_task,
                                NULL);
   child_death_task =
     GNUNET_SCHEDULER_add_read_file (GNUNET_TIME_UNIT_FOREVER_REL,
@@ -1464,50 +1475,49 @@
   {
     GNUNET_break (GNUNET_YES == start_user);
     start_system = GNUNET_NO;
-    return;
   }
   if (GNUNET_YES ==
       GNUNET_CONFIGURATION_get_value_yesno (cfg, "ARM", "SYSTEM_ONLY"))
   {
     GNUNET_break (GNUNET_YES == start_system);
     start_user = GNUNET_NO;
-    return;
   }
   GNUNET_CONFIGURATION_iterate_sections (cfg, &setup_service, NULL);
 
   /* start default services... */
   if (GNUNET_OK ==
-      GNUNET_CONFIGURATION_get_value_string (cfg, "ARM", "DEFAULTSERVICES",
+      GNUNET_CONFIGURATION_get_value_string (cfg,
+                                             "ARM",
+                                             "DEFAULTSERVICES",
                                             &defaultservices))
+  {
+    GNUNET_log (GNUNET_ERROR_TYPE_INFO,
+                _("Starting default services `%s'\n"),
+                defaultservices);
+    if (0 < strlen (defaultservices))
     {
-      GNUNET_log (GNUNET_ERROR_TYPE_INFO,
-                 _("Starting default services `%s'\n"), defaultservices);
-      if (0 < strlen (defaultservices))
-       {
-         for (pos = strtok (defaultservices, " "); NULL != pos;
-              pos = strtok (NULL, " "))
-           {
-             sl = find_service (pos);
-             if (NULL == sl)
-               {
-                 GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-                             _
-                             ("Default service `%s' not configured 
correctly!\n"),
-                             pos);
-                 continue;
-               }
-             sl->is_default = GNUNET_YES;
-             start_process (sl, NULL, 0);
-           }
-       }
-      GNUNET_free (defaultservices);
+      for (pos = strtok (defaultservices, " "); NULL != pos;
+           pos = strtok (NULL, " "))
+      {
+        sl = find_service (pos);
+        if (NULL == sl)
+        {
+          GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+                      _("Default service `%s' not configured correctly!\n"),
+                      pos);
+          continue;
+        }
+        sl->is_default = GNUNET_YES;
+        start_process (sl, NULL, 0);
+      }
     }
+    GNUNET_free (defaultservices);
+  }
   else
-    {
-      GNUNET_log (GNUNET_ERROR_TYPE_INFO,
-                 _
-                 ("No default services configured, GNUnet will not really 
start right now.\n"));
-    }
+  {
+    GNUNET_log (GNUNET_ERROR_TYPE_INFO,
+                _("No default services configured, GNUnet will not really 
start right now.\n"));
+  }
 
   notifier =
       GNUNET_SERVER_notification_context_create (server, MAX_NOTIFY_QUEUE);