aboutsummaryrefslogtreecommitdiff
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
parent507330be531ebac9350bdf70370ff57ddfd2f054 (diff)
downloadgnunet-27fcf1fd9a5800ff97eaf8d9863ba48614b378d0.tar.gz
gnunet-27fcf1fd9a5800ff97eaf8d9863ba48614b378d0.zip
doxygen
-rw-r--r--src/testbed/gnunet-testbed-profiler.c2
-rw-r--r--src/testbed/testbed_api.c14
-rw-r--r--src/testbed/testbed_api.h14
3 files changed, 17 insertions, 13 deletions
diff --git a/src/testbed/gnunet-testbed-profiler.c b/src/testbed/gnunet-testbed-profiler.c
index 0bf252d2e..93d7ea70c 100644
--- a/src/testbed/gnunet-testbed-profiler.c
+++ b/src/testbed/gnunet-testbed-profiler.c
@@ -491,7 +491,7 @@ status_cb (void *cls, const struct GNUNET_CONFIGURATION_Handle *config, int stat
491 * @param cls closure 491 * @param cls closure
492 * @param args remaining command-line arguments 492 * @param args remaining command-line arguments
493 * @param cfgfile name of the configuration file used (for saving, can be NULL!) 493 * @param cfgfile name of the configuration file used (for saving, can be NULL!)
494 * @param cfg configuration 494 * @param config configuration
495 */ 495 */
496static void 496static void
497run (void *cls, char *const *args, const char *cfgfile, 497run (void *cls, char *const *args, const char *cfgfile,
diff --git a/src/testbed/testbed_api.c b/src/testbed/testbed_api.c
index 053d730ff..a9e909f25 100644
--- a/src/testbed/testbed_api.c
+++ b/src/testbed/testbed_api.c
@@ -1956,9 +1956,11 @@ GNUNET_TESTBED_compress_config_ (const char *config, size_t size,
1956 * @param op_cls the operation closure for the event which is generated to 1956 * @param op_cls the operation closure for the event which is generated to
1957 * signal success or failure of this operation 1957 * signal success or failure of this operation
1958 * @param master handle to the master controller who creates the association 1958 * @param master handle to the master controller who creates the association
1959 * @param delegated_host requests to which host should be delegated; cannot be NULL 1959 * @param delegated_host_id id of the host to which requests should be
1960 * @param slave_host which host is used to run the slave controller; use NULL to 1960 * delegated; cannot be NULL
1961 * make the master controller connect to the delegated host 1961 * @param slave_host_id id of the host which should connect to controller
1962 * running on delegated host ; use NULL to make the master controller
1963 * connect to the delegated host
1962 * @param slave_cfg configuration to use for the slave controller 1964 * @param slave_cfg configuration to use for the slave controller
1963 * @param is_subordinate GNUNET_YES if the controller at delegated_host should 1965 * @param is_subordinate GNUNET_YES if the controller at delegated_host should
1964 * be started by the slave controller; GNUNET_NO if the slave 1966 * be started by the slave controller; GNUNET_NO if the slave
@@ -2060,9 +2062,9 @@ GNUNET_TESTBED_controller_link (void *op_cls,
2060 * 2062 *
2061 * @param op_cls the closure for the operation 2063 * @param op_cls the closure for the operation
2062 * @param master the handle to master controller 2064 * @param master the handle to master controller
2063 * @param slave_host the host where the slave controller is running; the handle 2065 * @param slave_host_id id of the host where the slave controller is running to
2064 * to the slave_host should remain valid until this operation is 2066 * the slave_host should remain valid until this operation is cancelled
2065 * cancelled or marked as finished 2067 * or marked as finished
2066 * @return the operation handle; 2068 * @return the operation handle;
2067 */ 2069 */
2068struct GNUNET_TESTBED_Operation * 2070struct GNUNET_TESTBED_Operation *
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