From: Sree Harsha Totakura <totakura@in.tum.de>
Date: Wed, 4 Jul 2012 15:44:26 +0000 (+0000)
Subject: -TESTBED controller_link_2 header
X-Git-Tag: initial-import-from-subversion-38251~12653
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=9534e25a16b3f9d2574ffb969ff295f77f74c351;p=oweals%2Fgnunet.git

-TESTBED controller_link_2 header
---

diff --git a/src/include/gnunet_testbed_service.h b/src/include/gnunet_testbed_service.h
index 2fffb0fc8..e6997db1f 100644
--- a/src/include/gnunet_testbed_service.h
+++ b/src/include/gnunet_testbed_service.h
@@ -564,9 +564,9 @@ GNUNET_TESTBED_controller_link (struct GNUNET_TESTBED_Controller *master,
  * @param delegated_host requests to which host should be delegated; cannot be NULL
  * @param slave_host which host is used to run the slave controller; use NULL to
  *          make the master controller connect to the delegated host
- * @param scfg serialized and compressed configuration
- * @param scfg_size the size scfg
- * @param cfg_size the size of uncompressed serialized configuration
+ * @param sxcfg serialized and compressed configuration
+ * @param sxcfg_size the size scfg
+ * @param scfg_size the size of uncompressed serialized configuration
  * @param is_subordinate GNUNET_YES if the controller at delegated_host should
  *          be started by the master controller; GNUNET_NO if we are just
  *          allowed to use the slave via TCP/IP
@@ -575,9 +575,9 @@ void
 GNUNET_TESTBED_controller_link_2 (struct GNUNET_TESTBED_Controller *master,
 				  struct GNUNET_TESTBED_Host *delegated_host,
 				  struct GNUNET_TESTBED_Host *slave_host,
-				  const char *scfg,
+				  const char *sxcfg,
+				  size_t sxcfg_size,
 				  size_t scfg_size,
-				  size_t cfg_size,
 				  int is_subordinate);