*/
#define NUM_PEERS 25
+/**
+ * Array of peers
+ */
+static struct GNUNET_TESTBED_Peer **peers;
+
+/**
+ * Operation handle
+ */
+static struct GNUNET_TESTBED_Operation *op;
+
/**
* Testing result
*/
* @param tc the task context
*/
static void
-do_shutdown (void *cls, const const struct GNUNET_SCHEDULER_TaskContext *tc)
+do_shutdown (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
{
GNUNET_SCHEDULER_shutdown ();
}
+/**
+ * Callback to be called when the requested peer information is available
+ *
+ * @param cb_cls the closure from GNUNET_TETSBED_peer_get_information()
+ * @param op the operation this callback corresponds to
+ * @param pinfo the result; will be NULL if the operation has failed
+ * @param emsg error message if the operation has failed; will be NULL if the
+ * operation is successfull
+ */
+static void
+peerinfo_cb (void *cb_cls, struct GNUNET_TESTBED_Operation *op_,
+ const struct GNUNET_TESTBED_PeerInformation *pinfo,
+ const char *emsg)
+{
+ GNUNET_assert (op == op_);
+ GNUNET_assert (NULL == cb_cls);
+ GNUNET_assert (NULL == emsg);
+ GNUNET_assert (GNUNET_TESTBED_PIT_IDENTITY == pinfo->pit);
+ GNUNET_assert (NULL != pinfo->result.id);
+ GNUNET_TESTBED_operation_done (op);
+ result = GNUNET_OK;
+ GNUNET_SCHEDULER_add_now (&do_shutdown, NULL);
+}
+
+
+/**
+ * Callback to be called when an operation is completed
+ *
+ * @param cls the callback closure from functions generating an operation
+ * @param op the operation that has been finished
+ * @param emsg error message in case the operation has failed; will be NULL if
+ * operation has executed successfully.
+ */
+static void
+op_comp_cb (void *cls, struct GNUNET_TESTBED_Operation *op_, const char *emsg)
+{
+ GNUNET_assert (NULL == cls);
+ GNUNET_assert (op == op_);
+ GNUNET_assert (NULL == emsg);
+ GNUNET_TESTBED_operation_done (op);
+ op = GNUNET_TESTBED_peer_get_information (peers[0],
+ GNUNET_TESTBED_PIT_IDENTITY,
+ &peerinfo_cb, NULL);
+}
+
+
+/**
+ * Controller event callback
+ *
+ * @param cls NULL
+ * @param event the controller event
+ */
+static void
+controller_event_cb (void *cls,
+ const struct GNUNET_TESTBED_EventInformation *event)
+{
+ switch (event->type)
+ {
+ case GNUNET_TESTBED_ET_CONNECT:
+ GNUNET_assert (event->details.peer_connect.peer1 == peers[0]);
+ GNUNET_assert (event->details.peer_connect.peer2 == peers[1]);
+ break;
+ default:
+ GNUNET_assert (0);
+ }
+}
+
+
/**
* Signature of a main function for a testcase.
*
*/
static void
test_master (void *cls, unsigned int num_peers,
- struct GNUNET_TESTBED_Peer **peers)
+ struct GNUNET_TESTBED_Peer **peers_)
{
unsigned int peer;
GNUNET_assert (NULL == cls);
GNUNET_assert (NUM_PEERS == num_peers);
- GNUNET_assert (NULL != peers);
+ GNUNET_assert (NULL != peers_);
for (peer = 0; peer < num_peers; peer++)
- GNUNET_assert (NULL != peers[peer]);
- result = GNUNET_OK;
- /* Artificial delay for shutdown */
- GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_SECONDS, &do_shutdown, NULL);
+ GNUNET_assert (NULL != peers_[peer]);
+ peers = peers_;
+ op = GNUNET_TESTBED_overlay_connect (NULL, &op_comp_cb, NULL, peers[0], peers[1]);
}
int
main (int argc, char **argv)
{
+ uint64_t event_mask;
+
result = GNUNET_SYSERR;
+ event_mask = 0;
+ event_mask |= (1LL << GNUNET_TESTBED_ET_CONNECT);
+ event_mask |= (1LL << GNUNET_TESTBED_ET_OPERATION_FINISHED);
GNUNET_TESTBED_test_run ("test_testbed_api_test", "test_testbed_api.conf",
- NUM_PEERS, &test_master, NULL);
+ NUM_PEERS, event_mask, &controller_event_cb, NULL,
+ &test_master, NULL);
if (GNUNET_OK != result)
return 1;
return 0;