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

[gnunet]

Author: grothoff
Date: 2013-01-26 10:50:37 +0100 (Sat, 26 Jan 2013)
New Revision: 25919

Modified:
   gnunet/src/arm/gnunet-arm.c
   gnunet/src/arm/test_arm_api.c
   gnunet/src/arm/test_exponential_backoff.c
   gnunet/src/arm/test_gnunet_service_arm.c
Log:
LRN: Here's a patch. See if it doesn't break anything for you.

Arm service is started with -c <configname> only when the process that
runs arm service has "[arm]/CONFIG" defined in the configuration used
to run arm service (usually - process' own configuration).

Since default [arm] config has no CONFIG defined anymore (thanks to
your r25908), we need to add this code to put the config file that was
passed to gnunet-arm tool via -c as "[arm]/CONFIG" for arm service to
receive it.

Otherwise arm service is run without config and reads default config
(~/.gnunet/gnunet.conf) instead, which is clearly not what we need.



Modified: gnunet/src/arm/gnunet-arm.c
===================================================================
--- gnunet/src/arm/gnunet-arm.c 2013-01-25 22:27:43 UTC (rev 25918)
+++ gnunet/src/arm/gnunet-arm.c 2013-01-26 09:50:37 UTC (rev 25919)
@@ -291,6 +291,7 @@
 run (void *cls, char *const *args, const char *cfgfile,
      const struct GNUNET_CONFIGURATION_Handle *c)
 {
+  char *armconfig;
   cfg = c;
   config_file = cfgfile;
   if (GNUNET_CONFIGURATION_get_value_string
@@ -300,6 +301,18 @@
                               "PATHS", "SERVICEHOME");
     return;
     }
+  if (NULL != cfgfile)
+  {
+    if (GNUNET_OK !=
+        GNUNET_CONFIGURATION_get_value_filename (cfg, "arm", "CONFIG",
+                                              &armconfig))
+    {
+      GNUNET_CONFIGURATION_set_value_string (cfg, "arm", "CONFIG",
+                                             cfgfile);
+    }
+    else
+      GNUNET_free (armconfig);
+  }
   if (NULL == (h = GNUNET_ARM_connect (cfg, NULL)))
   {
     GNUNET_log (GNUNET_ERROR_TYPE_ERROR,

Modified: gnunet/src/arm/test_arm_api.c
===================================================================
--- gnunet/src/arm/test_arm_api.c       2013-01-25 22:27:43 UTC (rev 25918)
+++ gnunet/src/arm/test_arm_api.c       2013-01-26 09:50:37 UTC (rev 25919)
@@ -118,7 +118,20 @@
 task (void *cls, char *const *args, const char *cfgfile,
       const struct GNUNET_CONFIGURATION_Handle *c)
 {
+  char *armconfig;
   cfg = c;
+  if (NULL != cfgfile)
+  {
+    if (GNUNET_OK !=
+        GNUNET_CONFIGURATION_get_value_filename (cfg, "arm", "CONFIG",
+                                              &armconfig))
+    {
+      GNUNET_CONFIGURATION_set_value_string (cfg, "arm", "CONFIG",
+                                             cfgfile);
+    }
+    else
+      GNUNET_free (armconfig);
+  }
   arm = GNUNET_ARM_connect (cfg, NULL);
 #if START_ARM
   GNUNET_ARM_start_service (arm, "arm", GNUNET_OS_INHERIT_STD_OUT_AND_ERR, 
START_TIMEOUT, &arm_notify, NULL);

Modified: gnunet/src/arm/test_exponential_backoff.c
===================================================================
--- gnunet/src/arm/test_exponential_backoff.c   2013-01-25 22:27:43 UTC (rev 
25918)
+++ gnunet/src/arm/test_exponential_backoff.c   2013-01-26 09:50:37 UTC (rev 
25919)
@@ -355,7 +355,20 @@
 task (void *cls, char *const *args, const char *cfgfile,
       const struct GNUNET_CONFIGURATION_Handle *c)
 {
+  char *armconfig;
   cfg = c;
+  if (NULL != cfgfile)
+  {
+    if (GNUNET_OK !=
+        GNUNET_CONFIGURATION_get_value_filename (cfg, "arm", "CONFIG",
+                                              &armconfig))
+    {
+      GNUNET_CONFIGURATION_set_value_string (cfg, "arm", "CONFIG",
+                                             cfgfile);
+    }
+    else
+      GNUNET_free (armconfig);
+  }
 
   arm = GNUNET_ARM_connect (cfg, NULL);
 #if START_ARM

Modified: gnunet/src/arm/test_gnunet_service_arm.c
===================================================================
--- gnunet/src/arm/test_gnunet_service_arm.c    2013-01-25 22:27:43 UTC (rev 
25918)
+++ gnunet/src/arm/test_gnunet_service_arm.c    2013-01-26 09:50:37 UTC (rev 
25919)
@@ -107,6 +107,20 @@
 run (void *cls, char *const *args, const char *cfgfile,
      const struct GNUNET_CONFIGURATION_Handle *c)
 {
+  char *armconfig;
+
+  if (NULL != cfgfile)
+  {
+    if (GNUNET_OK !=
+        GNUNET_CONFIGURATION_get_value_filename (c, "arm", "CONFIG",
+                                              &armconfig))
+    {
+      GNUNET_CONFIGURATION_set_value_string (c, "arm", "CONFIG",
+                                             cfgfile);
+    }
+    else
+      GNUNET_free (armconfig);
+  }
   arm = GNUNET_ARM_connect (c, NULL);
   GNUNET_ARM_start_service (arm, "arm",
                            GNUNET_OS_INHERIT_STD_OUT_AND_ERR, START_TIMEOUT,