[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r23225 - gnunet/src/testbed
From: |
gnunet |
Subject: |
[GNUnet-SVN] r23225 - gnunet/src/testbed |
Date: |
Tue, 14 Aug 2012 15:38:06 +0200 |
Author: harsha
Date: 2012-08-14 15:38:06 +0200 (Tue, 14 Aug 2012)
New Revision: 23225
Modified:
gnunet/src/testbed/gnunet-service-testbed.c
gnunet/src/testbed/test_testbed_api_controllerlink.c
gnunet/src/testbed/testbed_api_hosts.c
Log:
fixes and removed slave2 from controller link test
Modified: gnunet/src/testbed/gnunet-service-testbed.c
===================================================================
--- gnunet/src/testbed/gnunet-service-testbed.c 2012-08-14 13:24:09 UTC (rev
23224)
+++ gnunet/src/testbed/gnunet-service-testbed.c 2012-08-14 13:38:06 UTC (rev
23225)
@@ -2155,8 +2155,8 @@
for (id = 0; id < slave_list_size; id++)
if (NULL != slave_list[id])
{
- GNUNET_assert (NULL != slave_list[id]->controller);
- GNUNET_TESTBED_controller_disconnect (slave_list[id]->controller);
+ if (NULL != slave_list[id]->controller)
+ GNUNET_TESTBED_controller_disconnect (slave_list[id]->controller);
if (NULL != slave_list[id]->controller_proc)
GNUNET_TESTBED_controller_stop (slave_list[id]->controller_proc);
}
Modified: gnunet/src/testbed/test_testbed_api_controllerlink.c
===================================================================
--- gnunet/src/testbed/test_testbed_api_controllerlink.c 2012-08-14
13:24:09 UTC (rev 23224)
+++ gnunet/src/testbed/test_testbed_api_controllerlink.c 2012-08-14
13:38:06 UTC (rev 23225)
@@ -63,11 +63,6 @@
SLAVE1_REGISTERED,
/**
- * The second slave has been registered at the master controller
- */
- SLAVE2_REGISTERED,
-
- /**
* Final stage
*/
SUCCESS
@@ -95,11 +90,6 @@
static struct GNUNET_TESTBED_Host *slave;
/**
- * Another slave host for running another slave controller
- */
-static struct GNUNET_TESTBED_Host *slave2;
-
-/**
* Slave host registration handle
*/
static struct GNUNET_TESTBED_HostRegistrationHandle *rh;
@@ -140,8 +130,6 @@
GNUNET_TESTBED_controller_disconnect (mc);
if (NULL != cp)
GNUNET_TESTBED_controller_stop (cp);
- if (NULL != slave2)
- GNUNET_TESTBED_host_destroy (slave2);
if (NULL != slave)
GNUNET_TESTBED_host_destroy (slave);
if (NULL != host)
@@ -197,19 +185,10 @@
{
case MASTER_STARTED:
GNUNET_assert (NULL == emsg);
- result = SLAVE1_REGISTERED;
- slave2 = GNUNET_TESTBED_host_create_with_id (2, "127.0.0.1", NULL, 0);
- GNUNET_assert (NULL != slave2);
- rh = GNUNET_TESTBED_register_host (mc, slave2, ®istration_cont, NULL);
- GNUNET_assert (NULL != rh);
- break;
- case SLAVE1_REGISTERED:
- GNUNET_assert (NULL == emsg);
GNUNET_assert (NULL != mc);
- result = SLAVE2_REGISTERED;
+ result = SLAVE1_REGISTERED;
GNUNET_assert (NULL != cfg);
GNUNET_TESTBED_controller_link (mc, slave, NULL, cfg, GNUNET_YES);
- //GNUNET_TESTBED_controller_link (mc, host, slave
result = SUCCESS;
GNUNET_SCHEDULER_add_delayed
(GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 3),
@@ -217,7 +196,7 @@
break;
case INIT:
case SUCCESS:
- case SLAVE2_REGISTERED:
+ case SLAVE1_REGISTERED:
GNUNET_assert (0);
}
}
@@ -248,7 +227,7 @@
&controller_cb, NULL);
GNUNET_assert (NULL != mc);
result = MASTER_STARTED;
- slave = GNUNET_TESTBED_host_create_with_id (1, "127.0.0.1", NULL, 0);
+ slave = GNUNET_TESTBED_host_create_with_id (2, "127.0.0.1", NULL, 0);
GNUNET_assert (NULL != slave);
rh = GNUNET_TESTBED_register_host (mc, slave, ®istration_cont, NULL);
GNUNET_assert (NULL != rh);
@@ -271,7 +250,7 @@
run (void *cls, char *const *args, const char *cfgfile,
const struct GNUNET_CONFIGURATION_Handle *config)
{
- host = GNUNET_TESTBED_host_create (NULL, NULL, 0);
+ host = GNUNET_TESTBED_host_create ("127.0.0.1", NULL, 0);
GNUNET_assert (NULL != host);
cfg = GNUNET_CONFIGURATION_dup (config);
cp =
Modified: gnunet/src/testbed/testbed_api_hosts.c
===================================================================
--- gnunet/src/testbed/testbed_api_hosts.c 2012-08-14 13:24:09 UTC (rev
23224)
+++ gnunet/src/testbed/testbed_api_hosts.c 2012-08-14 13:38:06 UTC (rev
23225)
@@ -238,7 +238,7 @@
if ((id < host_list_size) && (NULL != host_list[id]))
{
- LOG (GNUNET_ERROR_TYPE_WARNING, "Host with id: %u already created\n");
+ LOG (GNUNET_ERROR_TYPE_WARNING, "Host with id: %u already created\n", id);
return NULL;
}
host = GNUNET_malloc (sizeof (struct GNUNET_TESTBED_Host));
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r23225 - gnunet/src/testbed,
gnunet <=