- remove unused configuration parameter in GNUNET_TESTBED_controller_link()

7 files changed, 12 insertions, 30 deletions

diff --git a/src/include/gnunet_testbed_service.h b/src/include/gnunet_testbed_service.h
index f19122978..a68f99f31 100644
--- a/src/include/gnunet_testbed_service.h
+++ b/src/include/gnunet_testbed_service.h
@@ -600,7 +600,6 @@ typedef void (*GNUNET_TESTBED_OperationCompletionCallback) (void *cls,
  * @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 slave_cfg configuration to use for the slave controller
  * @param is_subordinate GNUNET_YES if the controller at delegated_host should
  *          be started by the slave controller; GNUNET_NO if the slave
  *          controller has to connect to the already started delegated
@@ -612,8 +611,6 @@ GNUNET_TESTBED_controller_link (void *op_cls,
                                 struct GNUNET_TESTBED_Controller *master,
                                 struct GNUNET_TESTBED_Host *delegated_host,
                                 struct GNUNET_TESTBED_Host *slave_host,
-                                const struct GNUNET_CONFIGURATION_Handle
-                                *slave_cfg,
                                 int is_subordinate);
 
 
diff --git a/src/testbed/gnunet-service-testbed_links.c b/src/testbed/gnunet-service-testbed_links.c
index 0c89392de..6209bf248 100644
--- a/src/testbed/gnunet-service-testbed_links.c
+++ b/src/testbed/gnunet-service-testbed_links.c
@@ -587,7 +587,6 @@ lcf_proc_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
                                               lcf->gateway->controller,
                                               GST_host_list[lcf->delegated_host_id],
                                               GST_host_list[lcf->slave_host_id],
-                                              NULL,
                                               lcf->is_subordinate);
     lcf->timeout_task =
         GNUNET_SCHEDULER_add_delayed (GST_timeout, &lcf_forwarded_operation_timeout,
@@ -621,7 +620,6 @@ slave_event_callback (void *cls,
 {
   struct RegisteredHostContext *rhc;
   struct LCFContext *lcf;
-  struct GNUNET_CONFIGURATION_Handle *cfg;
   struct GNUNET_TESTBED_Operation *old_op;
 
   /* We currently only get here when working on RegisteredHostContexts and
@@ -634,13 +632,11 @@ slave_event_callback (void *cls,
     switch (rhc->state)
     {
     case RHC_GET_CFG:
-      cfg = event->details.operation_finished.generic;
       old_op = rhc->sub_op;
       rhc->state = RHC_LINK;
       rhc->sub_op =
           GNUNET_TESTBED_controller_link (rhc, rhc->gateway->controller,
-                                          rhc->reg_host, rhc->host, cfg,
-                                          GNUNET_NO);
+                                          rhc->reg_host, rhc->host, GNUNET_NO);
       GNUNET_TESTBED_operation_done (old_op);
       break;
     case RHC_LINK:
diff --git a/src/testbed/gnunet-service-testbed_oc.c b/src/testbed/gnunet-service-testbed_oc.c
index 7913b0f49..c53bec007 100644
--- a/src/testbed/gnunet-service-testbed_oc.c
+++ b/src/testbed/gnunet-service-testbed_oc.c
@@ -1138,7 +1138,6 @@ static void
 registeredhost_registration_completion (void *cls, const char *emsg)
 {
   struct RegisteredHostContext *rhc = cls;
-  const struct GNUNET_CONFIGURATION_Handle *cfg;
   uint32_t peer2_host_id;
 
   peer2_host_id = GNUNET_TESTBED_host_get_id_ (rhc->reg_host);
@@ -1149,14 +1148,9 @@ registeredhost_registration_completion (void *cls, const char *emsg)
         && (NULL != GST_host_list[peer2_host_id]) )  )
   {
     rhc->state = RHC_LINK;
-    cfg =
-        (NULL ==
-         rhc->gateway2) ? our_config
-        : GNUNET_TESTBED_host_get_cfg_ (GST_host_list[peer2_host_id]);
     rhc->sub_op =
         GNUNET_TESTBED_controller_link (rhc, rhc->gateway->controller,
-                                        rhc->reg_host, rhc->host, cfg,
-                                        GNUNET_NO);
+                                        rhc->reg_host, rhc->host, GNUNET_NO);
     return;
   }
   rhc->state = RHC_GET_CFG;
diff --git a/src/testbed/test_testbed_api_3peers_3controllers.c b/src/testbed/test_testbed_api_3peers_3controllers.c
index 752d7e872..6d88490c1 100644
--- a/src/testbed/test_testbed_api_3peers_3controllers.c
+++ b/src/testbed/test_testbed_api_3peers_3controllers.c
@@ -566,7 +566,7 @@ controller_cb (void *cls, const struct GNUNET_TESTBED_EventInformation *event)
       result = PEER1_STARTED;
       common_operation =
           GNUNET_TESTBED_controller_link (NULL, controller1, neighbour1, NULL,
-                                          cfg, GNUNET_YES);
+                                          GNUNET_YES);
       break;
     case PEER2_CREATED:
       if (event->details.peer_start.host != neighbour1)
@@ -587,7 +587,7 @@ controller_cb (void *cls, const struct GNUNET_TESTBED_EventInformation *event)
       }
       common_operation =
           GNUNET_TESTBED_controller_link (NULL, controller1, neighbour2, NULL,
-                                          cfg, GNUNET_YES);
+                                          GNUNET_YES);
       if (NULL == common_operation)
       {
         GNUNET_break (0);
diff --git a/src/testbed/test_testbed_api_controllerlink.c b/src/testbed/test_testbed_api_controllerlink.c
index 030b65117..c5fae9257 100644
--- a/src/testbed/test_testbed_api_controllerlink.c
+++ b/src/testbed/test_testbed_api_controllerlink.c
@@ -525,8 +525,7 @@ controller_cb (void *cls, const struct GNUNET_TESTBED_EventInformation *event)
     FAIL_TEST (event->details.peer_start.peer == slave1_peer);
     GNUNET_TESTBED_operation_done (op);
     result = SLAVE1_PEER_START_SUCCESS;
-    op = GNUNET_TESTBED_controller_link (NULL, mc, slave2, slave, cfg,
-                                         GNUNET_YES);
+    op = GNUNET_TESTBED_controller_link (NULL, mc, slave2, slave, GNUNET_YES);
     break;
   case SLAVE2_PEER_CREATE_SUCCESS:
     FAIL_TEST (GNUNET_TESTBED_ET_PEER_STOP == event->type);
@@ -613,8 +612,7 @@ controller_cb (void *cls, const struct GNUNET_TESTBED_EventInformation *event)
     cfg3 = GNUNET_CONFIGURATION_dup (event->details.operation_finished.generic);
     GNUNET_TESTBED_operation_done (op);
     result = SLAVE3_GET_CONFIG_SUCCESS;
-    op = GNUNET_TESTBED_controller_link (NULL, mc, slave3, slave, cfg3,
-                                         GNUNET_NO);
+    op = GNUNET_TESTBED_controller_link (NULL, mc, slave3, slave, GNUNET_NO);
     break;
   case SLAVE3_REGISTERED:
     check_operation_success (event);
@@ -670,8 +668,7 @@ registration_cont (void *cls, const char *emsg)
     FAIL_TEST (NULL != mc);
     result = SLAVE2_REGISTERED;
     FAIL_TEST (NULL != cfg);
-    op = GNUNET_TESTBED_controller_link (NULL, mc, slave, NULL, cfg,
-                                         GNUNET_YES);
+    op = GNUNET_TESTBED_controller_link (NULL, mc, slave, NULL, GNUNET_YES);
     FAIL_TEST (NULL != op);
     break;
   case MASTER_SLAVE2_PEERS_CONNECTED:
@@ -679,8 +676,7 @@ registration_cont (void *cls, const char *emsg)
     FAIL_TEST (NULL != mc);
     FAIL_TEST (NULL == op);
     result = SLAVE3_REGISTERED;
-    op = GNUNET_TESTBED_controller_link (NULL, mc, slave3, NULL, cfg,
-                                         GNUNET_YES);
+    op = GNUNET_TESTBED_controller_link (NULL, mc, slave3, NULL, GNUNET_YES);
     FAIL_TEST (NULL != op);
     break;
   default:
diff --git a/src/testbed/testbed_api.c b/src/testbed/testbed_api.c
index 2df164a02..207f2658f 100644
--- a/src/testbed/testbed_api.c
+++ b/src/testbed/testbed_api.c
@@ -1652,7 +1652,6 @@ GNUNET_TESTBED_compress_cfg_ (const struct GNUNET_CONFIGURATION_Handle *cfg,
  * @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 slave_cfg configuration to use for the slave controller
  * @param is_subordinate GNUNET_YES if the controller at delegated_host should
  *          be started by the slave controller; GNUNET_NO if the slave
  *          controller has to connect to the already started delegated
@@ -1664,8 +1663,7 @@ GNUNET_TESTBED_controller_link (void *op_cls,
                                 struct GNUNET_TESTBED_Controller *master,
                                 struct GNUNET_TESTBED_Host *delegated_host,
                                 struct GNUNET_TESTBED_Host *slave_host,
-                                const struct GNUNET_CONFIGURATION_Handle
-                                *slave_cfg, int is_subordinate)
+                                int is_subordinate)
 {
   struct OperationContext *opc;
   struct GNUNET_TESTBED_ControllerLinkRequest *msg;
@@ -1689,7 +1687,8 @@ GNUNET_TESTBED_controller_link (void *op_cls,
   msg->header.size = htons (msg_size);
   msg->delegated_host_id = htonl (delegated_host_id);
   msg->slave_host_id = htonl (slave_host_id);
-  msg->is_subordinate = (GNUNET_YES == is_subordinate) ? 1 : 0;data = GNUNET_malloc (sizeof (struct ControllerLinkData));
+  msg->is_subordinate = (GNUNET_YES == is_subordinate) ? 1 : 0;
+  data = GNUNET_malloc (sizeof (struct ControllerLinkData));
   data->msg = msg;
   data->host_id = delegated_host_id;
   opc = GNUNET_malloc (sizeof (struct OperationContext));
diff --git a/src/testbed/testbed_api_testbed.c b/src/testbed/testbed_api_testbed.c
index 09e9cacb5..6e3a83b6f 100644
--- a/src/testbed/testbed_api_testbed.c
+++ b/src/testbed/testbed_api_testbed.c
@@ -942,7 +942,7 @@ register_hosts (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
       rcop->rc = rc;
       rcop->op =
           GNUNET_TESTBED_controller_link (rcop, rc->c, rc->hosts[slave],
-                                          rc->h, rc->cfg, GNUNET_YES);
+                                          rc->h, GNUNET_YES);
       GNUNET_assert (NULL != rcop->op);
       insert_rcop (rc, rcop);
     }