[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r27022 - in gnunet/src: include testbed
|
From: |
gnunet |
|
Subject: |
[GNUnet-SVN] r27022 - in gnunet/src: include testbed |
|
Date: |
Sat, 4 May 2013 07:50:32 +0200 |
Author: harsha
Date: 2013-05-04 07:50:31 +0200 (Sat, 04 May 2013)
New Revision: 27022
Modified:
gnunet/src/include/gnunet_testbed_service.h
gnunet/src/testbed/gnunet-service-testbed_links.c
gnunet/src/testbed/gnunet-service-testbed_oc.c
gnunet/src/testbed/test_testbed_api_3peers_3controllers.c
gnunet/src/testbed/test_testbed_api_controllerlink.c
gnunet/src/testbed/testbed_api.c
gnunet/src/testbed/testbed_api_testbed.c
Log:
- remove unused configuration parameter in GNUNET_TESTBED_controller_link()
Modified: gnunet/src/include/gnunet_testbed_service.h
===================================================================
--- gnunet/src/include/gnunet_testbed_service.h 2013-05-03 14:56:37 UTC (rev
27021)
+++ gnunet/src/include/gnunet_testbed_service.h 2013-05-04 05:50:31 UTC (rev
27022)
@@ -600,7 +600,6 @@
* @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 @@
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);
Modified: gnunet/src/testbed/gnunet-service-testbed_links.c
===================================================================
--- gnunet/src/testbed/gnunet-service-testbed_links.c 2013-05-03 14:56:37 UTC
(rev 27021)
+++ gnunet/src/testbed/gnunet-service-testbed_links.c 2013-05-04 05:50:31 UTC
(rev 27022)
@@ -587,7 +587,6 @@
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 @@
{
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 @@
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:
Modified: gnunet/src/testbed/gnunet-service-testbed_oc.c
===================================================================
--- gnunet/src/testbed/gnunet-service-testbed_oc.c 2013-05-03 14:56:37 UTC
(rev 27021)
+++ gnunet/src/testbed/gnunet-service-testbed_oc.c 2013-05-04 05:50:31 UTC
(rev 27022)
@@ -1138,7 +1138,6 @@
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 @@
&& (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;
Modified: gnunet/src/testbed/test_testbed_api_3peers_3controllers.c
===================================================================
--- gnunet/src/testbed/test_testbed_api_3peers_3controllers.c 2013-05-03
14:56:37 UTC (rev 27021)
+++ gnunet/src/testbed/test_testbed_api_3peers_3controllers.c 2013-05-04
05:50:31 UTC (rev 27022)
@@ -566,7 +566,7 @@
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 @@
}
common_operation =
GNUNET_TESTBED_controller_link (NULL, controller1, neighbour2, NULL,
- cfg, GNUNET_YES);
+ GNUNET_YES);
if (NULL == common_operation)
{
GNUNET_break (0);
Modified: gnunet/src/testbed/test_testbed_api_controllerlink.c
===================================================================
--- gnunet/src/testbed/test_testbed_api_controllerlink.c 2013-05-03
14:56:37 UTC (rev 27021)
+++ gnunet/src/testbed/test_testbed_api_controllerlink.c 2013-05-04
05:50:31 UTC (rev 27022)
@@ -525,8 +525,7 @@
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 @@
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 @@
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 @@
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:
Modified: gnunet/src/testbed/testbed_api.c
===================================================================
--- gnunet/src/testbed/testbed_api.c 2013-05-03 14:56:37 UTC (rev 27021)
+++ gnunet/src/testbed/testbed_api.c 2013-05-04 05:50:31 UTC (rev 27022)
@@ -1652,7 +1652,6 @@
* @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 @@
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 @@
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));
Modified: gnunet/src/testbed/testbed_api_testbed.c
===================================================================
--- gnunet/src/testbed/testbed_api_testbed.c 2013-05-03 14:56:37 UTC (rev
27021)
+++ gnunet/src/testbed/testbed_api_testbed.c 2013-05-04 05:50:31 UTC (rev
27022)
@@ -942,7 +942,7 @@
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);
}
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r27022 - in gnunet/src: include testbed,
gnunet <=