aboutsummaryrefslogtreecommitdiff
path: root/src/include/gnunet_testbed_service.h
diff options
context:
space:
mode:
authorSree Harsha Totakura <totakura@in.tum.de>2013-04-10 14:25:55 +0000
committerSree Harsha Totakura <totakura@in.tum.de>2013-04-10 14:25:55 +0000
commitf4446e40904ba3f3177a8eaf1f9756e48dcc03a9 (patch)
treed854bfd39195ec0605f75b049641d4fec3310e58 /src/include/gnunet_testbed_service.h
parentbcb48ad6fa905f02703fcbd53d74326c51730afc (diff)
downloadgnunet-f4446e40904ba3f3177a8eaf1f9756e48dcc03a9.tar.gz
gnunet-f4446e40904ba3f3177a8eaf1f9756e48dcc03a9.zip
- use host's configuration while connecting to controller
Diffstat (limited to 'src/include/gnunet_testbed_service.h')
-rw-r--r--src/include/gnunet_testbed_service.h14
1 files changed, 8 insertions, 6 deletions
diff --git a/src/include/gnunet_testbed_service.h b/src/include/gnunet_testbed_service.h
index 522484821..61b347e78 100644
--- a/src/include/gnunet_testbed_service.h
+++ b/src/include/gnunet_testbed_service.h
@@ -447,7 +447,10 @@ typedef void (*GNUNET_TESTBED_ControllerStatusCallback) (void *cls,
447 * @param cfg template configuration to use for the remote controller; the 447 * @param cfg template configuration to use for the remote controller; the
448 * remote controller will be started with a slightly modified 448 * remote controller will be started with a slightly modified
449 * configuration (port numbers, unix domain sockets and service home 449 * configuration (port numbers, unix domain sockets and service home
450 * values are changed as per TESTING library on the remote host) 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()
451 * @param cb function called when the controller is successfully started or 454 * @param cb function called when the controller is successfully started or
452 * dies unexpectedly; GNUNET_TESTBED_controller_stop shouldn't be 455 * dies unexpectedly; GNUNET_TESTBED_controller_stop shouldn't be
453 * called if cb is called with GNUNET_SYSERR as status. Will never be 456 * called if cb is called with GNUNET_SYSERR as status. Will never be
@@ -478,10 +481,10 @@ GNUNET_TESTBED_controller_stop (struct GNUNET_TESTBED_ControllerProc *cproc);
478 481
479 482
480/** 483/**
481 * Connect to a controller process using the given configuration at the 484 * Connect to a controller process. The configuration to use for the connection
482 * given host. 485 * is retreived from the given host where a controller is started using
486 * GNUNET_TESTBED_controller_start().
483 * 487 *
484 * @param cfg configuration to use
485 * @param host host to run the controller on; This should be the same host if 488 * @param host host to run the controller on; This should be the same host if
486 * the controller was previously started with 489 * the controller was previously started with
487 * GNUNET_TESTBED_controller_start; NULL for localhost 490 * GNUNET_TESTBED_controller_start; NULL for localhost
@@ -495,8 +498,7 @@ GNUNET_TESTBED_controller_stop (struct GNUNET_TESTBED_ControllerProc *cproc);
495 * @return handle to the controller 498 * @return handle to the controller
496 */ 499 */
497struct GNUNET_TESTBED_Controller * 500struct GNUNET_TESTBED_Controller *
498GNUNET_TESTBED_controller_connect (const struct GNUNET_CONFIGURATION_Handle *cfg, 501GNUNET_TESTBED_controller_connect (struct GNUNET_TESTBED_Host *host,
499 struct GNUNET_TESTBED_Host *host,
500 uint64_t event_mask, 502 uint64_t event_mask,
501 GNUNET_TESTBED_ControllerCallback cc, 503 GNUNET_TESTBED_ControllerCallback cc,
502 void *cc_cls); 504 void *cc_cls);