aboutsummaryrefslogtreecommitdiff
path: root/src/testbed/testbed_api_testbed.c
diff options
context:
space:
mode:
authorSree Harsha Totakura <totakura@in.tum.de>2013-04-10 14:41:35 +0000
committerSree Harsha Totakura <totakura@in.tum.de>2013-04-10 14:41:35 +0000
commit77e2b5831b45e6a22c5218cbcfb46175c3411a66 (patch)
treeeb6b14d4dcc43cc7fbe6f5a116a8d1a5d4e81da4 /src/testbed/testbed_api_testbed.c
parentf4446e40904ba3f3177a8eaf1f9756e48dcc03a9 (diff)
downloadgnunet-77e2b5831b45e6a22c5218cbcfb46175c3411a66.tar.gz
gnunet-77e2b5831b45e6a22c5218cbcfb46175c3411a66.zip
- use host's configuration while starting controller on the host
Diffstat (limited to 'src/testbed/testbed_api_testbed.c')
-rw-r--r--src/testbed/testbed_api_testbed.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/testbed/testbed_api_testbed.c b/src/testbed/testbed_api_testbed.c
index 57d57050a..a7134d24e 100644
--- a/src/testbed/testbed_api_testbed.c
+++ b/src/testbed/testbed_api_testbed.c
@@ -986,7 +986,7 @@ host_habitable_cb (void *cls, const struct GNUNET_TESTBED_Host *host,
986 if (NULL == rc->trusted_ip) 986 if (NULL == rc->trusted_ip)
987 rc->trusted_ip = GNUNET_strdup ("127.0.0.1"); 987 rc->trusted_ip = GNUNET_strdup ("127.0.0.1");
988 rc->cproc = 988 rc->cproc =
989 GNUNET_TESTBED_controller_start (rc->trusted_ip, rc->h, rc->cfg, 989 GNUNET_TESTBED_controller_start (rc->trusted_ip, rc->h,
990 &controller_status_cb, rc); 990 &controller_status_cb, rc);
991 GNUNET_free (rc->trusted_ip); 991 GNUNET_free (rc->trusted_ip);
992 rc->trusted_ip = NULL; 992 rc->trusted_ip = NULL;
@@ -1175,7 +1175,7 @@ GNUNET_TESTBED_run (const char *host_filename,
1175 } 1175 }
1176 else 1176 else
1177 rc->cproc = 1177 rc->cproc =
1178 GNUNET_TESTBED_controller_start ("127.0.0.1", rc->h, rc->cfg, 1178 GNUNET_TESTBED_controller_start ("127.0.0.1", rc->h,
1179 &controller_status_cb, rc); 1179 &controller_status_cb, rc);
1180 if (GNUNET_OK != GNUNET_CONFIGURATION_get_value_time (cfg, "TESTBED", 1180 if (GNUNET_OK != GNUNET_CONFIGURATION_get_value_time (cfg, "TESTBED",
1181 "SETUP_TIMEOUT", 1181 "SETUP_TIMEOUT",