diff options
author | Sree Harsha Totakura <totakura@in.tum.de> | 2013-04-10 14:41:35 +0000 |
---|---|---|
committer | Sree Harsha Totakura <totakura@in.tum.de> | 2013-04-10 14:41:35 +0000 |
commit | 77e2b5831b45e6a22c5218cbcfb46175c3411a66 (patch) | |
tree | eb6b14d4dcc43cc7fbe6f5a116a8d1a5d4e81da4 /src/include/gnunet_testbed_service.h | |
parent | f4446e40904ba3f3177a8eaf1f9756e48dcc03a9 (diff) | |
download | gnunet-77e2b5831b45e6a22c5218cbcfb46175c3411a66.tar.gz gnunet-77e2b5831b45e6a22c5218cbcfb46175c3411a66.zip |
- use host's configuration while starting controller on the host
Diffstat (limited to 'src/include/gnunet_testbed_service.h')
-rw-r--r-- | src/include/gnunet_testbed_service.h | 19 |
1 files changed, 8 insertions, 11 deletions
diff --git a/src/include/gnunet_testbed_service.h b/src/include/gnunet_testbed_service.h index 61b347e78..86e3cd194 100644 --- a/src/include/gnunet_testbed_service.h +++ b/src/include/gnunet_testbed_service.h | |||
@@ -436,21 +436,19 @@ typedef void (*GNUNET_TESTBED_ControllerStatusCallback) (void *cls, | |||
436 | 436 | ||
437 | 437 | ||
438 | /** | 438 | /** |
439 | * Starts a controller process at the given host. | 439 | * Starts a controller process at the given host. The given host's configration |
440 | * is used as a Template configuration to use for the remote controller; the | ||
441 | * remote controller will be started with a slightly modified configuration | ||
442 | * (port numbers, unix domain sockets and service home values are changed as per | ||
443 | * TESTING library on the remote host). The modified configuration replaces the | ||
444 | * host's existing configuration before signalling success through the | ||
445 | * GNUNET_TESTBED_ControllerStatusCallback() | ||
440 | * | 446 | * |
441 | * @param trusted_ip the ip address of the controller which will be set as TRUSTED | 447 | * @param trusted_ip the ip address of the controller which will be set as TRUSTED |
442 | * HOST(all connections form this ip are permitted by the testbed) when | 448 | * HOST(all connections form this ip are permitted by the testbed) when |
443 | * starting testbed controller at host. This can either be a single ip | 449 | * starting testbed controller at host. This can either be a single ip |
444 | * address or a network address in CIDR notation. | 450 | * address or a network address in CIDR notation. |
445 | * @param host the host where the controller has to be started; NULL for | 451 | * @param host the host where the controller has to be started. CANNOT be NULL. |
446 | * localhost | ||
447 | * @param cfg template configuration to use for the remote controller; the | ||
448 | * remote controller will be started with a slightly modified | ||
449 | * configuration (port numbers, unix domain sockets and service home | ||
450 | * values are changed as per TESTING library on the remote host). The | ||
451 | * modified configuration replaces the host's existing configuration | ||
452 | * before signalling success through the | ||
453 | * GNUNET_TESTBED_ControllerStatusCallback() | ||
454 | * @param cb function called when the controller is successfully started or | 452 | * @param cb function called when the controller is successfully started or |
455 | * dies unexpectedly; GNUNET_TESTBED_controller_stop shouldn't be | 453 | * dies unexpectedly; GNUNET_TESTBED_controller_stop shouldn't be |
456 | * called if cb is called with GNUNET_SYSERR as status. Will never be | 454 | * called if cb is called with GNUNET_SYSERR as status. Will never be |
@@ -463,7 +461,6 @@ typedef void (*GNUNET_TESTBED_ControllerStatusCallback) (void *cls, | |||
463 | struct GNUNET_TESTBED_ControllerProc * | 461 | struct GNUNET_TESTBED_ControllerProc * |
464 | GNUNET_TESTBED_controller_start (const char *trusted_ip, | 462 | GNUNET_TESTBED_controller_start (const char *trusted_ip, |
465 | struct GNUNET_TESTBED_Host *host, | 463 | struct GNUNET_TESTBED_Host *host, |
466 | const struct GNUNET_CONFIGURATION_Handle *cfg, | ||
467 | GNUNET_TESTBED_ControllerStatusCallback cb, | 464 | GNUNET_TESTBED_ControllerStatusCallback cb, |
468 | void *cls); | 465 | void *cls); |
469 | 466 | ||