/*
This file is part of GNUnet.
- (C) 2009 Christian Grothoff (and other contributing authors)
+ (C) 2009, 2012 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
* @brief testcase for topology maintenance code
*/
#include "platform.h"
-#include "gnunet_testing_lib.h"
+#include "gnunet_testbed_service.h"
-#define VERBOSE GNUNET_NO
-#define NUM_PEERS 2
+#define NUM_PEERS 8
/**
* How long until we give up on connecting the peers?
*/
#define TIMEOUT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 600)
-#define CONNECT_ATTEMPTS 3
-
static int ok;
-static int peers_left;
-
-static int connect_left;
-
-static struct GNUNET_TESTING_PeerGroup *pg;
-
-static struct GNUNET_TESTING_Daemon *first;
-
-static struct GNUNET_TESTING_Daemon *last;
-
-/**
- * Active connection attempt.
- */
-struct GNUNET_TESTING_ConnectContext *cc[NUM_PEERS];
-
-/**
- * Check whether peers successfully shut down.
- */
-static void
-shutdown_callback (void *cls, const char *emsg)
-{
- if (emsg != NULL)
- {
-#if VERBOSE
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Shutdown of peers failed!\n");
-#endif
- if (ok == 0)
- ok = 666;
- }
- else
- {
-#if VERBOSE
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "All peers successfully shut down!\n");
-#endif
- }
-}
+static unsigned int connect_left;
static void
-clean_up_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
+notify_connect_complete (void *cls,
+ struct GNUNET_TESTBED_Operation *op,
+ const char *emsg)
{
- unsigned int i;
-
- for (i=0;i<NUM_PEERS;i++)
- {
- if (NULL != cc[i])
- {
- GNUNET_TESTING_daemons_connect_cancel (cc[i]);
- cc[i] = NULL;
- }
- }
- GNUNET_TESTING_daemons_stop (pg, TIMEOUT, &shutdown_callback, NULL);
- ok = 0;
-}
-
-
-static void
-notify_connect_complete (void *cls, const struct GNUNET_PeerIdentity *first,
- const struct GNUNET_PeerIdentity *second,
- unsigned int distance,
- const struct GNUNET_CONFIGURATION_Handle *first_cfg,
- const struct GNUNET_CONFIGURATION_Handle *second_cfg,
- struct GNUNET_TESTING_Daemon *first_daemon,
- struct GNUNET_TESTING_Daemon *second_daemon,
- const char *emsg)
-{
- struct GNUNET_TESTING_ConnectContext **cc;
- unsigned int i;
-
- *cc = NULL;
+ GNUNET_TESTBED_operation_done (op);
if (NULL != emsg)
{
- fprintf (stderr, "Failed to connect two peers: %s\n", emsg);
- for (i=0;i<NUM_PEERS;i++)
- if (NULL != cc[i])
- {
- GNUNET_TESTING_daemons_connect_cancel (cc[i]);
- cc[i] = NULL;
- }
- GNUNET_TESTING_daemons_stop (pg, TIMEOUT, &shutdown_callback, NULL);
- GNUNET_assert (0);
+ FPRINTF (stderr, "Failed to connect two peers: %s\n", emsg);
+ GNUNET_SCHEDULER_shutdown ();
+ ok = 1;
return;
}
connect_left--;
- if (connect_left == 0)
+ if (0 == connect_left)
{
/* FIXME: check that topology adds a few more links
* in addition to those that were seeded */
- GNUNET_SCHEDULER_add_now (&clean_up_task, NULL);
+ GNUNET_SCHEDULER_shutdown ();
}
}
static void
-my_cb (void *cls, const struct GNUNET_PeerIdentity *id,
- const struct GNUNET_CONFIGURATION_Handle *cfg,
- struct GNUNET_TESTING_Daemon *d, const char *emsg)
+do_connect (void *cls,
+ struct GNUNET_TESTBED_RunHandle *h,
+ unsigned int num_peers,
+ struct GNUNET_TESTBED_Peer **peers,
+ unsigned int links_succeeded,
+ unsigned int links_failed)
{
- GNUNET_assert (id != NULL);
- peers_left--;
- if (first == NULL)
- {
- connect_left = NUM_PEERS;
- first = d;
- last = d;
- return;
- }
- cc[peers_left] = GNUNET_TESTING_daemons_connect (last, d, TIMEOUT, CONNECT_ATTEMPTS,
- GNUNET_YES, ¬ify_connect_complete, &cc[peers_left]);
- if (peers_left == 0)
- {
- /* close circle */
- cc[NUM_PEERS-1] = GNUNET_TESTING_daemons_connect (d, first, TIMEOUT, CONNECT_ATTEMPTS,
- GNUNET_YES, ¬ify_connect_complete, &cc[peers_left]);
- }
-}
-
-
-static void
-run (void *cls, char *const *args, const char *cfgfile,
- const struct GNUNET_CONFIGURATION_Handle *cfg)
-{
- ok = 1;
-#if VERBOSE
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Starting daemons.\n");
-#endif
- peers_left = NUM_PEERS;
- pg = GNUNET_TESTING_daemons_start (cfg, peers_left, peers_left, peers_left,
- TIMEOUT, NULL, NULL, &my_cb, NULL, NULL,
- NULL, NULL);
- GNUNET_assert (pg != NULL);
-}
-
+ unsigned int i;
-static int
-check ()
-{
- char *const argv[] = {
- "test-gnunet-daemon-topology",
- "-c",
- "test_gnunet_daemon_topology_data.conf",
-#if VERBOSE
- "-L", "DEBUG",
-#endif
- NULL
- };
- struct GNUNET_GETOPT_CommandLineOption options[] = {
- GNUNET_GETOPT_OPTION_END
- };
- GNUNET_PROGRAM_run ((sizeof (argv) / sizeof (char *)) - 1, argv,
- "test-gnunet-daemon-topology", "nohelp", options, &run,
- &ok);
- return ok;
+ GNUNET_assert (NUM_PEERS == num_peers);
+ for (i=0;i<num_peers-1;i++)
+ {
+ connect_left++;
+ GNUNET_TESTBED_overlay_connect (NULL,
+ ¬ify_connect_complete, NULL,
+ peers[i], peers[i+1]);
+ }
}
int
main (int argc, char *argv[])
{
- int ret;
-
- GNUNET_log_setup ("test-gnunet-daemon-topology",
-#if VERBOSE
- "DEBUG",
-#else
- "WARNING",
-#endif
- NULL);
- ret = check ();
+ (void) GNUNET_TESTBED_test_run ("test-gnunet-daemon-topology",
+ "test_gnunet_daemon_topology_data.conf",
+ NUM_PEERS,
+ 0, NULL, NULL,
+ &do_connect, NULL);
GNUNET_DISK_directory_remove ("/tmp/test-gnunet-topology");
- return ret;
+ return ok;
}
/* end of test_gnunet_daemon_topology.c */
projects / oweals / gnunet.git / blobdiff