1 files changed, 125 insertions, 154 deletions

diff --git a/src/gns/test_gns_max_queries.c b/src/gns/test_gns_max_queries.c
index ad1743c..00caf83 100644
--- a/src/gns/test_gns_max_queries.c
+++ b/src/gns/test_gns_max_queries.c
@@ -32,18 +32,13 @@
 #include "gnunet_dnsparser_lib.h"
 #include "gnunet_gns_service.h"
 
-/* DEFINES */
-#define VERBOSE GNUNET_YES
 
 /* Timeout for entire testcase */
 #define TIMEOUT GNUNET_TIME_relative_multiply(GNUNET_TIME_UNIT_SECONDS, 20)
 
-/* If number of peers not in config file, use this number */
-#define DEFAULT_NUM_PEERS 2
-
 /* test records to resolve */
-#define TEST_DOMAIN "www.gnunet"
-#define TEST_DOMAIN_NACK "doesnotexist.bob.gnunet"
+#define TEST_DOMAIN "www.gads"
+#define TEST_DOMAIN_NACK "doesnotexist.bob.gads"
 #define TEST_IP "127.0.0.1"
 #define TEST_RECORD_NAME "www"
 #define TEST_ADDITIONAL_LOOKUPS 5
@@ -51,17 +46,8 @@
 
 #define KEYFILE_BOB "../namestore/zonefiles/HGU0A0VCU334DN7F2I9UIUMVQMM7JMSD142LIMNUGTTV9R0CF4EG.zkey"
 
-/* Globals */
-
-/**
- * Directory to store temp data in, defined in config file
- */
-static char *test_directory;
-
-static struct GNUNET_TESTING_PeerGroup *pg;
-
 /* Task handle to use to schedule test failure */
-GNUNET_SCHEDULER_TaskIdentifier die_task;
+static GNUNET_SCHEDULER_TaskIdentifier die_task;
 
 /* Global return value (0 for success, anything else for failure) */
 static int ok;
@@ -70,30 +56,89 @@ static struct GNUNET_NAMESTORE_Handle *namestore_handle;
 
 static struct GNUNET_GNS_Handle *gns_handle;
 
-const struct GNUNET_CONFIGURATION_Handle *cfg;
+static const struct GNUNET_CONFIGURATION_Handle *cfg;
 
 static unsigned long long max_parallel_lookups;
 
+static struct GNUNET_GNS_LookupRequest **requests;
+
+static unsigned int num_requests;
+
+
 /**
- * Check whether peers successfully shut down.
+ * Check if the get_handle is being used, if so stop the request.  Either
+ * way, schedule the end_badly_cont function which actually shuts down the
+ * test.
  */
-void
-shutdown_callback (void *cls, const char *emsg)
+static void
+end_badly (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
 {
-  if (emsg != NULL)
+  unsigned int i;
+
+  for (i=0;i<num_requests;i++)
+    if (NULL != requests[i])
+      GNUNET_GNS_cancel_lookup_request (requests[i]);
+  die_task = GNUNET_SCHEDULER_NO_TASK;
+  if (NULL != gns_handle)
   {
-    GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Error on shutdown! ret=%d\n", ok);
-    if (ok == 0)
-      ok = 2;
+    GNUNET_GNS_disconnect(gns_handle);
+    gns_handle = NULL;
   }
+  if (NULL != namestore_handle)
+  {
+    GNUNET_NAMESTORE_disconnect (namestore_handle);
+    namestore_handle = NULL;
+  }
+  GNUNET_break (0);
+  GNUNET_SCHEDULER_shutdown ();
+  GNUNET_free (requests);
+  ok = 1;
+}
 
-  GNUNET_log (GNUNET_ERROR_TYPE_INFO, "done(ret=%d)!\n", ok);
+
+static void 
+shutdown_task (void *cls,
+	       const struct GNUNET_SCHEDULER_TaskContext *tc)
+{
+  unsigned int i;
+
+  if (GNUNET_SCHEDULER_NO_TASK != die_task)
+  {
+      GNUNET_SCHEDULER_cancel (die_task);
+      die_task = GNUNET_SCHEDULER_NO_TASK;
+  }
+  for (i=0;i<num_requests;i++)
+    if (NULL != requests[i])
+      GNUNET_GNS_cancel_lookup_request (requests[i]);
+  if (NULL != gns_handle)
+  {
+    GNUNET_GNS_disconnect (gns_handle);
+    gns_handle = NULL;
+  }
+  if (NULL != namestore_handle)
+  {
+    GNUNET_NAMESTORE_disconnect (namestore_handle);
+    namestore_handle = NULL;
+  }
+  GNUNET_log (GNUNET_ERROR_TYPE_INFO, "Shutting down peer!\n");
+  GNUNET_SCHEDULER_shutdown ();
+  GNUNET_free (requests);
 }
 
+
 static void
-on_lookup_result_dummy(void *cls, uint32_t rd_count,
-                       const struct GNUNET_NAMESTORE_RecordData *rd)
+on_lookup_result_dummy (void *cls, uint32_t rd_count,
+			const struct GNUNET_NAMESTORE_RecordData *rd)
 {
+  struct GNUNET_GNS_LookupRequest **request = cls;
+  static int replies = 0;
+
+  *request = NULL;
+  if (GNUNET_SCHEDULER_NO_TASK != die_task)
+  {
+      GNUNET_SCHEDULER_cancel (die_task);
+      die_task = GNUNET_SCHEDULER_add_delayed (TIMEOUT, &end_badly, NULL);
+  }
   if (rd_count != 0)
   {
     GNUNET_log(GNUNET_ERROR_TYPE_ERROR,
@@ -101,16 +146,29 @@ on_lookup_result_dummy(void *cls, uint32_t rd_count,
                rd_count);
     ok = -1;
   }
+  replies++;
+  fprintf (stderr, ".");
 }
 
+
 static void
-on_lookup_result(void *cls, uint32_t rd_count,
-                 const struct GNUNET_NAMESTORE_RecordData *rd)
+on_lookup_result (void *cls, uint32_t rd_count,
+		  const struct GNUNET_NAMESTORE_RecordData *rd)
 {
   struct in_addr a;
   int i;
   char* addr;
   
+  requests[max_parallel_lookups + TEST_ADDITIONAL_LOOKUPS] = NULL;
+  if (GNUNET_SCHEDULER_NO_TASK != die_task)
+  {
+      GNUNET_SCHEDULER_cancel (die_task);
+      die_task = GNUNET_SCHEDULER_NO_TASK;
+  }
+
+  GNUNET_NAMESTORE_disconnect (namestore_handle);
+  namestore_handle = NULL;
+  fprintf (stderr, "\n");
   if (rd_count == 0)
   {
     GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
@@ -124,7 +182,7 @@ on_lookup_result(void *cls, uint32_t rd_count,
     for (i=0; i<rd_count; i++)
     {
       GNUNET_log (GNUNET_ERROR_TYPE_INFO, "type: %d\n", rd[i].record_type);
-      if (rd[i].record_type == GNUNET_GNS_RECORD_TYPE_A)
+      if (rd[i].record_type == GNUNET_GNS_RECORD_A)
       {
         memcpy(&a, rd[i].data, sizeof(a));
         addr = inet_ntoa(a);
@@ -142,11 +200,7 @@ on_lookup_result(void *cls, uint32_t rd_count,
       }
     }
   }
-  GNUNET_GNS_disconnect(gns_handle);
-  GNUNET_log (GNUNET_ERROR_TYPE_INFO, "Shutting down peer1!\n");
-  //GNUNET_TESTING_daemon_stop (d1, TIMEOUT, &shutdown_callback, NULL,
-  //                            GNUNET_YES, GNUNET_NO);
-  GNUNET_TESTING_daemons_stop (pg, TIMEOUT, &shutdown_callback, NULL);
+  GNUNET_SCHEDULER_add_now (&shutdown_task, NULL);
 }
 
 
@@ -158,9 +212,8 @@ static void
 commence_testing (void *cls, int32_t success, const char *emsg)
 {
   int i;
-  char lookup_name[MAX_DNS_NAME_LENGTH];
-  
-  GNUNET_NAMESTORE_disconnect(namestore_handle, GNUNET_YES);
+  char lookup_name[GNUNET_DNSPARSER_MAX_NAME_LENGTH];
+  struct GNUNET_GNS_LookupRequest *lr;
   
   gns_handle = GNUNET_GNS_connect(cfg);
 
@@ -176,48 +229,28 @@ commence_testing (void *cls, int32_t success, const char *emsg)
   for (i=0; i<max_parallel_lookups+TEST_ADDITIONAL_LOOKUPS; i++)
   {
     GNUNET_snprintf(lookup_name,
-                    MAX_DNS_NAME_LENGTH,
-                    "www.doesnotexist-%d.bob.gnunet", i);
-    GNUNET_GNS_lookup(gns_handle, lookup_name, GNUNET_GNS_RECORD_TYPE_A,
-                      &on_lookup_result_dummy, NULL);
+                    GNUNET_DNSPARSER_MAX_NAME_LENGTH,
+                    "www.doesnotexist-%d.bob.gads", i);
+    lr = GNUNET_GNS_lookup (gns_handle, lookup_name, GNUNET_GNS_RECORD_A,
+			    GNUNET_NO,
+			    NULL,
+			    &on_lookup_result_dummy, &requests[num_requests]);
+    requests[num_requests++] = lr;
   }
-
-  GNUNET_GNS_lookup(gns_handle, TEST_DOMAIN, GNUNET_GNS_RECORD_TYPE_A,
-                    &on_lookup_result, TEST_DOMAIN);
+  lr = GNUNET_GNS_lookup (gns_handle, TEST_DOMAIN, GNUNET_GNS_RECORD_A,
+			  GNUNET_NO,
+			  NULL,
+			  &on_lookup_result, TEST_DOMAIN);
+  requests[num_requests++] = lr;
+  GNUNET_assert (num_requests == max_parallel_lookups + TEST_ADDITIONAL_LOOKUPS + 1);
 }
 
 
-/**
- * Continuation for the GNUNET_DHT_get_stop call, so that we don't shut
- * down the peers without freeing memory associated with GET request.
- */
-static void
-end_badly_cont (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
-{
-
-  if (pg != NULL)
-    GNUNET_TESTING_daemons_stop (pg, TIMEOUT, &shutdown_callback, NULL);
-  GNUNET_SCHEDULER_cancel (die_task);
-}
 
-/**
- * Check if the get_handle is being used, if so stop the request.  Either
- * way, schedule the end_badly_cont function which actually shuts down the
- * test.
- */
 static void
-end_badly (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
-{
-  GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Failing test with error: `%s'!\n",
-              (char *) cls);
-  GNUNET_SCHEDULER_add_now (&end_badly_cont, NULL);
-  ok = 1;
-}
-
-static void
-do_lookup(void *cls, const struct GNUNET_PeerIdentity *id,
-          const struct GNUNET_CONFIGURATION_Handle *_cfg,
-          struct GNUNET_TESTING_Daemon *d, const char *emsg)
+do_check (void *cls,
+          const struct GNUNET_CONFIGURATION_Handle *ccfg,
+          struct GNUNET_TESTING_Peer *peer)
 {
   struct GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded alice_pkey;
   struct GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded bob_pkey;
@@ -226,16 +259,16 @@ do_lookup(void *cls, const struct GNUNET_PeerIdentity *id,
   char* alice_keyfile;
   struct GNUNET_CRYPTO_ShortHashCode bob_hash;
 
-  cfg = _cfg;
+  cfg = ccfg;
+  die_task = GNUNET_SCHEDULER_add_delayed (TIMEOUT, &end_badly, NULL);
 
-  GNUNET_SCHEDULER_cancel (die_task);
 
   /* put records into namestore */
   namestore_handle = GNUNET_NAMESTORE_connect(cfg);
   if (NULL == namestore_handle)
   {
     GNUNET_log(GNUNET_ERROR_TYPE_ERROR, "Failed to connect to namestore\n");
-    ok = -1;
+    GNUNET_SCHEDULER_shutdown ();
     return;
   }
 
@@ -244,20 +277,21 @@ do_lookup(void *cls, const struct GNUNET_PeerIdentity *id,
                                                           &alice_keyfile))
   {
     GNUNET_log(GNUNET_ERROR_TYPE_ERROR, "Failed to get key from cfg\n");
-    ok = -1;
+    GNUNET_SCHEDULER_shutdown ();
     return;
   }
 
   if (GNUNET_OK != GNUNET_CONFIGURATION_get_value_number (cfg, "gns",
-                                             "MAX_PARALLEL_BACKGROUND_QUERIES",
-                                             &max_parallel_lookups))
+							  "MAX_PARALLEL_BACKGROUND_QUERIES",
+							  &max_parallel_lookups))
   {
     GNUNET_log(GNUNET_ERROR_TYPE_ERROR, "Failed to get max queries from cfg\n");
-    ok = -1;
+    GNUNET_SCHEDULER_shutdown ();
     GNUNET_free (alice_keyfile);
     return;
   }
-
+  requests = GNUNET_malloc ((max_parallel_lookups + TEST_ADDITIONAL_LOOKUPS + 1) *
+			    sizeof (struct GNUNET_GNS_LookupRequest *));
   alice_key = GNUNET_CRYPTO_rsa_key_create_from_file (alice_keyfile);
   bob_key = GNUNET_CRYPTO_rsa_key_create_from_file (KEYFILE_BOB);
 
@@ -269,11 +303,12 @@ do_lookup(void *cls, const struct GNUNET_PeerIdentity *id,
   struct GNUNET_NAMESTORE_RecordData rd;
   char* ip = TEST_IP;
   struct in_addr *web = GNUNET_malloc(sizeof(struct in_addr));
-  rd.expiration = GNUNET_TIME_UNIT_FOREVER_ABS;
+  rd.expiration_time = UINT64_MAX;
   GNUNET_assert(1 == inet_pton (AF_INET, ip, web));
   rd.data_size = sizeof(struct in_addr);
   rd.data = web;
   rd.record_type = GNUNET_DNSPARSER_TYPE_A;
+  rd.flags = GNUNET_NAMESTORE_RF_AUTHORITY;
 
   GNUNET_NAMESTORE_record_create (namestore_handle,
                                   alice_key,
@@ -300,82 +335,18 @@ do_lookup(void *cls, const struct GNUNET_PeerIdentity *id,
 
 }
 
-static void
-run (void *cls, char *const *args, const char *cfgfile,
-     const struct GNUNET_CONFIGURATION_Handle *c)
-{
-  cfg = c;
-   /* Get path from configuration file */
-  if (GNUNET_YES !=
-      GNUNET_CONFIGURATION_get_value_string (cfg, "paths", "servicehome",
-                                             &test_directory))
-  {
-    ok = 404;
-    return;
-  }
-
-    
-  /* Set up a task to end testing if peer start fails */
-  die_task =
-      GNUNET_SCHEDULER_add_delayed (TIMEOUT, &end_badly,
-                                    "didn't start all daemons in reasonable amount of time!!!");
-  
-  /* Start alice */
-  //d1 = GNUNET_TESTING_daemon_start(cfg, TIMEOUT, GNUNET_NO, NULL, NULL, 0,
-  //                                 NULL, NULL, NULL, &do_lookup, NULL);
-  pg = GNUNET_TESTING_daemons_start(cfg, 1, 1, 1, TIMEOUT,
-                                    NULL, NULL, &do_lookup, NULL,
-                                    NULL, NULL, NULL);
-}
-
-static int
-check ()
-{
-  int ret;
-
-  /* Arguments for GNUNET_PROGRAM_run */
-  char *const argv[] = { "test-gns-max-queries", /* Name to give running binary */
-    "-c",
-    "test_gns_simple_lookup.conf",       /* Config file to use */
-#if VERBOSE
-    "-L", "DEBUG",
-#endif
-    NULL
-  };
-  struct GNUNET_GETOPT_CommandLineOption options[] = {
-    GNUNET_GETOPT_OPTION_END
-  };
-  /* Run the run function as a new program */
-  ret =
-      GNUNET_PROGRAM_run ((sizeof (argv) / sizeof (char *)) - 1, argv,
-                          "test-gns-max-queries", "nohelp", options, &run,
-                          &ok);
-  if (ret != GNUNET_OK)
-  {
-    GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
-                "`test-gns-simple-lookup': Failed with error code %d\n", ret);
-  }
-  return ok;
-}
 
 int
 main (int argc, char *argv[])
 {
-  int ret;
+  ok = 1;
 
-  GNUNET_log_setup ("test-gns-simple-lookup",
-#if VERBOSE
-                    "DEBUG",
-#else
+  GNUNET_log_setup ("test-gns-max-queries",
                     "WARNING",
-#endif
                     NULL);
-  ret = check ();
-  /**
-   * Need to remove base directory, subdirectories taken care
-   * of by the testing framework.
-   */
-  return ret;
+  GNUNET_TESTING_peer_run ("test-gns-max-queries", "test_gns_simple_lookup.conf", &do_check, NULL);
+  return ok;
 }
 
-/* end of test_gns_twopeer.c */
+
+/* end of test_gns_simple_zkey_lookup.c */