[GNUnet-SVN] r10727 - gnunet/src/testing

[gnunet]

Author: nevans
Date: 2010-03-31 14:55:29 +0200 (Wed, 31 Mar 2010)
New Revision: 10727

Modified:
   gnunet/src/testing/testing.c
   gnunet/src/testing/testing_group.c
Log:
more tweaks to allow testing to actually work

Modified: gnunet/src/testing/testing.c
===================================================================
--- gnunet/src/testing/testing.c        2010-03-31 10:05:16 UTC (rev 10726)
+++ gnunet/src/testing/testing.c        2010-03-31 12:55:29 UTC (rev 10727)
@@ -531,7 +531,7 @@
     {
 #if DEBUG_TESTING
       GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-                  "Stopping gnunet-arm on with config `%s' on host `%s'.\n", 
d->cfgfile, d->hostname);
+                  "Stopping gnunet-arm with config `%s' on host `%s'.\n", 
d->cfgfile, d->hostname);
 #endif
 
       if (d->username != NULL)

Modified: gnunet/src/testing/testing_group.c
===================================================================
--- gnunet/src/testing/testing_group.c  2010-03-31 10:05:16 UTC (rev 10726)
+++ gnunet/src/testing/testing_group.c  2010-03-31 12:55:29 UTC (rev 10727)
@@ -183,6 +183,7 @@
  */
 static int outstanding_connects;
 
+
 /**
  * Function to iterate over options.  Copies
  * the options to the target configuration,
@@ -209,7 +210,7 @@
 
   if ((0 == strcmp (option, "HOSTNAME")) && (ctx->hostname != NULL))
     {
-      GNUNET_CONFIGURATION_set_value_string (ctx->ret, section, option, 
ctx->hostname);
+      value = ctx->hostname;
     }
 
   GNUNET_CONFIGURATION_set_value_string (ctx->ret, section, option, value);
@@ -250,13 +251,22 @@
 
   if (GNUNET_CONFIGURATION_get_value_string(cfg, "testing", "control_host", 
&control_host) == GNUNET_OK)
     {
-      GNUNET_asprintf(&allowed_hosts, "%s; 127.0.0.1;", control_host);
-      fprintf(stderr, "FOUND CONTROL_HOST OPTION %s, setting to %s\n", 
control_host, allowed_hosts);
+      GNUNET_asprintf(&allowed_hosts, "%s 127.0.0.1;", control_host);
       GNUNET_CONFIGURATION_set_value_string(uc.ret, "core", "ACCEPT_FROM", 
allowed_hosts);
       GNUNET_free_non_null(control_host);
       GNUNET_free(allowed_hosts);
     }
 
+
+  /* arm needs to know to allow connections from the host on which it is 
running,
+   * otherwise gnunet-arm is unable to connect to it in some instances */
+  if (hostname != NULL)
+    {
+      GNUNET_asprintf(&allowed_hosts, "%s; 127.0.0.1;", hostname);
+      GNUNET_CONFIGURATION_set_value_string(uc.ret, "arm", "ACCEPT_FROM", 
allowed_hosts);
+      GNUNET_free(allowed_hosts);
+    }
+
   *port = (uint16_t) uc.nport;
   return uc.ret;
 }
@@ -1266,6 +1276,7 @@
           hostname = NULL;
           pcfg = make_config (cfg, &minport, hostname);
         }
+
       if (NULL == pcfg)
         {
           GNUNET_log (GNUNET_ERROR_TYPE_WARNING,