*/
static enum Stage result;
+
/**
* shortcut to exit during failure
*/
} \
} while (0)
+
/**
* Shutdown nicely
*
* @param emsg error message in case the operation has failed; will be NULL if
* operation has executed successfully.
*/
-static void
+static void
op_comp_cb (void *cls, struct GNUNET_TESTBED_Operation *op, const char *emsg);
{
delayed_connect_task = GNUNET_SCHEDULER_NO_TASK;
FAIL_TEST (NULL == common_operation);
- common_operation = GNUNET_TESTBED_overlay_connect (NULL, &op_comp_cb, NULL,
- peer1.peer, peer2.peer);
+ common_operation =
+ GNUNET_TESTBED_overlay_connect (NULL, &op_comp_cb, NULL, peer1.peer,
+ peer2.peer);
}
* @param emsg error message in case the operation has failed; will be NULL if
* operation has executed successfully.
*/
-static void
+static void
op_comp_cb (void *cls, struct GNUNET_TESTBED_Operation *op, const char *emsg)
{
FAIL_TEST (common_operation == op);
- switch(result)
+ switch (result)
{
case PEERS_STARTED:
FAIL_TEST (NULL == peer1.operation);
FAIL_TEST (NULL == peer2.operation);
FAIL_TEST (NULL != common_operation);
- GNUNET_TESTBED_operation_done (common_operation);
- common_operation = NULL;
- result = PEERS_CONNECTED;
- LOG (GNUNET_ERROR_TYPE_DEBUG, "Peers connected\n");
- delayed_connect_task =
- GNUNET_SCHEDULER_add_delayed (TIME_REL_SECS (3),
- &do_delayed_connect, NULL);
break;
case PEERS_CONNECTED:
FAIL_TEST (NULL == peer1.operation);
FAIL_TEST (NULL == peer2.operation);
FAIL_TEST (NULL != common_operation);
- GNUNET_TESTBED_operation_done (common_operation);
- common_operation = NULL;
- result = PEERS_CONNECTED_2;
- LOG (GNUNET_ERROR_TYPE_DEBUG, "Peers connected again\n");
- peer1.operation = GNUNET_TESTBED_peer_stop (peer1.peer, NULL, NULL);
- peer2.operation = GNUNET_TESTBED_peer_stop (peer2.peer, NULL, NULL);
break;
default:
FAIL_TEST (0);
result = PEERS_STARTED;
common_operation =
GNUNET_TESTBED_overlay_connect (NULL, &op_comp_cb, NULL, peer1.peer,
- peer2.peer);
+ peer2.peer);
}
break;
case GNUNET_TESTBED_ET_PEER_STOP:
switch (result)
{
case PEERS_STARTED:
- case PEERS_CONNECTED:
FAIL_TEST (NULL == peer1.operation);
FAIL_TEST (NULL == peer2.operation);
FAIL_TEST (NULL != common_operation);
FAIL_TEST ((event->details.peer_connect.peer1 == peer1.peer) &&
- (event->details.peer_connect.peer2 == peer2.peer));
+ (event->details.peer_connect.peer2 == peer2.peer));
+ GNUNET_TESTBED_operation_done (common_operation);
+ common_operation = NULL;
+ result = PEERS_CONNECTED;
+ LOG (GNUNET_ERROR_TYPE_DEBUG, "Peers connected\n");
+ delayed_connect_task =
+ GNUNET_SCHEDULER_add_delayed (TIME_REL_SECS (3), &do_delayed_connect,
+ NULL);
+ break;
+ case PEERS_CONNECTED:
+ FAIL_TEST (NULL == peer1.operation);
+ FAIL_TEST (NULL == peer2.operation);
+ FAIL_TEST (NULL != common_operation);
+ GNUNET_TESTBED_operation_done (common_operation);
+ common_operation = NULL;
+ result = PEERS_CONNECTED_2;
+ LOG (GNUNET_ERROR_TYPE_DEBUG, "Peers connected again\n");
+ peer1.operation = GNUNET_TESTBED_peer_stop (peer1.peer, NULL, NULL);
+ peer2.operation = GNUNET_TESTBED_peer_stop (peer2.peer, NULL, NULL);
break;
default:
FAIL_TEST (0);
{
uint64_t event_mask;
- FAIL_TEST (GNUNET_OK == status);
+ if (GNUNET_OK != status)
+ {
+ cp = NULL;
+ FAIL_TEST (0);
+ }
event_mask = 0;
event_mask |= (1L << GNUNET_TESTBED_ET_PEER_START);
event_mask |= (1L << GNUNET_TESTBED_ET_PEER_STOP);