/*
This file is part of GNUnet
- (C) 2008--2012 Christian Grothoff (and other contributing authors)
+ (C) 2008--2013 Christian Grothoff (and other contributing authors)
GNUnet is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published
*/
static void
do_shutdown (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
-{
+{
shutdown_task = GNUNET_SCHEDULER_NO_TASK;
if (GNUNET_SCHEDULER_NO_TASK != abort_task)
GNUNET_SCHEDULER_cancel (abort_task);
LOG (GNUNET_ERROR_TYPE_WARNING, "Test timedout -- Aborting\n");
abort_task = GNUNET_SCHEDULER_NO_TASK;
if (GNUNET_SCHEDULER_NO_TASK != shutdown_task)
- GNUNET_SCHEDULER_cancel (shutdown_task);
- shutdown_task = GNUNET_SCHEDULER_add_now (do_shutdown, NULL);
+ GNUNET_SCHEDULER_cancel (shutdown_task);
+ do_shutdown (cls, tc);
}
* @param emsg error message if the operation has failed; will be NULL if the
* operation is successfull
*/
-static void
+static void
peerinfo_cb (void *cb_cls, struct GNUNET_TESTBED_Operation *op_,
- const struct GNUNET_TESTBED_PeerInformation *pinfo,
- const char *emsg)
+ const struct GNUNET_TESTBED_PeerInformation *pinfo,
+ const char *emsg)
{
FAIL_TEST (op == op_);
FAIL_TEST (NULL == cb_cls);
* @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 (NULL == cls);
}
GNUNET_TESTBED_operation_done (op);
op = GNUNET_TESTBED_peer_get_information (peers[0],
- GNUNET_TESTBED_PIT_IDENTITY,
- &peerinfo_cb, NULL);
+ GNUNET_TESTBED_PIT_IDENTITY,
+ &peerinfo_cb, NULL);
}
{
case GNUNET_TESTBED_ET_CONNECT:
FAIL_TEST (event->details.peer_connect.peer1 == peers[0]);
- FAIL_TEST (event->details.peer_connect.peer2 == peers[1]);
+ FAIL_TEST (event->details.peer_connect.peer2 == peers[1]);
break;
default:
FAIL_TEST (0);
- }
+ }
}
*
* @param cls closure
* @param num_peers number of peers in 'peers'
- * @param peers handle to peers run in the testbed
+ * @param peers- handle to peers run in the testbed
+ * @param links_succeeded the number of overlay link connection attempts that
+ * succeeded
+ * @param links_failed the number of overlay link connection attempts that
+ * failed
*/
static void
test_master (void *cls, unsigned int num_peers,
- struct GNUNET_TESTBED_Peer **peers_)
+ struct GNUNET_TESTBED_Peer **peers_,
+ unsigned int links_succeeded,
+ unsigned int links_failed)
{
unsigned int peer;
for (peer = 0; peer < num_peers; peer++)
FAIL_TEST (NULL != peers_[peer]);
peers = peers_;
- op = GNUNET_TESTBED_overlay_connect (NULL, &op_comp_cb, NULL, peers[0], peers[1]);
+ op = GNUNET_TESTBED_overlay_connect (NULL, &op_comp_cb, NULL, peers[0],
+ peers[1]);
abort_task =
GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_relative_multiply
(GNUNET_TIME_UNIT_MINUTES, 3), &do_abort,
event_mask |= (1LL << GNUNET_TESTBED_ET_CONNECT);
event_mask |= (1LL << GNUNET_TESTBED_ET_OPERATION_FINISHED);
(void) GNUNET_TESTBED_test_run ("test_testbed_api_test",
- "test_testbed_api.conf",
- NUM_PEERS, event_mask, &controller_event_cb,
- NULL,
+ "test_testbed_api.conf", NUM_PEERS,
+ event_mask, &controller_event_cb, NULL,
&test_master, NULL);
if (GNUNET_OK != result)
return 1;