X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=src%2Fdht%2Ftest_dht_api.c;h=04a0cf26dd69009bd6a85cb82449209818df8f3f;hb=d0b4927e6ab7e8b9874dd7807055e77fb4c5163f;hp=797270d1affd763c276bbdf7c80109bf9e77ddc0;hpb=375bc5e4bd829694f84920329340160ecf5f95b5;p=oweals%2Fgnunet.git

diff --git a/src/dht/test_dht_api.c b/src/dht/test_dht_api.c
index 797270d1a..04a0cf26d 100644
--- a/src/dht/test_dht_api.c
+++ b/src/dht/test_dht_api.c
@@ -25,25 +25,16 @@
  *
  */
 #include "platform.h"
-#include "gnunet_common.h"
+#include "gnunet_util_lib.h"
 #include "gnunet_hello_lib.h"
-#include "gnunet_getopt_lib.h"
-#include "gnunet_os_lib.h"
-#include "gnunet_program_lib.h"
-#include "gnunet_scheduler_lib.h"
+#include "gnunet_testing_lib-new.h"
 #include "gnunet_dht_service.h"
-#include "gnunet_hello_lib.h"
-
-#define VERBOSE GNUNET_YES
-
-#define VERBOSE_ARM GNUNET_NO
 
-#define START_ARM GNUNET_YES
 
 /**
  * How long until we really give up on a particular testcase portion?
  */
-#define TOTAL_TIMEOUT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 120)
+#define TOTAL_TIMEOUT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 600)
 
 /**
  * How long until we give up on any particular operation (and retry)?
@@ -52,6 +43,7 @@
 
 #define MTYPE 12345
 
+
 struct RetryContext
 {
   /**
@@ -64,11 +56,6 @@ struct RetryContext
    */
   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.
    */
@@ -76,31 +63,20 @@ struct RetryContext
 
 };
 
-struct PeerContext
-{
-  struct GNUNET_CONFIGURATION_Handle *cfg;
-  struct GNUNET_DHT_Handle *dht_handle;
-  struct GNUNET_PeerIdentity id;
-  struct GNUNET_DHT_GetHandle *get_handle;
-  struct GNUNET_DHT_FindPeerHandle *find_peer_handle;
-
-#if START_ARM
-  pid_t arm_pid;
-#endif
-};
 
-static struct PeerContext p1;
+static struct GNUNET_DHT_Handle *dht_handle;
+
+static struct GNUNET_DHT_GetHandle *get_handle;
 
 struct RetryContext retry_context;
 
-static struct GNUNET_SCHEDULER_Handle *sched;
+static int ok = 1;
 
-static int ok;
+static GNUNET_SCHEDULER_TaskIdentifier die_task;
 
-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
@@ -109,36 +85,13 @@ GNUNET_SCHEDULER_TaskIdentifier die_task;
 static void
 end (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
 {
-  /* do work here */
-  sleep(2);
-  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;
-    }
-}
-
-static void
-stop_arm (struct PeerContext *p)
-{
-#if START_ARM
-  if (0 != PLIBC_KILL (p->arm_pid, SIGTERM))
-    GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING, "kill");
-  GNUNET_OS_process_wait (p->arm_pid);
-#endif
-  GNUNET_CONFIGURATION_destroy (p->cfg);
+  GNUNET_DHT_disconnect (dht_handle);
+  dht_handle = NULL;
+  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+              "DHT disconnected, returning success!\n");
+  ok = 0;
 }
 
 
@@ -146,76 +99,19 @@ static void
 end_badly ()
 {
   /* do work here */
-#if VERBOSE
-  fprintf (stderr, "Ending on an unhappy note.\n");
-#endif
-
-  if ((retry_context.peer_ctx != NULL) && (retry_context.peer_ctx->find_peer_handle != NULL))
-    GNUNET_DHT_find_peer_stop(retry_context.peer_ctx->find_peer_handle, NULL, NULL);
+  FPRINTF (stderr, "%s",  "Ending on an unhappy note.\n");
+  if (get_handle != NULL)
+  {
+    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Stopping get request!\n");
+    GNUNET_DHT_get_stop (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);
-
+    GNUNET_SCHEDULER_cancel (retry_context.retry_task);
+  GNUNET_DHT_disconnect (dht_handle);
+  dht_handle = NULL;
   ok = 1;
-  return;
-}
-
-/**
- * Signature of the main function of a task.
- *
- * @param cls closure
- * @param tc context information (why was this task triggered now)
- */
-void test_set_peer_malicious_drop (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
-{
-  struct PeerContext *peer = cls;
-
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Called test_set_peer_malicious_drop!\n");
-  if (tc->reason == GNUNET_SCHEDULER_REASON_TIMEOUT)
-    GNUNET_SCHEDULER_add_now (sched, &end_badly, NULL);
-
-  GNUNET_assert (peer->dht_handle != NULL);
-
-  GNUNET_DHT_set_malicious_dropper (peer->dht_handle, &end, &p1);
-}
-
-/**
- * Signature of the main function of a task.
- *
- * @param cls closure
- * @param tc context information (why was this task triggered now)
- */
-void test_set_peer_malicious_put (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
-{
-  struct PeerContext *peer = cls;
-
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Called test_set_peer_malicious_put!\n");
-  if (tc->reason == GNUNET_SCHEDULER_REASON_TIMEOUT)
-    GNUNET_SCHEDULER_add_now (sched, &end_badly, NULL);
-
-  GNUNET_assert (peer->dht_handle != NULL);
-
-  GNUNET_DHT_set_malicious_putter (peer->dht_handle, 750, &test_set_peer_malicious_drop, &p1);
 }
 
-/**
- * Signature of the main function of a task.
- *
- * @param cls closure
- * @param tc context information (why was this task triggered now)
- */
-void test_set_peer_malicious_get (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
-{
-  struct PeerContext *peer = cls;
-
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Called test_set_peer_malicious_get!\n");
-  if (tc->reason == GNUNET_SCHEDULER_REASON_TIMEOUT)
-    GNUNET_SCHEDULER_add_now (sched, &end_badly, NULL);
-
-  GNUNET_assert (peer->dht_handle != NULL);
-
-  GNUNET_DHT_set_malicious_getter (peer->dht_handle, 1500, &test_set_peer_malicious_put, &p1);
-}
 
 /**
  * Signature of the main function of a task.
@@ -223,327 +119,112 @@ void test_set_peer_malicious_get (void *cls, const struct GNUNET_SCHEDULER_TaskC
  * @param cls closure
  * @param tc context information (why was this task triggered now)
  */
-void
-test_find_peer_stop (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
-{
-  struct PeerContext *peer = cls;
-
-  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_assert (peer->dht_handle != NULL);
-
-  GNUNET_DHT_find_peer_stop (peer->find_peer_handle, &test_set_peer_malicious_get, &p1);
-
-  //GNUNET_SCHEDULER_add_delayed(sched, GNUNET_TIME_relative_multiply(GNUNET_TIME_UNIT_SECONDS, 1), &end, &p1);
-
-}
-
-
-/**
- * Iterator called on each result obtained from a find peer
- * operation
- *
- * @param cls closure (NULL)
- * @param peer the peer we learned about
- * @param reply response
- */
-void test_find_peer_processor (void *cls,
-                               const struct GNUNET_HELLO_Message *hello)
-{
-  struct RetryContext *retry_ctx = cls;
-  struct GNUNET_PeerIdentity 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);
-          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");
-    }
-
-}
-
-/**
- * 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.
- *
- * @param cls closure
- * @param tc context information (why was this task triggered now)
- */
-void
-retry_find_peer (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
-{
-  struct RetryContext *retry_ctx = cls;
-  GNUNET_HashCode hash;
-  memset (&hash, 42, sizeof (GNUNET_HashCode));
-
-  if (GNUNET_TIME_absolute_get_remaining(retry_ctx->real_timeout).value > 0)
-    {
-      GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-                  "test_find_peer timed out, retrying!\n");
-      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, 0, &hash,
-                                      &test_find_peer_processor, retry_ctx, NULL, NULL);
-    }
-  else
-    {
-      GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-                  "test_find_peer timed out for good, failing!\n");
-
-      retry_ctx->peer_ctx->find_peer_handle = NULL;
-    }
-
-  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_stop, retry_ctx);
-}
-
-/**
- * Retry the find_peer task on timeout.
- *
- * @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)
-{
-  struct RetryContext *retry_ctx = cls;
-  GNUNET_HashCode hash;
-  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);
-
-}
-
-/**
- * Entry point for test of find_peer functionality.
- *
- * @param cls closure
- * @param tc context information (why was this task triggered now)
- */
-void
-test_find_peer (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_find_peer!\n");
-  GNUNET_assert (peer->dht_handle != NULL);
-
-  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_context.next_timeout, 1, &hash,
-                                &test_find_peer_processor, &retry_context, NULL, NULL);
-
-  if (peer->find_peer_handle == NULL)
-    GNUNET_SCHEDULER_add_now (sched, &end_badly, &p1);
-  else
-    retry_context.retry_task = GNUNET_SCHEDULER_add_delayed(sched, retry_context.next_timeout, &retry_find_peer_stop, &retry_context);
-}
-
-/**
- * Signature of the main function of a task.
- *
- * @param cls closure
- * @param tc context information (why was this task triggered now)
- */
-void
+static void
 test_get_stop (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
 {
-  struct PeerContext *peer = cls;
-
   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_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);
-
+  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 (dht_handle != NULL);
+  GNUNET_DHT_get_stop (get_handle);
+  get_handle = NULL;
+  GNUNET_SCHEDULER_add_now (&end, NULL);
 }
 
-void
-test_get_iterator (void *cls,
-                   struct GNUNET_TIME_Absolute exp,
-                   const GNUNET_HashCode * key,
-                   uint32_t type, uint32_t size, const void *data)
+
+static void
+test_get_iterator (void *cls, struct GNUNET_TIME_Absolute exp,
+                   const struct 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_continuation (sched, &test_get_stop, &p1,
+  GNUNET_SCHEDULER_add_continuation (&test_get_stop, NULL,
                                      GNUNET_SCHEDULER_REASON_PREREQ_DONE);
 }
 
-/**
- * Signature of the main function of a task.
- *
- * @param cls closure
- * @param tc context information (why was this task triggered now)
- */
-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!\n");
-
-  GNUNET_assert (peer->dht_handle != NULL);
-
-  peer->get_handle =
-    GNUNET_DHT_get_start (peer->dht_handle, TOTAL_TIMEOUT, 49, &hash,
-                          &test_get_iterator, NULL, NULL, NULL);
-
-  if (peer->get_handle == NULL)
-    GNUNET_SCHEDULER_add_now (sched, &end_badly, &p1);
-}
 
 /**
  * Signature of the main function of a task.
  *
  * @param cls closure
- * @param tc context information (why was this task triggered now)
+ * @param success result of PUT
  */
-void
-test_put (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
+static void
+test_get (void *cls, int success)
 {
-  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");
-  peer->dht_handle = GNUNET_DHT_connect (sched, peer->cfg, 100);
+  struct GNUNET_HashCode hash;
 
-  GNUNET_assert (peer->dht_handle != NULL);
+  memset (&hash, 42, sizeof (struct GNUNET_HashCode));
 
-  GNUNET_DHT_put (peer->dht_handle, &hash, 49, data_size, data,
-                  GNUNET_TIME_relative_to_absolute (TOTAL_TIMEOUT), TOTAL_TIMEOUT,
-                  &test_get, &p1);
-  GNUNET_free(data);
-}
+  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Called test_get!\n");
+  GNUNET_assert (dht_handle != NULL);
+  retry_context.real_timeout = GNUNET_TIME_relative_to_absolute (TOTAL_TIMEOUT);
+  retry_context.next_timeout = BASE_TIMEOUT;
 
-static void
-setup_peer (struct PeerContext *p, const char *cfgname)
-{
-  p->cfg = GNUNET_CONFIGURATION_create ();
-#if START_ARM
-  p->arm_pid = GNUNET_OS_start_process (NULL, NULL, "gnunet-service-arm",
-                                        "gnunet-service-arm",
-#if VERBOSE_ARM
-                                        "-L", "DEBUG",
-#endif
-                                        "-c", cfgname, NULL);
-#endif
-  GNUNET_assert (GNUNET_OK == GNUNET_CONFIGURATION_load (p->cfg, cfgname));
+  get_handle =
+      GNUNET_DHT_get_start (dht_handle, 
+                            GNUNET_BLOCK_TYPE_TEST, &hash, 1,
+                            GNUNET_DHT_RO_NONE, NULL, 0, &test_get_iterator,
+                            NULL);
 
+  if (get_handle == NULL)
+  {
+    GNUNET_break (0);
+    GNUNET_SCHEDULER_cancel (die_task);
+    die_task = GNUNET_SCHEDULER_add_now (&end_badly, NULL);
+    return;
+  }
 }
 
+
 static void
 run (void *cls,
-     struct GNUNET_SCHEDULER_Handle *s,
-     char *const *args,
-     const char *cfgfile, const struct GNUNET_CONFIGURATION_Handle *cfg)
+     const struct GNUNET_CONFIGURATION_Handle *cfg,
+     struct GNUNET_TESTING_Peer *peer)
 {
+  struct GNUNET_HashCode hash;
+  char *data;
+  size_t data_size = 42;
+
   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_put,
-                                &p1);
-}
-
-static int
-check ()
-{
-
-  char *const argv[] = { "test-dht-api",
-    "-c",
-    "test_dht_api_data.conf",
-#if VERBOSE
-    "-L", "DEBUG",
-#endif
-    NULL
-  };
-
-  struct GNUNET_GETOPT_CommandLineOption options[] = {
-    GNUNET_GETOPT_OPTION_END
-  };
-
-  ok = 1;
-  GNUNET_PROGRAM_run ((sizeof (argv) / sizeof (char *)) - 1,
-                      argv, "test-dht-api", "nohelp", options, &run, &ok);
-  stop_arm (&p1);
-  return ok;
+  memset (&hash, 42, sizeof (struct GNUNET_HashCode));
+  data = GNUNET_malloc (data_size);
+  memset (data, 43, data_size);
+  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Called test_put!\n");
+  dht_handle = GNUNET_DHT_connect (cfg, 100);
+  GNUNET_assert (dht_handle != NULL);
+  GNUNET_DHT_put (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, NULL);
+  GNUNET_free (data);
 }
 
 
 int
 main (int argc, char *argv[])
 {
-  int ret;
-#ifdef MINGW
-  return GNUNET_SYSERR;
-#endif
-
-  GNUNET_log_setup ("test-dht-api",
-#if VERBOSE
-                    "DEBUG",
-#else
-                    "WARNING",
-#endif
-                    NULL);
-  ret = check ();
-
-  GNUNET_DISK_directory_remove ("/tmp/test-gnunetd-dht-peer-1");
-
-  return ret;
+  if (0 != GNUNET_TESTING_peer_run ("test-dht-api",
+				    "test_dht_api_data.conf",
+				    &run, NULL))
+    return 1;
+  return ok;
 }
 
 /* end of test_dht_api.c */