/**
* How long do we run the test?
*/
-#define TIMEOUT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 30)
+#define TIMEOUT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 300)
static int ok;
if (emsg != NULL)
{
#if VERBOSE
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "Shutdown of peers failed: %s!\n", emsg);
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Shutdown of peers failed: %s!\n",
+ emsg);
#endif
if (ok == 0)
ok = 666;
struct NSEPeer *pos;
#if VERBOSE
- fprintf (stderr, "Ending test.\n");
+ FPRINTF (stderr, "%s", "Ending test.\n");
#endif
while (NULL != (pos = peer_head))
*
*/
static void
-handle_estimate (void *cls,
- struct GNUNET_TIME_Absolute timestamp,
+handle_estimate (void *cls, struct GNUNET_TIME_Absolute timestamp,
double estimate, double std_dev)
{
struct NSEPeer *peer = cls;
- fprintf (stderr,
+ FPRINTF (stderr,
"Received network size estimate from peer %s. logSize: %f std.dev. %f (%f/%u)\n",
- GNUNET_i2s (&peer->daemon->id),
- estimate,
- std_dev, GNUNET_NSE_log_estimate_to_n (estimate), num_peers);
+ GNUNET_i2s (&peer->daemon->id), estimate, std_dev,
+ GNUNET_NSE_log_estimate_to_n (estimate), num_peers);
}
unsigned int i;
#if VERBOSE
- fprintf (stderr, "TEST_NSE_MULTIPEER: connecting to nse service of peers\n");
+ FPRINTF (stderr, "%s", "TEST_NSE_MULTIPEER: connecting to nse service of peers\n");
#endif
for (i = 0; i < num_peers; i++)
{
current_peer = GNUNET_malloc (sizeof (struct NSEPeer));
current_peer->daemon = GNUNET_TESTING_daemon_get (pg, i);
- current_peer->nse_handle = GNUNET_NSE_connect (current_peer->daemon->cfg,
- &handle_estimate,
- current_peer);
+ current_peer->nse_handle =
+ GNUNET_NSE_connect (current_peer->daemon->cfg, &handle_estimate,
+ current_peer);
GNUNET_assert (current_peer->nse_handle != NULL);
GNUNET_CONTAINER_DLL_insert (peer_head, peer_tail, current_peer);
}
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
"Peer Group started successfully, connecting to NSE service for each peer!\n");
#endif
- GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
- "Have %u connections\n", total_connections);
+ GNUNET_log (GNUNET_ERROR_TYPE_WARNING, "Have %u connections\n",
+ total_connections);
GNUNET_SCHEDULER_add_now (&connect_nse_service, NULL);
}
* @param emsg error message (NULL on success)
*/
static void
-connect_cb (void *cls,
- const struct GNUNET_PeerIdentity *first,
- const struct GNUNET_PeerIdentity *second,
- uint32_t distance,
+connect_cb (void *cls, const struct GNUNET_PeerIdentity *first,
+ const struct GNUNET_PeerIdentity *second, uint32_t distance,
const struct GNUNET_CONFIGURATION_Handle *first_cfg,
const struct GNUNET_CONFIGURATION_Handle *second_cfg,
struct GNUNET_TESTING_Daemon *first_daemon,
static void
-run (void *cls,
- char *const *args,
- const char *cfgfile, const struct GNUNET_CONFIGURATION_Handle *cfg)
+run (void *cls, char *const *args, const char *cfgfile,
+ const struct GNUNET_CONFIGURATION_Handle *cfg)
{
struct GNUNET_CONFIGURATION_Handle *testing_cfg;
unsigned long long total_peers;
#if VERBOSE
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Starting daemons.\n");
- GNUNET_CONFIGURATION_set_value_string (testing_cfg,
- "testing", "use_progressbars", "YES");
+ GNUNET_CONFIGURATION_set_value_string (testing_cfg, "testing",
+ "use_progressbars", "YES");
#endif
- if (GNUNET_OK != GNUNET_CONFIGURATION_get_value_number (testing_cfg,
- "testing",
- "num_peers",
- &total_peers))
+ if (GNUNET_OK !=
+ GNUNET_CONFIGURATION_get_value_number (testing_cfg, "testing",
+ "num_peers", &total_peers))
total_peers = NUM_PEERS;
peers_left = total_peers;
num_peers = peers_left;
- pg = GNUNET_TESTING_peergroup_start (testing_cfg,
- peers_left,
- TIMEOUT,
+ pg = GNUNET_TESTING_peergroup_start (testing_cfg, peers_left, TIMEOUT,
&connect_cb, &my_cb, NULL, NULL);
GNUNET_assert (pg != NULL);
GNUNET_SCHEDULER_add_delayed (TIMEOUT, &shutdown_task, NULL);
struct GNUNET_GETOPT_CommandLineOption options[] = {
GNUNET_GETOPT_OPTION_END
};
- GNUNET_PROGRAM_run ((sizeof (argv) / sizeof (char *)) - 1,
- argv, "test-nse-multipeer", "nohelp", options, &run, &ok);
+ GNUNET_PROGRAM_run ((sizeof (argv) / sizeof (char *)) - 1, argv,
+ "test-nse-multipeer", "nohelp", options, &run, &ok);
return ok;
}