#include "gnunet_dht_service.h"
/* DEFINES */
-#define VERBOSE GNUNET_YES
+#define VERBOSE GNUNET_NO
#define MAX_GET_ATTEMPTS 10
static struct GNUNET_TESTING_PeerGroup *pg;
-static struct GNUNET_SCHEDULER_Handle *sched;
-
static unsigned long long num_peers;
static unsigned int total_gets;
/**
* Check whether peers successfully shut down.
*/
-void shutdown_callback (void *cls,
- const char *emsg)
+void
+shutdown_callback (void *cls, const char *emsg)
{
if (emsg != NULL)
- {
- if (ok == 0)
- ok = 2;
- }
+ {
+ if (ok == 0)
+ ok = 2;
+ }
}
static void
-finish_testing (void *cls, const struct GNUNET_SCHEDULER_TaskContext * tc)
+finish_testing (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
{
GNUNET_assert (pg != NULL);
GNUNET_assert (peer1dht != NULL);
GNUNET_assert (peer2dht != NULL);
- GNUNET_DHT_disconnect(peer1dht);
- GNUNET_DHT_disconnect(peer2dht);
+ GNUNET_DHT_disconnect (peer1dht);
+ GNUNET_DHT_disconnect (peer2dht);
GNUNET_TESTING_daemons_stop (pg, TIMEOUT, &shutdown_callback, NULL);
ok = 0;
}
static void
-end_badly_cont (void *cls, const struct GNUNET_SCHEDULER_TaskContext * tc)
+end_badly_cont (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
{
if (peer1dht != NULL)
- GNUNET_DHT_disconnect(peer1dht);
+ GNUNET_DHT_disconnect (peer1dht);
if (peer2dht != NULL)
- GNUNET_DHT_disconnect(peer2dht);
+ GNUNET_DHT_disconnect (peer2dht);
if (pg != NULL)
GNUNET_TESTING_daemons_stop (pg, TIMEOUT, &shutdown_callback, NULL);
if (curr_get_ctx.retry_task != GNUNET_SCHEDULER_NO_TASK)
- GNUNET_SCHEDULER_cancel(sched, curr_get_ctx.retry_task);
+ GNUNET_SCHEDULER_cancel (curr_get_ctx.retry_task);
}
static void
-end_badly (void *cls, const struct GNUNET_SCHEDULER_TaskContext * tc)
+end_badly (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
{
if (curr_get_ctx.retry_task != GNUNET_SCHEDULER_NO_TASK)
- GNUNET_SCHEDULER_cancel(sched, curr_get_ctx.retry_task);
+ GNUNET_SCHEDULER_cancel (curr_get_ctx.retry_task);
if (curr_get_ctx.get_handle != NULL)
{
- GNUNET_DHT_get_stop(curr_get_ctx.get_handle);
- GNUNET_SCHEDULER_add_now (sched, &end_badly_cont, NULL);
+ GNUNET_DHT_get_stop (curr_get_ctx.get_handle);
}
+ GNUNET_SCHEDULER_add_now (&end_badly_cont, NULL);
ok = 1;
}
/* Forward declaration */
-static void
-do_get (void *cls, const struct GNUNET_SCHEDULER_TaskContext * tc);
+static void do_get (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc);
/**
* Iterator called on each result obtained for a DHT
* @param size number of bytes in data
* @param data pointer to the result data
*/
-void get_result_iterator (void *cls,
- struct GNUNET_TIME_Absolute exp,
- const GNUNET_HashCode * key,
- const struct GNUNET_PeerIdentity * const *get_path,
- const struct GNUNET_PeerIdentity * const *put_path,
- enum GNUNET_BLOCK_Type type,
- size_t size,
- const void *data)
+void
+get_result_iterator (void *cls,
+ struct GNUNET_TIME_Absolute exp,
+ const GNUNET_HashCode * key,
+ const struct GNUNET_PeerIdentity *const *get_path,
+ const struct GNUNET_PeerIdentity *const *put_path,
+ enum GNUNET_BLOCK_Type type, size_t size, const void *data)
{
struct PeerGetContext *get_context = cls;
- if (0 != memcmp(&get_context->peer->hashPubKey, key, sizeof (GNUNET_HashCode)))
+ if (0 !=
+ memcmp (&get_context->peer->hashPubKey, key, sizeof (GNUNET_HashCode)))
{
- GNUNET_log (GNUNET_ERROR_TYPE_WARNING, "Key returned is not the same key as was searched for!\n");
- GNUNET_SCHEDULER_cancel(sched, die_task);
- GNUNET_SCHEDULER_add_now(sched, &end_badly, "key mismatch in get response!\n");
+ GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
+ "Key returned is not the same key as was searched for!\n");
+ GNUNET_SCHEDULER_cancel (die_task);
+ GNUNET_SCHEDULER_add_now (&end_badly, "key mismatch in get response!\n");
return;
}
if (get_context->retry_task != GNUNET_SCHEDULER_NO_TASK)
- {
- GNUNET_SCHEDULER_cancel(sched, get_context->retry_task);
- get_context->retry_task = GNUNET_SCHEDULER_NO_TASK;
- }
+ {
+ GNUNET_SCHEDULER_cancel (get_context->retry_task);
+ get_context->retry_task = GNUNET_SCHEDULER_NO_TASK;
+ }
if (get_context->peer == &peer2id)
{
get_context->peer = &peer1id;
get_context->dht_handle = peer2dht;
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Received first correct GET request response!\n");
- GNUNET_DHT_get_stop(get_context->get_handle);
- GNUNET_SCHEDULER_add_now (sched, &do_get, get_context);
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Received first correct GET request response!\n");
+ GNUNET_DHT_get_stop (get_context->get_handle);
+ GNUNET_SCHEDULER_add_now (&do_get, get_context);
}
else
{
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Received second correct GET request response!\n");
- GNUNET_SCHEDULER_cancel(sched, die_task);
- GNUNET_DHT_get_stop(get_context->get_handle);
- GNUNET_SCHEDULER_add_now (sched, &finish_testing, NULL);
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Received second correct GET request response!\n");
+ GNUNET_SCHEDULER_cancel (die_task);
+ GNUNET_DHT_get_stop (get_context->get_handle);
+ GNUNET_SCHEDULER_add_now (&finish_testing, NULL);
}
}
static void
-stop_retry_get (void *cls, const struct GNUNET_SCHEDULER_TaskContext * tc);
+stop_retry_get (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc);
static void
-get_stop_finished (void *cls, const struct GNUNET_SCHEDULER_TaskContext * tc)
+get_stop_finished (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
{
struct PeerGetContext *get_context = cls;
if (get_context->get_attempts < MAX_GET_ATTEMPTS)
- GNUNET_log(GNUNET_ERROR_TYPE_DEBUG, "Get attempt %u failed, retrying request!\n", get_context->get_attempts);
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Get attempt %u failed, retrying request!\n",
+ get_context->get_attempts);
else
- {
- GNUNET_log(GNUNET_ERROR_TYPE_DEBUG, "Too many attempts failed, ending test!\n", get_context->get_attempts);
- GNUNET_SCHEDULER_cancel(sched, die_task);
- GNUNET_SCHEDULER_add_now(sched, &end_badly, "key mismatch in get response!\n");
- return;
- }
+ {
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Too many attempts failed, ending test!\n",
+ get_context->get_attempts);
+ GNUNET_SCHEDULER_cancel (die_task);
+ GNUNET_SCHEDULER_add_now (&end_badly, "key mismatch in get response!\n");
+ return;
+ }
get_context->get_attempts++;
- get_context->retry_task = GNUNET_SCHEDULER_add_delayed(sched,
- GNUNET_TIME_relative_multiply(GNUNET_TIME_UNIT_SECONDS, 10),
- &stop_retry_get, get_context);
- get_context->get_handle = GNUNET_DHT_get_start(get_context->dht_handle,
- GNUNET_TIME_relative_multiply(GNUNET_TIME_UNIT_SECONDS, 5),
- 0 /* fixme: use real type */, &get_context->peer->hashPubKey,
- GNUNET_DHT_RO_NONE,
- NULL, 0,
- NULL, 0,
- &get_result_iterator, get_context);
+ get_context->retry_task =
+ GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_relative_multiply
+ (GNUNET_TIME_UNIT_SECONDS, 10),
+ &stop_retry_get, get_context);
+ get_context->get_handle =
+ GNUNET_DHT_get_start (get_context->dht_handle,
+ GNUNET_TIME_relative_multiply
+ (GNUNET_TIME_UNIT_SECONDS, 5),
+ GNUNET_BLOCK_TYPE_DHT_HELLO,
+ &get_context->peer->hashPubKey,
+ DEFAULT_GET_REPLICATION, GNUNET_DHT_RO_NONE, NULL,
+ 0, NULL, 0, &get_result_iterator, get_context);
}
static void
-stop_retry_get (void *cls, const struct GNUNET_SCHEDULER_TaskContext * tc)
+stop_retry_get (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
{
struct PeerGetContext *get_context = cls;
+
get_context->retry_task = GNUNET_SCHEDULER_NO_TASK;
- GNUNET_log(GNUNET_ERROR_TYPE_DEBUG, "Get attempt %u failed, canceling request!\n", get_context->get_attempts);
- GNUNET_DHT_get_stop(get_context->get_handle);
- GNUNET_SCHEDULER_add_now(sched, &get_stop_finished, get_context);
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Get attempt %u failed, canceling request!\n",
+ get_context->get_attempts);
+ GNUNET_DHT_get_stop (get_context->get_handle);
+ get_context->get_handle = NULL;
+ GNUNET_SCHEDULER_add_now (&get_stop_finished, get_context);
}
static void
-do_get (void *cls, const struct GNUNET_SCHEDULER_TaskContext * tc)
+do_get (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
{
struct PeerGetContext *get_context = cls;
- get_context->retry_task = GNUNET_SCHEDULER_add_delayed(sched,
- GNUNET_TIME_relative_multiply(GNUNET_TIME_UNIT_SECONDS, 10),
- &stop_retry_get, get_context);
-
- get_context->get_handle = GNUNET_DHT_get_start(get_context->dht_handle,
- GNUNET_TIME_relative_multiply(GNUNET_TIME_UNIT_SECONDS, 5),
- GNUNET_BLOCK_TYPE_DHT_HELLO,
- &get_context->peer->hashPubKey,
- GNUNET_DHT_RO_NONE,
- NULL, 0,
- NULL, 0,
- &get_result_iterator, get_context);
+ get_context->retry_task =
+ GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_relative_multiply
+ (GNUNET_TIME_UNIT_SECONDS, 10),
+ &stop_retry_get, get_context);
+
+ get_context->get_handle = GNUNET_DHT_get_start (get_context->dht_handle,
+ GNUNET_TIME_relative_multiply
+ (GNUNET_TIME_UNIT_SECONDS, 5),
+ GNUNET_BLOCK_TYPE_DHT_HELLO,
+ &get_context->
+ peer->hashPubKey,
+ DEFAULT_GET_REPLICATION,
+ GNUNET_DHT_RO_NONE, NULL, 0,
+ NULL, 0, &get_result_iterator,
+ get_context);
}
const char *emsg)
{
if (emsg == NULL)
- {
- total_connections++;
+ {
+ total_connections++;
#if VERBOSE
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "connected peer %s to peer %s, distance %u\n",
- first_daemon->shortname,
- second_daemon->shortname,
- distance);
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "connected peer %s to peer %s, distance %u\n",
+ first_daemon->shortname, second_daemon->shortname, distance);
#endif
- }
+ }
#if VERBOSE
else
- {
- failed_connections++;
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Failed to connect peer %s to peer %s with error :\n%s\n",
- first_daemon->shortname,
- second_daemon->shortname, emsg);
- }
+ {
+ failed_connections++;
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Failed to connect peer %s to peer %s with error :\n%s\n",
+ first_daemon->shortname, second_daemon->shortname, emsg);
+ }
#endif
if (total_connections == expected_connections)
- {
+ {
#if VERBOSE
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "Created %d total connections, which is our target number! Starting next phase of testing.\n",
- total_connections);
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Created %d total connections, which is our target number! Starting next phase of testing.\n",
+ total_connections);
#endif
- GNUNET_SCHEDULER_cancel (sched, die_task);
- die_task = GNUNET_SCHEDULER_add_delayed (sched, TIMEOUT,
- &end_badly, "from test gets");
-
- curr_get_ctx.dht_handle = peer1dht;
- curr_get_ctx.peer = &peer2id;
- //GNUNET_SCHEDULER_add_now (sched, &do_get, &curr_get_ctx);
- GNUNET_SCHEDULER_add_delayed (sched, GNUNET_TIME_relative_multiply(GNUNET_TIME_UNIT_SECONDS, 2), &do_get, &curr_get_ctx);
- }
+ GNUNET_SCHEDULER_cancel (die_task);
+ die_task = GNUNET_SCHEDULER_add_delayed (TIMEOUT,
+ &end_badly, "from test gets");
+
+ curr_get_ctx.dht_handle = peer1dht;
+ curr_get_ctx.peer = &peer2id;
+ GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_relative_multiply
+ (GNUNET_TIME_UNIT_SECONDS, 2), &do_get,
+ &curr_get_ctx);
+ }
else if (total_connections + failed_connections == expected_connections)
- {
- GNUNET_SCHEDULER_cancel (sched, die_task);
- die_task = GNUNET_SCHEDULER_add_now (sched,
- &end_badly, "from topology_callback (too many failed connections)");
- }
+ {
+ GNUNET_SCHEDULER_cancel (die_task);
+ die_task =
+ GNUNET_SCHEDULER_add_now (&end_badly,
+ "from topology_callback (too many failed connections)");
+ }
}
static void
-connect_topology (void *cls, const struct GNUNET_SCHEDULER_TaskContext * tc)
+connect_topology (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
{
expected_connections = -1;
if ((pg != NULL) && (peers_left == 0))
- expected_connections = GNUNET_TESTING_connect_topology (pg, GNUNET_TESTING_TOPOLOGY_CLIQUE, GNUNET_TESTING_TOPOLOGY_OPTION_ALL, 0.0);
-
- GNUNET_SCHEDULER_cancel (sched, die_task);
+ expected_connections = GNUNET_TESTING_connect_topology (pg,
+ GNUNET_TESTING_TOPOLOGY_CLIQUE,
+ GNUNET_TESTING_TOPOLOGY_OPTION_ALL,
+ 0.0,
+ TIMEOUT, 12, NULL,
+ NULL);
+
+ GNUNET_SCHEDULER_cancel (die_task);
if (expected_connections == GNUNET_SYSERR)
- die_task = GNUNET_SCHEDULER_add_now (sched,
- &end_badly, "from connect topology (bad return)");
+ die_task =
+ GNUNET_SCHEDULER_add_now (&end_badly,
+ "from connect topology (bad return)");
- die_task = GNUNET_SCHEDULER_add_delayed (sched,
- TIMEOUT,
- &end_badly, "from connect topology (timeout)");
+ die_task = GNUNET_SCHEDULER_add_delayed (TIMEOUT,
+ &end_badly,
+ "from connect topology (timeout)");
}
static void
peers_started_callback (void *cls,
- const struct GNUNET_PeerIdentity *id,
- const struct GNUNET_CONFIGURATION_Handle *cfg,
- struct GNUNET_TESTING_Daemon *d, const char *emsg)
+ const struct GNUNET_PeerIdentity *id,
+ const struct GNUNET_CONFIGURATION_Handle *cfg,
+ struct GNUNET_TESTING_Daemon *d, const char *emsg)
{
if (emsg != NULL)
- {
- GNUNET_log (GNUNET_ERROR_TYPE_WARNING, "Failed to start daemon with error: `%s'\n",
- emsg);
- return;
- }
+ {
+ GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
+ "Failed to start daemon with error: `%s'\n", emsg);
+ return;
+ }
GNUNET_assert (id != NULL);
if (peers_left == num_peers)
{
- memcpy(&peer1id, id, sizeof(struct GNUNET_PeerIdentity));
- peer1dht = GNUNET_DHT_connect(sched, cfg, 100);
+ memcpy (&peer1id, id, sizeof (struct GNUNET_PeerIdentity));
+ peer1dht = GNUNET_DHT_connect (cfg, 100);
if (peer1dht == NULL)
{
- GNUNET_SCHEDULER_cancel (sched, die_task);
- GNUNET_SCHEDULER_add_now(sched, &end_badly, "Failed to get dht handle!\n");
+ GNUNET_SCHEDULER_cancel (die_task);
+ GNUNET_SCHEDULER_add_now (&end_badly, "Failed to get dht handle!\n");
}
}
else
{
- memcpy(&peer2id, id, sizeof(struct GNUNET_PeerIdentity));
- peer2dht = GNUNET_DHT_connect(sched, cfg, 100);
+ memcpy (&peer2id, id, sizeof (struct GNUNET_PeerIdentity));
+ peer2dht = GNUNET_DHT_connect (cfg, 100);
if (peer2dht == NULL)
{
- GNUNET_SCHEDULER_cancel (sched, die_task);
- GNUNET_SCHEDULER_add_now(sched, &end_badly, "Failed to get dht handle!\n");
+ GNUNET_SCHEDULER_cancel (die_task);
+ GNUNET_SCHEDULER_add_now (&end_badly, "Failed to get dht handle!\n");
}
}
peers_left--;
if (peers_left == 0)
- {
+ {
#if VERBOSE
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "All %d daemons started, now connecting peers!\n",
- num_peers);
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "All %d daemons started, now connecting peers!\n", num_peers);
#endif
- GNUNET_SCHEDULER_cancel (sched, die_task);
- /* Set up task in case topology creation doesn't finish
- * within a reasonable amount of time */
- die_task = GNUNET_SCHEDULER_add_delayed (sched,
- TIMEOUT,
- &end_badly, "from peers_started_callback");
-
- GNUNET_SCHEDULER_add_now(sched, &connect_topology, NULL);
- ok = 0;
- }
+ GNUNET_SCHEDULER_cancel (die_task);
+ /* Set up task in case topology creation doesn't finish
+ * within a reasonable amount of time */
+ die_task = GNUNET_SCHEDULER_add_delayed (TIMEOUT,
+ &end_badly,
+ "from peers_started_callback");
+
+ GNUNET_SCHEDULER_add_now (&connect_topology, NULL);
+ ok = 0;
+ }
}
static void
run (void *cls,
- struct GNUNET_SCHEDULER_Handle *s,
char *const *args,
const char *cfgfile, const struct GNUNET_CONFIGURATION_Handle *cfg)
{
- sched = s;
- if (GNUNET_YES != GNUNET_CONFIGURATION_get_value_string(cfg, "paths", "servicehome", &test_directory))
- {
- ok = 404;
- return;
- }
+ if (GNUNET_YES !=
+ GNUNET_CONFIGURATION_get_value_string (cfg, "paths", "servicehome",
+ &test_directory))
+ {
+ ok = 404;
+ return;
+ }
if (GNUNET_SYSERR ==
GNUNET_CONFIGURATION_get_value_number (cfg, "testing", "num_peers",
total_gets = num_peers;
gets_succeeded = 0;
/* Set up a task to end testing if peer start fails */
- die_task = GNUNET_SCHEDULER_add_delayed (sched,
- TIMEOUT,
- &end_badly, "didn't start all daemons in reasonable amount of time!!!");
-
- pg = GNUNET_TESTING_daemons_start (sched, cfg,
- num_peers, TIMEOUT, NULL, NULL, &peers_started_callback, NULL,
- &topology_callback, NULL, NULL);
+ die_task = GNUNET_SCHEDULER_add_delayed (TIMEOUT,
+ &end_badly,
+ "didn't start all daemons in reasonable amount of time!!!");
+
+ pg = GNUNET_TESTING_daemons_start (cfg,
+ num_peers,
+ 10,
+ num_peers,
+ TIMEOUT,
+ NULL, NULL,
+ &peers_started_callback,
+ NULL, &topology_callback, NULL, NULL);
}
check ()
{
int ret;
- char *const argv[] = {"test-dht-twopeer",
+
+ char *const argv[] = { "test-dht-twopeer",
"-c",
"test_dht_twopeer_data.conf",
#if VERBOSE
GNUNET_GETOPT_OPTION_END
};
ret = GNUNET_PROGRAM_run ((sizeof (argv) / sizeof (char *)) - 1,
- argv, "test-dht-twopeer", "nohelp",
- options, &run, &ok);
+ argv, "test-dht-twopeer", "nohelp",
+ options, &run, &ok);
if (ret != GNUNET_OK)
- {
- GNUNET_log(GNUNET_ERROR_TYPE_WARNING, "`test-dht-twopeer': Failed with error code %d\n", ret);
- }
+ {
+ GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
+ "`test-dht-twopeer': Failed with error code %d\n", ret);
+ }
return ok;
}
* of by the testing framework.
*/
if (GNUNET_DISK_directory_remove (test_directory) != GNUNET_OK)
- {
- GNUNET_log(GNUNET_ERROR_TYPE_WARNING, "Failed to remove testing directory %s\n", test_directory);
- }
+ {
+ GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
+ "Failed to remove testing directory %s\n", test_directory);
+ }
return ret;
}
projects / oweals / gnunet.git / blobdiff