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_YES
+#define VERBOSE GNUNET_EXTRA_LOGGING
-#define VERBOSE_ARM GNUNET_YES
+#define VERBOSE_ARM GNUNET_EXTRA_LOGGING
#define START_ARM GNUNET_YES
/**
- * How long until we give up on transmitting the message?
+ * How long until we really give up on a particular testcase portion?
+ */
+#define TOTAL_TIMEOUT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 600)
+
+/**
+ * How long until we give up on any particular operation (and retry)?
*/
-#define TIMEOUT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 50)
+#define BASE_TIMEOUT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 3)
#define MTYPE 12345
+struct RetryContext
+{
+ /**
+ * When to really abort the operation.
+ */
+ struct GNUNET_TIME_Absolute real_timeout;
+
+ /**
+ * What timeout to set for the current attempt (increases)
+ */
+ struct GNUNET_TIME_Relative next_timeout;
+
+ /**
+ * The context of the peer we are dealing with.
+ */
+ struct PeerContext *peer_ctx;
+
+ /**
+ * The task identifier of the retry task, so it can be cancelled.
+ */
+ GNUNET_SCHEDULER_TaskIdentifier retry_task;
+
+};
+
struct PeerContext
{
struct GNUNET_CONFIGURATION_Handle *cfg;
struct GNUNET_DHT_Handle *dht_handle;
struct GNUNET_PeerIdentity id;
- struct GNUNET_DHT_RouteHandle *get_handle;
- struct GNUNET_DHT_RouteHandle *find_peer_handle;
-
+ struct GNUNET_DHT_GetHandle *get_handle;
#if START_ARM
- pid_t arm_pid;
+ struct GNUNET_OS_Process *arm_proc;
#endif
};
static struct PeerContext p1;
-static struct GNUNET_SCHEDULER_Handle *sched;
+struct RetryContext retry_context;
+
static int ok;
-GNUNET_SCHEDULER_TaskIdentifier die_task;
+static GNUNET_SCHEDULER_TaskIdentifier die_task;
#if VERBOSE
-#define OKPP do { ok++; fprintf (stderr, "Now at stage %u at %s:%u\n", ok, __FILE__, __LINE__); } while (0)
+#define OKPP do { ok++; FPRINTF (stderr, "Now at stage %u at %s:%u\n", ok, __FILE__, __LINE__); } while (0)
#else
#define OKPP do { ok++; } while (0)
#endif
static void
-end (void *cls,
- const struct GNUNET_SCHEDULER_TaskContext * tc)
+end (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
{
- /* do work here */
- GNUNET_SCHEDULER_cancel (sched, die_task);
-
- GNUNET_DHT_disconnect (p1.dht_handle);
-
+ GNUNET_SCHEDULER_cancel (die_task);
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
stop_arm (struct PeerContext *p)
{
#if START_ARM
- if (0 != PLIBC_KILL (p->arm_pid, SIGTERM))
+ if (0 != GNUNET_OS_process_kill (p->arm_proc, SIGTERM))
GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING, "kill");
- GNUNET_OS_process_wait (p->arm_pid);
+ GNUNET_OS_process_wait (p->arm_proc);
+ GNUNET_OS_process_close (p->arm_proc);
+ p->arm_proc = NULL;
#endif
GNUNET_CONFIGURATION_destroy (p->cfg);
}
{
/* do work here */
#if VERBOSE
- fprintf(stderr, "Ending on an unhappy note.\n");
+ FPRINTF (stderr, "%s", "Ending on an unhappy note.\n");
#endif
+ 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 (retry_context.retry_task);
GNUNET_DHT_disconnect (p1.dht_handle);
-
ok = 1;
- return;
}
* @param cls closure
* @param tc context information (why was this task triggered now)
*/
-void test_put (void *cls,
- const struct GNUNET_SCHEDULER_TaskContext * tc)
+static void
+test_get_stop (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
{
struct PeerContext *peer = cls;
- GNUNET_HashCode hash;
- char *data;
- size_t data_size = 42;
- memset(&hash, 42, sizeof(GNUNET_HashCode));
- data = GNUNET_malloc(data_size);
- memset(data, 43, data_size);
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Called test_put!\n");
+
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Called test_get_stop!\n");
+ if ((tc->reason & GNUNET_SCHEDULER_REASON_TIMEOUT) != 0)
+ {
+ GNUNET_break (0);
+ GNUNET_SCHEDULER_cancel (die_task);
+ die_task = GNUNET_SCHEDULER_add_now (&end_badly, NULL);
+ return;
+ }
GNUNET_assert (peer->dht_handle != NULL);
+ GNUNET_DHT_get_stop (peer->get_handle);
+ peer->get_handle = NULL;
+ GNUNET_SCHEDULER_add_now (&end, &p1);
+}
- GNUNET_DHT_put(peer->dht_handle, &hash, 0, data_size, data, GNUNET_TIME_relative_to_absolute(GNUNET_TIME_relative_multiply(GNUNET_TIME_UNIT_SECONDS, 360)) ,GNUNET_TIME_relative_multiply(GNUNET_TIME_UNIT_SECONDS, 360), &end, NULL);
- //GNUNET_SCHEDULER_add_delayed(sched, GNUNET_TIME_relative_multiply(GNUNET_TIME_UNIT_SECONDS, 1), &test_put, &p1);
+static void
+test_get_iterator (void *cls, struct GNUNET_TIME_Absolute exp,
+ const GNUNET_HashCode * key,
+ const struct GNUNET_PeerIdentity *get_path,
+ unsigned int get_path_length,
+ const struct GNUNET_PeerIdentity *put_path,
+ unsigned int put_path_length, 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_SCHEDULER_add_now(sched, &end, NULL);
+ GNUNET_SCHEDULER_add_continuation (&test_get_stop, &p1,
+ GNUNET_SCHEDULER_REASON_PREREQ_DONE);
}
/**
* @param cls closure
* @param tc context information (why was this task triggered now)
*/
-void test_get_stop (void *cls,
- const struct GNUNET_SCHEDULER_TaskContext * tc)
+static void
+test_get (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
{
struct PeerContext *peer = cls;
GNUNET_HashCode hash;
- memset(&hash, 42, sizeof(GNUNET_HashCode));
- 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);
+ memset (&hash, 42, sizeof (GNUNET_HashCode));
+
+ 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;
- GNUNET_DHT_get_stop(peer->get_handle);
+ peer->get_handle =
+ GNUNET_DHT_get_start (peer->dht_handle, TOTAL_TIMEOUT,
+ GNUNET_BLOCK_TYPE_TEST, &hash, 1,
+ GNUNET_DHT_RO_NONE, NULL, 0, &test_get_iterator,
+ NULL);
- //GNUNET_SCHEDULER_add_delayed(sched, GNUNET_TIME_relative_multiply(GNUNET_TIME_UNIT_SECONDS, 1), &test_put, &p1);
- GNUNET_SCHEDULER_add_delayed(sched, GNUNET_TIME_relative_multiply(GNUNET_TIME_UNIT_SECONDS, 1), &test_put, &p1);
+ if (peer->get_handle == NULL)
+ {
+ GNUNET_break (0);
+ GNUNET_SCHEDULER_cancel (die_task);
+ die_task = GNUNET_SCHEDULER_add_now (&end_badly, &p1);
+ return;
+ }
+ retry_context.peer_ctx = peer;
}
/**
* @param cls closure
* @param tc context information (why was this task triggered now)
*/
-void test_get (void *cls,
- const struct GNUNET_SCHEDULER_TaskContext * tc)
+static void
+test_put (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
{
struct PeerContext *peer = cls;
GNUNET_HashCode hash;
- memset(&hash, 42, sizeof(GNUNET_HashCode));
-
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Called test_get!\n");
- peer->dht_handle = GNUNET_DHT_connect (sched, peer->cfg, 100);
- GNUNET_assert (peer->dht_handle != NULL);
+ char *data;
+ size_t data_size = 42;
- peer->get_handle = GNUNET_DHT_get_start(peer->dht_handle, GNUNET_TIME_relative_multiply(GNUNET_TIME_UNIT_SECONDS, 100), 42, &hash, NULL, NULL, &test_get_stop, &p1);
+ memset (&hash, 42, sizeof (GNUNET_HashCode));
+ data = GNUNET_malloc (data_size);
+ memset (data, 43, data_size);
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Called test_put!\n");
+ peer->dht_handle = GNUNET_DHT_connect (peer->cfg, 100);
- if (peer->get_handle == NULL)
- GNUNET_SCHEDULER_add_now(sched, &end_badly, &p1);
+ GNUNET_assert (peer->dht_handle != NULL);
- //GNUNET_SCHEDULER_add_delayed(sched, GNUNET_TIME_relative_multiply(GNUNET_TIME_UNIT_SECONDS, 1), &test_get_stop, &p1);
+ GNUNET_DHT_put (peer->dht_handle, &hash, 1, 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
{
p->cfg = GNUNET_CONFIGURATION_create ();
#if START_ARM
- p->arm_pid = GNUNET_OS_start_process (NULL, NULL, "gnunet-service-arm",
- "gnunet-service-arm",
+ p->arm_proc =
+ GNUNET_OS_start_process (NULL, NULL, "gnunet-service-arm",
+ "gnunet-service-arm",
#if VERBOSE_ARM
- "-L", "DEBUG",
+ "-L", "DEBUG",
#endif
- "-c", cfgname, NULL);
+ "-c", cfgname, NULL);
#endif
GNUNET_assert (GNUNET_OK == GNUNET_CONFIGURATION_load (p->cfg, cfgname));
}
static void
-run (void *cls,
- struct GNUNET_SCHEDULER_Handle *s,
- 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)
{
GNUNET_assert (ok == 1);
OKPP;
- sched = s;
- die_task = GNUNET_SCHEDULER_add_delayed (sched,
- GNUNET_TIME_relative_multiply(GNUNET_TIME_UNIT_MINUTES, 1), &end_badly, NULL);
+ die_task =
+ GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_relative_multiply
+ (GNUNET_TIME_UNIT_MINUTES, 1), &end_badly,
+ NULL);
setup_peer (&p1, "test_dht_api_peer1.conf");
- GNUNET_SCHEDULER_add_delayed(sched, GNUNET_TIME_relative_multiply(GNUNET_TIME_UNIT_SECONDS, 1), &test_get, &p1);
+ GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_relative_multiply
+ (GNUNET_TIME_UNIT_SECONDS, 1), &test_put, &p1);
}
static int
};
ok = 1;
- GNUNET_PROGRAM_run ((sizeof (argv) / sizeof (char *)) - 1,
- argv, "test-dht-api", "nohelp",
- options, &run, &ok);
+ GNUNET_PROGRAM_run ((sizeof (argv) / sizeof (char *)) - 1, argv,
+ "test-dht-api", "nohelp", options, &run, &ok);
stop_arm (&p1);
return ok;
}
main (int argc, char *argv[])
{
int ret;
-#ifdef MINGW
- return GNUNET_SYSERR;
-#endif
GNUNET_log_setup ("test-dht-api",
#if VERBOSE
NULL);
ret = check ();
- //GNUNET_DISK_directory_remove ("/tmp/test-gnunetd-dht-peer-1");
+ GNUNET_DISK_directory_remove ("/tmp/test-gnunetd-dht-peer-1");
return ret;
}
projects / oweals / gnunet.git / blobdiff