GNUnet is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published
- by the Free Software Foundation; either version 2, or (at your
+ by the Free Software Foundation; either version 3, or (at your
option) any later version.
GNUnet is distributed in the hope that it will be useful, but
#include "gnunet_program_lib.h"
#include "gnunet_scheduler_lib.h"
#include "gnunet_dht_service.h"
+#include "gnunet_hello_lib.h"
#define VERBOSE GNUNET_NO
/**
* How long until we really give up on a particular testcase portion?
*/
-#define TOTAL_TIMEOUT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 50)
+#define TOTAL_TIMEOUT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 360)
/**
* How long until we give up on any particular operation (and retry)?
static struct PeerContext p1;
+struct RetryContext retry_context;
+
static struct GNUNET_SCHEDULER_Handle *sched;
static int ok;
static void
end (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
{
- /* do work here */
GNUNET_SCHEDULER_cancel (sched, die_task);
-
- GNUNET_DHT_disconnect (p1.dht_handle);
-
die_task = GNUNET_SCHEDULER_NO_TASK;
-
- if (tc->reason == GNUNET_SCHEDULER_REASON_TIMEOUT)
- {
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "DHT disconnected, returning FAIL!\n");
- ok = 365;
- }
- else
- {
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "DHT disconnected, returning success!\n");
- ok = 0;
- }
+ GNUNET_DHT_disconnect (p1.dht_handle);
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "DHT disconnected, returning success!\n");
+ ok = 0;
}
static void
fprintf (stderr, "Ending on an unhappy note.\n");
#endif
+ if ( (retry_context.peer_ctx != NULL) &&
+ (retry_context.peer_ctx->find_peer_handle != NULL) )
+ {
+ GNUNET_log(GNUNET_ERROR_TYPE_DEBUG, "Stopping find peer request!\n");
+ GNUNET_DHT_find_peer_stop(retry_context.peer_ctx->find_peer_handle);
+ }
+ if ( (retry_context.peer_ctx != NULL) &&
+ (retry_context.peer_ctx->get_handle != NULL) )
+ {
+ GNUNET_log(GNUNET_ERROR_TYPE_DEBUG, "Stopping get request!\n");
+ GNUNET_DHT_get_stop (retry_context.peer_ctx->get_handle);
+ }
+ if (retry_context.retry_task != GNUNET_SCHEDULER_NO_TASK)
+ GNUNET_SCHEDULER_cancel(sched, retry_context.retry_task);
GNUNET_DHT_disconnect (p1.dht_handle);
-
ok = 1;
- return;
}
+
/**
* Signature of the main function of a task.
*
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Called test_find_peer_stop!\n");
if (tc->reason == GNUNET_SCHEDULER_REASON_TIMEOUT)
- GNUNET_SCHEDULER_add_now (sched, &end_badly, NULL);
+ {
+ GNUNET_break (0);
+ GNUNET_SCHEDULER_cancel (sched, die_task);
+ GNUNET_SCHEDULER_add_now (sched, &end_badly, NULL);
+ return;
+ }
GNUNET_assert (peer->dht_handle != NULL);
- GNUNET_DHT_find_peer_stop (peer->find_peer_handle, &end, &p1);
-
- //GNUNET_SCHEDULER_add_delayed(sched, GNUNET_TIME_relative_multiply(GNUNET_TIME_UNIT_SECONDS, 1), &end, &p1);
+ GNUNET_DHT_find_peer_stop (peer->find_peer_handle);
+#if HAVE_MALICIOUS
+ GNUNET_DHT_set_malicious_getter (peer->dht_handle, GNUNET_TIME_UNIT_SECONDS);
+ GNUNET_DHT_set_malicious_putter (peer->dht_handle, GNUNET_TIME_UNIT_SECONDS);
+ GNUNET_DHT_set_malicious_dropper (peer->dht_handle);
+#endif
+ GNUNET_SCHEDULER_add_delayed(sched,
+ GNUNET_TIME_relative_multiply(GNUNET_TIME_UNIT_SECONDS, 1),
+ &end, &p1);
}
* @param reply response
*/
void test_find_peer_processor (void *cls,
- const struct GNUNET_PeerIdentity *peer,
- const struct GNUNET_MessageHeader *reply)
+ const struct GNUNET_HELLO_Message *hello)
{
struct RetryContext *retry_ctx = cls;
+ struct GNUNET_PeerIdentity peer;
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "test_find_peer_processor called (peer `%s'), stopping find peer request!\n", GNUNET_i2s(peer));
+ if (GNUNET_OK == GNUNET_HELLO_get_id(hello, &peer))
+ {
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "test_find_peer_processor called (peer `%s'), stopping find peer request!\n", GNUNET_i2s(&peer));
- if (retry_ctx->retry_task != GNUNET_SCHEDULER_NO_TASK)
- GNUNET_SCHEDULER_cancel(sched, retry_ctx->retry_task);
+ if (retry_ctx->retry_task != GNUNET_SCHEDULER_NO_TASK)
+ {
+ GNUNET_SCHEDULER_cancel(sched, retry_ctx->retry_task);
+ retry_ctx->retry_task = GNUNET_SCHEDULER_NO_TASK;
+ }
+
+ GNUNET_SCHEDULER_add_continuation (sched, &test_find_peer_stop, &p1,
+ GNUNET_SCHEDULER_REASON_PREREQ_DONE);
+ }
+ else
+ {
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "received find peer request, but hello_get_id failed!\n");
+ }
- GNUNET_SCHEDULER_add_continuation (sched, &test_find_peer_stop, &p1,
- GNUNET_SCHEDULER_REASON_PREREQ_DONE);
}
+/**
+ * Retry the find_peer task on timeout. (Forward declaration)
+ *
+ * @param cls closure
+ * @param tc context information (why was this task triggered now?)
+ */
+void
+retry_find_peer_stop (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc);
/**
* Retry the find_peer task on timeout.
{
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
"test_find_peer timed out, retrying!\n");
-
- retry_ctx->peer_ctx->find_peer_handle =
- GNUNET_DHT_find_peer_start (retry_ctx->peer_ctx->dht_handle, retry_ctx->next_timeout, 0, NULL, &hash,
- &test_find_peer_processor, retry_ctx, NULL, NULL);
+ retry_ctx->next_timeout = GNUNET_TIME_relative_multiply(retry_ctx->next_timeout, 2);
+ retry_ctx->peer_ctx->find_peer_handle
+ = GNUNET_DHT_find_peer_start (retry_ctx->peer_ctx->dht_handle,
+ retry_ctx->next_timeout, &hash,
+ GNUNET_DHT_RO_NONE,
+ &test_find_peer_processor, retry_ctx);
}
else
{
}
if (retry_ctx->peer_ctx->find_peer_handle == NULL)
- GNUNET_SCHEDULER_add_now (sched, &end_badly, &p1);
- else
- retry_ctx->retry_task = GNUNET_SCHEDULER_add_delayed(sched, retry_ctx->next_timeout, &retry_find_peer, retry_ctx);
+ {
+ GNUNET_break (0);
+ GNUNET_SCHEDULER_cancel (sched, die_task);
+ GNUNET_SCHEDULER_add_now (sched, &end_badly, &p1);
+ return;
+ }
+ retry_ctx->retry_task = GNUNET_SCHEDULER_add_delayed(sched, retry_ctx->next_timeout, &retry_find_peer_stop, retry_ctx);
}
/**
* Retry the find_peer task on timeout.
*
* @param cls closure
- * @param tc context information (why was this task triggered now)
+ * @param tc context information (why was this task triggered now?)
*/
void
retry_find_peer_stop (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
memset (&hash, 42, sizeof (GNUNET_HashCode));
if (retry_ctx->peer_ctx->find_peer_handle != NULL)
- GNUNET_DHT_find_peer_stop(retry_ctx->peer_ctx->find_peer_handle, &retry_find_peer, retry_ctx);
- else
- GNUNET_SCHEDULER_add_now (sched, &retry_find_peer, retry_ctx);
-
+ {
+ GNUNET_DHT_find_peer_stop(retry_ctx->peer_ctx->find_peer_handle);
+ retry_ctx->peer_ctx->find_peer_handle = NULL;
+ }
+ GNUNET_SCHEDULER_add_now (sched, &retry_find_peer, retry_ctx);
}
/**
struct PeerContext *peer = cls;
GNUNET_HashCode hash;
memset (&hash, 42, sizeof (GNUNET_HashCode));
- struct RetryContext *retry_ctx;
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Called test_find_peer!\n");
GNUNET_assert (peer->dht_handle != NULL);
- retry_ctx = GNUNET_malloc(sizeof(struct RetryContext));
- retry_ctx->real_timeout = GNUNET_TIME_relative_to_absolute(TOTAL_TIMEOUT);
- retry_ctx->next_timeout = BASE_TIMEOUT;
- retry_ctx->peer_ctx = peer;
+ retry_context.real_timeout = GNUNET_TIME_relative_to_absolute(TOTAL_TIMEOUT);
+ retry_context.next_timeout = BASE_TIMEOUT;
+ retry_context.peer_ctx = peer;
- peer->find_peer_handle =
- GNUNET_DHT_find_peer_start (peer->dht_handle, retry_ctx->next_timeout, 0, NULL, &hash,
- &test_find_peer_processor, retry_ctx, NULL, NULL);
+ peer->find_peer_handle
+ = GNUNET_DHT_find_peer_start (peer->dht_handle, retry_context.next_timeout,
+ &hash,
+ GNUNET_DHT_RO_DEMULTIPLEX_EVERYWHERE,
+ &test_find_peer_processor, &retry_context);
if (peer->find_peer_handle == NULL)
- GNUNET_SCHEDULER_add_now (sched, &end_badly, &p1);
- else
- retry_ctx->retry_task = GNUNET_SCHEDULER_add_delayed(sched, retry_ctx->next_timeout, &retry_find_peer_stop, retry_ctx);
+ {
+ GNUNET_break (0);
+ GNUNET_SCHEDULER_cancel (sched, die_task);
+ GNUNET_SCHEDULER_add_now (sched, &end_badly, &p1);
+ return;
+ }
+ retry_context.retry_task = GNUNET_SCHEDULER_add_delayed(sched, retry_context.next_timeout, &retry_find_peer_stop, &retry_context);
}
/**
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Called test_get_stop!\n");
if (tc->reason == GNUNET_SCHEDULER_REASON_TIMEOUT)
- GNUNET_SCHEDULER_add_now (sched, &end_badly, NULL);
-
+ {
+ GNUNET_break (0);
+ GNUNET_SCHEDULER_cancel (sched, die_task);
+ GNUNET_SCHEDULER_add_now (sched, &end_badly, NULL);
+ return;
+ }
GNUNET_assert (peer->dht_handle != NULL);
-
- GNUNET_DHT_get_stop (peer->get_handle, &test_find_peer, &p1);
-
- //GNUNET_SCHEDULER_add_delayed(sched, GNUNET_TIME_relative_multiply(GNUNET_TIME_UNIT_SECONDS, 1), &test_put, &p1);
-
+ GNUNET_DHT_get_stop (peer->get_handle);
+ GNUNET_SCHEDULER_add_now(sched,
+ &test_find_peer,
+ &p1);
}
void
test_get_iterator (void *cls,
struct GNUNET_TIME_Absolute exp,
const GNUNET_HashCode * key,
- uint32_t type, uint32_t size, const void *data)
+ 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)
{
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
"test_get_iterator called (we got a result), stopping get request!\n");
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Called test_get!\n");
GNUNET_assert (peer->dht_handle != NULL);
+ retry_context.real_timeout = GNUNET_TIME_relative_to_absolute(TOTAL_TIMEOUT);
+ retry_context.next_timeout = BASE_TIMEOUT;
peer->get_handle =
- GNUNET_DHT_get_start (peer->dht_handle, TOTAL_TIMEOUT, 42, &hash,
- &test_get_iterator, NULL, NULL, NULL);
+ GNUNET_DHT_get_start (peer->dht_handle,
+ TOTAL_TIMEOUT,
+ GNUNET_BLOCK_TYPE_TEST,
+ &hash,
+ GNUNET_DHT_RO_NONE,
+ NULL, 0,
+ NULL, 0,
+ &test_get_iterator, NULL);
if (peer->get_handle == NULL)
- GNUNET_SCHEDULER_add_now (sched, &end_badly, &p1);
+ {
+ GNUNET_break (0);
+ GNUNET_SCHEDULER_cancel (sched, die_task);
+ GNUNET_SCHEDULER_add_now (sched, &end_badly, &p1);
+ return;
+ }
+
+ retry_context.peer_ctx = peer;
}
/**
GNUNET_assert (peer->dht_handle != NULL);
- GNUNET_DHT_put (peer->dht_handle, &hash, 42, data_size, data,
- GNUNET_TIME_relative_to_absolute (TOTAL_TIMEOUT), TOTAL_TIMEOUT,
+ GNUNET_DHT_put (peer->dht_handle, &hash,
+ GNUNET_DHT_RO_NONE,
+ GNUNET_BLOCK_TYPE_TEST,
+ data_size, data,
+ GNUNET_TIME_relative_to_absolute (TOTAL_TIMEOUT),
+ TOTAL_TIMEOUT,
&test_get, &p1);
-
+ GNUNET_free(data);
}
static void
projects / oweals / gnunet.git / blobdiff