/*
This file is part of GNUnet
- (C) 2008--2013 Christian Grothoff (and other contributing authors)
+ Copyright (C) 2008--2013 GNUnet e.V.
GNUnet is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published
You should have received a copy of the GNU General Public License
along with GNUnet; see the file COPYING. If not, write to the
- Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- Boston, MA 02111-1307, USA.
+ Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ Boston, MA 02110-1301, USA.
*/
/**
MASTER_SLAVE2_PEERS_CONNECTED,
/**
- * Peer on slave 2 successfully stopped
+ * Slave 3 has successfully registered
*/
- SLAVE2_PEER_STOP_SUCCESS,
+ SLAVE3_REGISTERED,
/**
- * Peer destroy on slave 1 successful
+ * Slave 3 has successfully started
*/
- SLAVE1_PEER_DESTROY_SUCCESS,
+ SLAVE3_STARTED,
/**
- * Peer destory on slave 2 successful
+ * Peer created on slave 3
*/
- SLAVE2_PEER_DESTROY_SUCCESS,
+ SLAVE3_PEER_CREATE_SUCCESS,
/**
- * Slave 3 has successfully registered
+ * Peer started at slave 3
*/
- SLAVE3_REGISTERED,
+ SLAVE3_PEER_START_SUCCESS,
/**
- * Slave 3 has successfully started
+ * Try to connect peers on slave2 and slave3
*/
- SLAVE3_STARTED,
+ SLAVE2_SLAVE3_PEERS_CONNECTED,
+
+ /**
+ * Peer on slave 2 successfully stopped
+ */
+ SLAVE2_PEER_STOP_SUCCESS,
+
+ /**
+ * Peer destroy on slave 1 successful
+ */
+ SLAVE1_PEER_DESTROY_SUCCESS,
+
+ /**
+ * Peer destory on slave 2 successful
+ */
+ SLAVE2_PEER_DESTROY_SUCCESS,
/**
* The configuration of slave 3 is acquired
SLAVE3_LINK_SUCCESS,
/**
- * Destory master peer and mark test as success
+ * Master peer destoryed. Destory slave 3 peer
+ */
+ MASTER_PEER_DESTROY_SUCCESS,
+
+ /**
+ * Slave 3 peer destroyed. Mark test as success
*/
SUCCESS,
/**
* Abort task
*/
-static GNUNET_SCHEDULER_TaskIdentifier abort_task;
+static struct GNUNET_SCHEDULER_Task *abort_task;
/**
* Operation handle for linking controllers
*/
static struct GNUNET_TESTBED_Peer *slave2_peer;
+/**
+ * Handle to peer started at slave 2
+ */
+static struct GNUNET_TESTBED_Peer *slave3_peer;
+
/**
* Handle to a peer started at master controller
*/
/**
* The handle for whether a host is habitable or not
*/
-struct GNUNET_TESTBED_HostHabitableCheckHandle *hc_handle;
+static struct GNUNET_TESTBED_HostHabitableCheckHandle *hc_handle;
/**
* The task handle for the delay task
*/
-GNUNET_SCHEDULER_TaskIdentifier delay_task_id;
+static struct GNUNET_SCHEDULER_Task *delay_task_id;
/**
* Event mask
*/
-uint64_t event_mask;
+static uint64_t event_mask;
/**
* Global testing status
#define FAIL_TEST(cond) do { \
if (!(cond)) { \
GNUNET_break(0); \
- if (GNUNET_SCHEDULER_NO_TASK != abort_task) \
+ if (NULL != abort_task) \
GNUNET_SCHEDULER_cancel (abort_task); \
- abort_task = GNUNET_SCHEDULER_NO_TASK; \
- GNUNET_SCHEDULER_add_now (do_shutdown, NULL); \
+ abort_task = NULL; \
+ GNUNET_SCHEDULER_shutdown (); \
return; \
} \
} while (0)
* Shutdown nicely
*
* @param cls NULL
- * @param tc the task context
*/
static void
-do_shutdown (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
+do_shutdown (void *cls)
{
- if (GNUNET_SCHEDULER_NO_TASK != abort_task)
+ if (NULL != abort_task)
GNUNET_SCHEDULER_cancel (abort_task);
- if (GNUNET_SCHEDULER_NO_TASK != delay_task_id)
+ if (NULL != delay_task_id)
{
GNUNET_SCHEDULER_cancel (delay_task_id);
- delay_task_id = GNUNET_SCHEDULER_NO_TASK;
+ delay_task_id = NULL;
}
if (NULL != hc_handle)
GNUNET_TESTBED_is_host_habitable_cancel (hc_handle);
+ if (NULL != op)
+ {
+ GNUNET_TESTBED_operation_done (op);
+ op = NULL;
+ }
+ if (NULL != mc)
+ GNUNET_TESTBED_controller_disconnect (mc);
+ if (NULL != cp)
+ GNUNET_TESTBED_controller_stop (cp);
if (NULL != slave3)
GNUNET_TESTBED_host_destroy (slave3);
if (NULL != slave2)
GNUNET_TESTBED_host_destroy (slave);
if (NULL != host)
GNUNET_TESTBED_host_destroy (host);
- if (NULL != mc)
- GNUNET_TESTBED_controller_disconnect (mc);
if (NULL != cfg)
GNUNET_CONFIGURATION_destroy (cfg);
if (NULL != cfg3)
GNUNET_CONFIGURATION_destroy (cfg3);
- if (NULL != cp)
- GNUNET_TESTBED_controller_stop (cp);
if (NULL != rh)
GNUNET_TESTBED_cancel_registration (rh);
}
* abort task to run on test timed out
*
* @param cls NULL
- * @param tc the task context
*/
static void
-do_abort (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
+do_abort (void *cls)
{
- LOG (GNUNET_ERROR_TYPE_WARNING, "Aborting\n");
- abort_task = GNUNET_SCHEDULER_NO_TASK;
- do_shutdown (cls, tc);
+ LOG (GNUNET_ERROR_TYPE_WARNING,
+ "Aborting in stage %d\n",
+ result);
+ abort_task = NULL;
+ GNUNET_SCHEDULER_shutdown ();
}
static void
do_abort_now (void *cls)
{
- if (GNUNET_SCHEDULER_NO_TASK != abort_task)
+ if (NULL != abort_task)
GNUNET_SCHEDULER_cancel (abort_task);
abort_task = GNUNET_SCHEDULER_add_now (&do_abort, NULL);
}
+/**
+ * Callback which will be called to after a host registration succeeded or failed
+ *
+ * @param cls the host which has been registered
+ * @param emsg the error message; NULL if host registration is successful
+ */
+static void
+registration_cont (void *cls, const char *emsg);
+
+
/**
* Task for inserting delay between tests
*
* @return
*/
static void
-delay_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
+delay_task (void *cls)
{
- delay_task_id = GNUNET_SCHEDULER_NO_TASK;
+ delay_task_id = NULL;
switch (result)
{
case SLAVE2_PEER_CREATE_SUCCESS:
FAIL_TEST (NULL != op);
break;
case MASTER_SLAVE2_PEERS_CONNECTED:
+ slave3 = GNUNET_TESTBED_host_create_with_id (3, "127.0.0.1", NULL, cfg, 0);
+ rh = GNUNET_TESTBED_register_host (mc, slave3, ®istration_cont, NULL);
+ break;
+ case SLAVE2_SLAVE3_PEERS_CONNECTED:
op = GNUNET_TESTBED_peer_stop (NULL, slave2_peer, NULL, NULL);
FAIL_TEST (NULL != op);
break;
* @param emsg NULL if peer is not NULL; else MAY contain the error description
*/
static void
-peer_create_cb (void *cls, struct GNUNET_TESTBED_Peer *peer, const char *emsg)
+peer_create_cb (void *cls,
+ struct GNUNET_TESTBED_Peer *peer,
+ const char *emsg)
{
FAIL_TEST (NULL != peer);
FAIL_TEST (NULL == emsg);
result = SLAVE2_PEER_CREATE_SUCCESS;
slave2_peer = peer;
GNUNET_TESTBED_operation_done (op);
+ op = NULL;
delay_task_id =
GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_relative_multiply
(GNUNET_TIME_UNIT_SECONDS, 1),
&delay_task,
NULL);
+ return;
+ case SLAVE3_STARTED:
+ result = SLAVE3_PEER_CREATE_SUCCESS;
+ slave3_peer = peer;
+ GNUNET_TESTBED_operation_done (op);
+ op = GNUNET_TESTBED_peer_start (NULL, slave3_peer, NULL, NULL);
break;
default:
FAIL_TEST (0);
}
-/**
- * Callback which will be called to after a host registration succeeded or failed
- *
- * @param cls the host which has been registered
- * @param emsg the error message; NULL if host registration is successful
- */
-static void
-registration_cont (void *cls, const char *emsg);
-
-
/**
* Signature of the event handler function called by the
* respective event controller.
* @param event information about the event
*/
static void
-controller_cb (void *cls, const struct GNUNET_TESTBED_EventInformation *event)
+controller_cb (void *cls,
+ const struct GNUNET_TESTBED_EventInformation *event)
{
switch (result)
{
FAIL_TEST (event->details.peer_start.host == host);
FAIL_TEST (event->details.peer_start.peer == master_peer);
GNUNET_TESTBED_operation_done (op);
+ op = NULL;
result = MASTER_PEER_START_SUCCESS;
slave = GNUNET_TESTBED_host_create_with_id (1, "127.0.0.1", NULL, cfg, 0);
FAIL_TEST (NULL != slave);
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);
op = GNUNET_TESTBED_peer_start (NULL, slave2_peer, NULL, NULL);
FAIL_TEST (NULL != op);
break;
+ case SLAVE3_PEER_CREATE_SUCCESS:
+ FAIL_TEST (GNUNET_TESTBED_ET_PEER_START == event->type);
+ FAIL_TEST (event->details.peer_start.host == slave3);
+ FAIL_TEST (event->details.peer_start.peer == slave3_peer);
+ GNUNET_TESTBED_operation_done (op);
+ result = SLAVE3_PEER_START_SUCCESS;
+ sleep (1);
+ LOG_DEBUG ("**************************************\n");
+ op = GNUNET_TESTBED_overlay_connect (mc, NULL, NULL, slave2_peer,
+ slave3_peer);
+ FAIL_TEST (NULL != op);
+ break;
+ case SLAVE3_PEER_START_SUCCESS:
+ FAIL_TEST (NULL != event);
+ FAIL_TEST (GNUNET_TESTBED_ET_CONNECT == event->type);
+ FAIL_TEST (event->details.peer_connect.peer1 == slave2_peer);
+ FAIL_TEST (event->details.peer_connect.peer2 == slave3_peer);
+ result = SLAVE2_SLAVE3_PEERS_CONNECTED;
+ GNUNET_TESTBED_operation_done (op);
+ op = NULL;
+ delay_task_id =
+ GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_relative_multiply
+ (GNUNET_TIME_UNIT_SECONDS, 1), &delay_task,
+ NULL);
+ break;
case SLAVE1_PEER_STOP_SUCCESS:
FAIL_TEST (GNUNET_TESTBED_ET_PEER_START == event->type);
FAIL_TEST (event->details.peer_start.host == slave2);
(GNUNET_TIME_UNIT_SECONDS, 1), &delay_task,
NULL);
break;
- case MASTER_SLAVE2_PEERS_CONNECTED:
+ case SLAVE2_SLAVE3_PEERS_CONNECTED:
FAIL_TEST (GNUNET_TESTBED_ET_PEER_STOP == event->type);
FAIL_TEST (event->details.peer_stop.peer == slave2_peer);
GNUNET_TESTBED_operation_done (op);
GNUNET_TESTBED_operation_done (op);
op = NULL;
result = SLAVE2_PEER_DESTROY_SUCCESS;
- slave3 = GNUNET_TESTBED_host_create_with_id (3, "127.0.0.1", NULL, cfg, 0);
- rh = GNUNET_TESTBED_register_host (mc, slave3, ®istration_cont, NULL);
- break;
- case SLAVE3_REGISTERED:
- check_operation_success (event);
- GNUNET_TESTBED_operation_done (op);
- op = NULL;
- result = SLAVE3_STARTED;
op = GNUNET_TESTBED_get_slave_config (NULL, mc, slave3);
FAIL_TEST (NULL != op);
break;
- case SLAVE3_STARTED:
+ case SLAVE2_PEER_DESTROY_SUCCESS:
FAIL_TEST (NULL != event);
FAIL_TEST (GNUNET_TESTBED_ET_OPERATION_FINISHED == event->type);
FAIL_TEST (event->op == op);
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);
+ GNUNET_TESTBED_operation_done (op);
+ result = SLAVE3_STARTED;
+ op = GNUNET_TESTBED_peer_create (mc, slave3, cfg, peer_create_cb, NULL);
+ FAIL_TEST (NULL != op);
break;
case SLAVE3_GET_CONFIG_SUCCESS:
result = SLAVE3_LINK_SUCCESS;
break;
case SLAVE3_LINK_SUCCESS:
check_operation_success (event);
+ result = MASTER_PEER_DESTROY_SUCCESS;
+ GNUNET_TESTBED_operation_done (op);
+ op = GNUNET_TESTBED_peer_destroy (slave3_peer);
+ break;
+ case MASTER_PEER_DESTROY_SUCCESS:
result = SUCCESS;
GNUNET_TESTBED_operation_done (op);
op = NULL;
- GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_relative_multiply
- (GNUNET_TIME_UNIT_SECONDS, 3), &do_shutdown,
- NULL);
+ GNUNET_SCHEDULER_shutdown ();
break;
default:
FAIL_TEST (0);
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 SLAVE2_PEER_DESTROY_SUCCESS:
+ case MASTER_SLAVE2_PEERS_CONNECTED:
FAIL_TEST (NULL == 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:
/**
- * Callbacks of this type are called by GNUNET_TESTBED_is_host_habitable to
+ * Callbacks of this type are called by #GNUNET_TESTBED_is_host_habitable to
* inform whether the given host is habitable or not. The Handle returned by
* GNUNET_TESTBED_is_host_habitable() is invalid after this callback is called
*
* @param cls NULL
* @param host the host whose status is being reported; will be NULL if the host
* given to GNUNET_TESTBED_is_host_habitable() is NULL
- * @param status GNUNET_YES if it is habitable; GNUNET_NO if not
+ * @param status #GNUNET_YES if it is habitable; #GNUNET_NO if not
*/
static void
-host_habitable_cb (void *cls, const struct GNUNET_TESTBED_Host *_host,
+host_habitable_cb (void *cls,
+ const struct GNUNET_TESTBED_Host *_host,
int status)
{
hc_handle = NULL;
"to use password less SSH logins to localhost.\n"
"Skipping test\n");
GNUNET_SCHEDULER_cancel (abort_task);
- abort_task = GNUNET_SCHEDULER_NO_TASK;
- (void) GNUNET_SCHEDULER_add_now (&do_shutdown, NULL);
+ abort_task = NULL;
+ GNUNET_SCHEDULER_shutdown ();
result = SKIP;
return;
}
* Main run function.
*
* @param cls NULL
- * @param args arguments passed to GNUNET_PROGRAM_run
+ * @param args arguments passed to #GNUNET_PROGRAM_run()
* @param cfgfile the path to configuration file
* @param cfg the configuration file handle
*/
GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_relative_multiply
(GNUNET_TIME_UNIT_MINUTES, 5), &do_abort,
NULL);
+ GNUNET_SCHEDULER_add_shutdown (&do_shutdown,
+ NULL);
}
projects / oweals / gnunet.git / blobdiff