aboutsummaryrefslogtreecommitdiff
path: root/src/include/gnunet_testbed_service.h
diff options
context:
space:
mode:
authorSree Harsha Totakura <totakura@in.tum.de>2012-12-17 16:02:32 +0000
committerSree Harsha Totakura <totakura@in.tum.de>2012-12-17 16:02:32 +0000
commitc408abb9b9069c9eee62f1ca78ee3a815b491f14 (patch)
tree64610e0f1e625ef51319ef85cd703a7ae658bf69 /src/include/gnunet_testbed_service.h
parent69f4cbdda8969ba3325f831d93b6e21660f1a276 (diff)
downloadgnunet-c408abb9b9069c9eee62f1ca78ee3a815b491f14.tar.gz
gnunet-c408abb9b9069c9eee62f1ca78ee3a815b491f14.zip
- rename controller_ip to trusted_ip
Diffstat (limited to 'src/include/gnunet_testbed_service.h')
-rw-r--r--src/include/gnunet_testbed_service.h8
1 files changed, 5 insertions, 3 deletions
diff --git a/src/include/gnunet_testbed_service.h b/src/include/gnunet_testbed_service.h
index 39c10b46d..b87bc951b 100644
--- a/src/include/gnunet_testbed_service.h
+++ b/src/include/gnunet_testbed_service.h
@@ -439,8 +439,10 @@ typedef void (*GNUNET_TESTBED_ControllerStatusCallback) (void *cls,
439/** 439/**
440 * Starts a controller process at the host. 440 * Starts a controller process at the host.
441 * 441 *
442 * @param controller_ip the ip address of the controller. Will be set as TRUSTED 442 * @param trusted_ip the ip address of the controller which will be set as TRUSTED
443 * host when starting testbed controller at host 443 * HOST(all connections form this ip are permitted by the testbed) when
444 * starting testbed controller at host. This can either be a single ip
445 * address or a network address in CIDR notation.
444 * @param host the host where the controller has to be started; NULL for 446 * @param host the host where the controller has to be started; NULL for
445 * localhost 447 * localhost
446 * @param cfg template configuration to use for the remote controller; the 448 * @param cfg template configuration to use for the remote controller; the
@@ -457,7 +459,7 @@ typedef void (*GNUNET_TESTBED_ControllerStatusCallback) (void *cls,
457 * @return the controller process handle, NULL on errors 459 * @return the controller process handle, NULL on errors
458 */ 460 */
459struct GNUNET_TESTBED_ControllerProc * 461struct GNUNET_TESTBED_ControllerProc *
460GNUNET_TESTBED_controller_start (const char *controller_ip, 462GNUNET_TESTBED_controller_start (const char *trusted_ip,
461 struct GNUNET_TESTBED_Host *host, 463 struct GNUNET_TESTBED_Host *host,
462 const struct GNUNET_CONFIGURATION_Handle *cfg, 464 const struct GNUNET_CONFIGURATION_Handle *cfg,
463 GNUNET_TESTBED_ControllerStatusCallback cb, 465 GNUNET_TESTBED_ControllerStatusCallback cb,