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_dht_service.h"
/* DEFINES */
-#define VERBOSE GNUNET_YES
+#define VERBOSE GNUNET_NO
+
+#define MAX_GET_ATTEMPTS 10
#define TIMEOUT GNUNET_TIME_relative_multiply(GNUNET_TIME_UNIT_MINUTES, 5)
struct GNUNET_DHT_Handle *dht_handle;
struct GNUNET_DHT_GetHandle *get_handle;
+
+ unsigned int get_attempts;
+
+ GNUNET_SCHEDULER_TaskIdentifier retry_task;
};
/* Globals */
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);
}
static void
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);
+
if (curr_get_ctx.get_handle != NULL)
{
- GNUNET_DHT_get_stop(curr_get_ctx.get_handle, &end_badly_cont, NULL);
+ GNUNET_DHT_get_stop(curr_get_ctx.get_handle);
+ GNUNET_SCHEDULER_add_now (sched, &end_badly_cont, NULL);
}
ok = 1;
void get_result_iterator (void *cls,
struct GNUNET_TIME_Absolute exp,
const GNUNET_HashCode * key,
- uint32_t type,
- uint32_t size,
+ 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)))
{
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Key returned is not the same key as was searched for!\n");
+ 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");
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;
+ }
+
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, &do_get, get_context);
+ GNUNET_DHT_get_stop(get_context->get_handle);
+ GNUNET_SCHEDULER_add_now (sched, &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, &finish_testing, NULL);
+ GNUNET_DHT_get_stop(get_context->get_handle);
+ GNUNET_SCHEDULER_add_now (sched, &finish_testing, NULL);
}
+}
+
+static void
+stop_retry_get (void *cls, const struct GNUNET_SCHEDULER_TaskContext * tc);
+static void
+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);
+ 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;
+ }
+ 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);
+}
+
+static void
+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);
}
static void
{
struct PeerGetContext *get_context = cls;
- get_context->get_handle = GNUNET_DHT_get_start(get_context->dht_handle, GNUNET_TIME_relative_get_forever(), 130, &get_context->peer->hashPubKey, &get_result_iterator, get_context, NULL, NULL);
+ 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);
}