diff options
author | Sree Harsha Totakura <totakura@in.tum.de> | 2013-04-10 14:25:55 +0000 |
---|---|---|
committer | Sree Harsha Totakura <totakura@in.tum.de> | 2013-04-10 14:25:55 +0000 |
commit | f4446e40904ba3f3177a8eaf1f9756e48dcc03a9 (patch) | |
tree | d854bfd39195ec0605f75b049641d4fec3310e58 /src/testbed/testbed_api.c | |
parent | bcb48ad6fa905f02703fcbd53d74326c51730afc (diff) | |
download | gnunet-f4446e40904ba3f3177a8eaf1f9756e48dcc03a9.tar.gz gnunet-f4446e40904ba3f3177a8eaf1f9756e48dcc03a9.zip |
- use host's configuration while connecting to controller
Diffstat (limited to 'src/testbed/testbed_api.c')
-rw-r--r-- | src/testbed/testbed_api.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/testbed/testbed_api.c b/src/testbed/testbed_api.c index 95ff9e432..faaa739cc 100644 --- a/src/testbed/testbed_api.c +++ b/src/testbed/testbed_api.c | |||
@@ -1346,19 +1346,20 @@ oprelease_get_slave_config (void *cls) | |||
1346 | * @return handle to the controller | 1346 | * @return handle to the controller |
1347 | */ | 1347 | */ |
1348 | struct GNUNET_TESTBED_Controller * | 1348 | struct GNUNET_TESTBED_Controller * |
1349 | GNUNET_TESTBED_controller_connect (const struct GNUNET_CONFIGURATION_Handle | 1349 | GNUNET_TESTBED_controller_connect (struct GNUNET_TESTBED_Host *host, |
1350 | *cfg, struct GNUNET_TESTBED_Host *host, | ||
1351 | uint64_t event_mask, | 1350 | uint64_t event_mask, |
1352 | GNUNET_TESTBED_ControllerCallback cc, | 1351 | GNUNET_TESTBED_ControllerCallback cc, |
1353 | void *cc_cls) | 1352 | void *cc_cls) |
1354 | { | 1353 | { |
1355 | struct GNUNET_TESTBED_Controller *controller; | 1354 | struct GNUNET_TESTBED_Controller *controller; |
1356 | struct GNUNET_TESTBED_InitMessage *msg; | 1355 | struct GNUNET_TESTBED_InitMessage *msg; |
1356 | const struct GNUNET_CONFIGURATION_Handle *cfg; | ||
1357 | const char *controller_hostname; | 1357 | const char *controller_hostname; |
1358 | unsigned long long max_parallel_operations; | 1358 | unsigned long long max_parallel_operations; |
1359 | unsigned long long max_parallel_service_connections; | 1359 | unsigned long long max_parallel_service_connections; |
1360 | unsigned long long max_parallel_topology_config_operations; | 1360 | unsigned long long max_parallel_topology_config_operations; |
1361 | 1361 | ||
1362 | GNUNET_assert (NULL != (cfg = GNUNET_TESTBED_host_get_cfg_ (host))); | ||
1362 | if (GNUNET_OK != | 1363 | if (GNUNET_OK != |
1363 | GNUNET_CONFIGURATION_get_value_number (cfg, "testbed", | 1364 | GNUNET_CONFIGURATION_get_value_number (cfg, "testbed", |
1364 | "MAX_PARALLEL_OPERATIONS", | 1365 | "MAX_PARALLEL_OPERATIONS", |