aboutsummaryrefslogtreecommitdiff
path: root/src/testbed/testbed_api.h
diff options
context:
space:
mode:
authorSree Harsha Totakura <totakura@in.tum.de>2012-10-14 10:57:13 +0000
committerSree Harsha Totakura <totakura@in.tum.de>2012-10-14 10:57:13 +0000
commit27fcf1fd9a5800ff97eaf8d9863ba48614b378d0 (patch)
treef3123c1b1757e56db65fd836f30b8173a491597b /src/testbed/testbed_api.h
parent507330be531ebac9350bdf70370ff57ddfd2f054 (diff)
downloadgnunet-27fcf1fd9a5800ff97eaf8d9863ba48614b378d0.tar.gz
gnunet-27fcf1fd9a5800ff97eaf8d9863ba48614b378d0.zip
doxygen
Diffstat (limited to 'src/testbed/testbed_api.h')
-rw-r--r--src/testbed/testbed_api.h14
1 files changed, 8 insertions, 6 deletions
diff --git a/src/testbed/testbed_api.h b/src/testbed/testbed_api.h
index 685e5ee22..001f40285 100644
--- a/src/testbed/testbed_api.h
+++ b/src/testbed/testbed_api.h
@@ -448,9 +448,9 @@ GNUNET_TESTBED_get_next_op_id (struct GNUNET_TESTBED_Controller *controller);
448 * 448 *
449 * @param op_cls the closure for the operation 449 * @param op_cls the closure for the operation
450 * @param master the handle to master controller 450 * @param master the handle to master controller
451 * @param slave_host the host where the slave controller is running; the handle 451 * @param slave_host_id id of the host where the slave controller is running to
452 * to the slave_host should remain valid until this operation is 452 * the slave_host should remain valid until this operation is cancelled
453 * cancelled or marked as finished 453 * or marked as finished
454 * @return the operation handle; 454 * @return the operation handle;
455 */ 455 */
456struct GNUNET_TESTBED_Operation * 456struct GNUNET_TESTBED_Operation *
@@ -493,9 +493,11 @@ GNUNET_TESTBED_controller_link_2_ (void *op_cls,
493 * @param op_cls the operation closure for the event which is generated to 493 * @param op_cls the operation closure for the event which is generated to
494 * signal success or failure of this operation 494 * signal success or failure of this operation
495 * @param master handle to the master controller who creates the association 495 * @param master handle to the master controller who creates the association
496 * @param delegated_host requests to which host should be delegated; cannot be NULL 496 * @param delegated_host_id id of the host to which requests should be
497 * @param slave_host which host is used to run the slave controller; use NULL to 497 * delegated; cannot be NULL
498 * make the master controller connect to the delegated host 498 * @param slave_host_id id of the host which should connect to controller
499 * running on delegated host ; use NULL to make the master controller
500 * connect to the delegated host
499 * @param slave_cfg configuration to use for the slave controller 501 * @param slave_cfg configuration to use for the slave controller
500 * @param is_subordinate GNUNET_YES if the controller at delegated_host should 502 * @param is_subordinate GNUNET_YES if the controller at delegated_host should
501 * be started by the slave controller; GNUNET_NO if the slave 503 * be started by the slave controller; GNUNET_NO if the slave