additional test for monitoring: check if existing records are returned

2 files changed, 364 insertions, 2 deletions

diff --git a/src/namestore/Makefile.am b/src/namestore/Makefile.am
index 6bad4b092..402128983 100644
--- a/src/namestore/Makefile.am
+++ b/src/namestore/Makefile.am
@@ -46,7 +46,8 @@ TESTING_TESTS = \
  test_namestore_api_zone_iteration \
  test_namestore_api_zone_iteration_specific_zone \
  test_namestore_api_zone_iteration_stop \
- test_namestore_api_monitoring
+ test_namestore_api_monitoring \
+ test_namestore_api_monitoring_existing
 # test_namestore_api_lookup 
 #test_namestore_api_lookup_specific_type
 #test_namestore_api_create 
@@ -251,7 +252,14 @@ test_namestore_api_monitoring_LDADD = \
   $(top_builddir)/src/testing/libgnunettesting.la \
   $(top_builddir)/src/namestore/libgnunetnamestore.la \
   $(top_builddir)/src/util/libgnunetutil.la 
-
+  
+test_namestore_api_monitoring_existing_SOURCES = \
+ test_namestore_api_monitoring_existing.c
+test_namestore_api_monitoring_existing_LDADD = \
+  $(top_builddir)/src/testing/libgnunettesting.la \
+  $(top_builddir)/src/namestore/libgnunetnamestore.la \
+  $(top_builddir)/src/util/libgnunetutil.la 
+ 
 test_namestore_api_zone_iteration_SOURCES = \
  test_namestore_api_zone_iteration.c
 test_namestore_api_zone_iteration_LDADD = \
diff --git a/src/namestore/test_namestore_api_monitoring_existing.c b/src/namestore/test_namestore_api_monitoring_existing.c
new file mode 100644
index 000000000..31f71d664
--- /dev/null
+++ b/src/namestore/test_namestore_api_monitoring_existing.c
@@ -0,0 +1,354 @@
+/*
+     This file is part of GNUnet.
+     (C) 2013 Christian Grothoff (and other contributing authors)
+
+     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 3, or (at your
+     option) any later version.
+
+     GNUnet is distributed in the hope that it will be useful, but
+     WITHOUT ANY WARRANTY; without even the implied warranty of
+     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+     General Public License for more details.
+
+     You should have received a copy of the GNU General Public License
+     along with GNUnet; see the file COPYING.  If not, write to the
+     Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+     Boston, MA 02111-1307, USA.
+*/
+/**
+ * @file namestore/test_namestore_api_monitoring.c
+ * @brief testcase for zone monitoring functionality: add records first, then monitor
+ */
+#include "platform.h"
+#include "gnunet_common.h"
+#include "gnunet_namestore_service.h"
+#include "gnunet_testing_lib.h"
+#include "namestore.h"
+
+
+#define TIMEOUT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 100)
+
+static const struct GNUNET_CONFIGURATION_Handle *cfg;
+
+static struct GNUNET_NAMESTORE_Handle * nsh;
+
+static GNUNET_SCHEDULER_TaskIdentifier endbadly_task;
+
+static struct GNUNET_CRYPTO_EccPrivateKey * privkey;
+
+static struct GNUNET_CRYPTO_EccPrivateKey * privkey2;
+
+static struct GNUNET_NAMESTORE_ZoneMonitor *zm;
+
+static int res;
+
+static char * s_name_1;
+
+static struct GNUNET_NAMESTORE_RecordData *s_rd_1;
+
+static char * s_name_2;
+
+static struct GNUNET_NAMESTORE_RecordData *s_rd_2;
+
+static char * s_name_3;
+
+static struct GNUNET_NAMESTORE_RecordData *s_rd_3;
+
+struct GNUNET_NAMESTORE_QueueEntry * ns_ops[3];
+
+
+static void
+do_shutdown ()
+{
+  if (NULL != zm)
+  {
+    GNUNET_NAMESTORE_zone_monitor_stop (zm);
+    zm = NULL;
+  }
+
+  if (NULL != ns_ops[0])
+  {
+        GNUNET_NAMESTORE_cancel(ns_ops[0]);
+        ns_ops[0] = NULL;
+  }
+  if (NULL != ns_ops[1])
+  {
+        GNUNET_NAMESTORE_cancel(ns_ops[1]);
+        ns_ops[1] = NULL;
+  }
+  if (NULL != ns_ops[2])
+  {
+        GNUNET_NAMESTORE_cancel(ns_ops[2]);
+        ns_ops[2] = NULL;
+  }
+
+  if (NULL != nsh)
+  {
+    GNUNET_NAMESTORE_disconnect (nsh);
+    nsh = NULL;
+  }
+
+  GNUNET_free_non_null(s_name_1);
+  GNUNET_free_non_null(s_name_2);
+  GNUNET_free_non_null(s_name_3);
+
+  if (s_rd_1 != NULL)
+  {
+    GNUNET_free ((void *)s_rd_1->data);
+    GNUNET_free (s_rd_1);
+  }
+  if (s_rd_2 != NULL)
+  {
+    GNUNET_free ((void *)s_rd_2->data);
+    GNUNET_free (s_rd_2);
+  }
+  if (s_rd_3 != NULL)
+  {
+    GNUNET_free ((void *)s_rd_3->data);
+    GNUNET_free (s_rd_3);
+  }
+
+  if (NULL != privkey)
+  {
+    GNUNET_free (privkey);
+    privkey = NULL;
+  }
+  if (NULL != privkey2)
+  {
+    GNUNET_free (privkey2);
+    privkey2 = NULL;
+  }
+}
+
+
+/**
+ * Re-establish the connection to the service.
+ *
+ * @param cls handle to use to re-connect.
+ * @param tc scheduler context
+ */
+static void
+endbadly (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
+{
+  do_shutdown ();
+  res = 1;
+}
+
+
+static void
+end (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
+{
+  do_shutdown ();
+  res = 0;
+}
+
+
+static void
+zone_proc (void *cls,
+           const struct GNUNET_CRYPTO_EccPrivateKey *zone_key,
+           const char *name,
+           unsigned int rd_count,
+           const struct GNUNET_NAMESTORE_RecordData *rd)
+{
+        static int returned_records;
+        static int fail = GNUNET_NO;
+  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+              "Comparing results name %s\n", 
+              name);
+
+  if (0 != memcmp (zone_key, privkey, sizeof (struct GNUNET_CRYPTO_EccPrivateKey)))
+  {
+    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+              "Monitoring returned wrong zone key\n");
+    GNUNET_break (0);
+    GNUNET_SCHEDULER_cancel (endbadly_task);
+    endbadly_task = GNUNET_SCHEDULER_add_now (&endbadly, NULL);
+    return;
+  }
+
+  if (0 == strcmp (name, s_name_1))
+  {
+    if (GNUNET_YES != GNUNET_NAMESTORE_records_cmp(rd, s_rd_1))
+    {
+      GNUNET_break (0);
+        fail = GNUNET_YES;
+    }
+  }
+  else if (0 == strcmp (name, s_name_2))
+  {
+    if (GNUNET_YES != GNUNET_NAMESTORE_records_cmp(rd, s_rd_2))
+    {
+      GNUNET_break (0);
+        fail = GNUNET_YES;
+    }
+  }
+  else
+  {
+    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+              "Invalid name %s\n",  name);
+        GNUNET_break (0);
+    fail = GNUNET_YES;
+  }
+
+  if (2 == ++returned_records)
+  {  
+    if (endbadly_task != GNUNET_SCHEDULER_NO_TASK)
+    {
+      GNUNET_SCHEDULER_cancel (endbadly_task);
+      endbadly_task = GNUNET_SCHEDULER_NO_TASK;
+    }
+    if (GNUNET_YES == fail)
+      GNUNET_SCHEDULER_add_now (&endbadly, NULL);
+    else
+        GNUNET_SCHEDULER_add_now (&end, NULL);
+  }
+
+}
+
+
+static void
+put_cont (void *cls, int32_t success, const char *emsg)
+{
+  static int c = 0;
+  char *label = cls;
+
+  if (0 == strcmp (label, s_name_1))
+        ns_ops[0] = NULL;
+  else if (0 == strcmp (label, s_name_2))
+        ns_ops[1] = NULL;
+  else if (0 == strcmp (label, s_name_3))
+        ns_ops[2] = NULL;
+
+  if (success == GNUNET_OK)
+  {
+    c++;
+    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Created record %u: `%s'\n", c, label);
+  }
+  else
+  {
+    GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Failed to created records\n");
+    GNUNET_break (0);
+    GNUNET_SCHEDULER_cancel (endbadly_task);
+    endbadly_task = GNUNET_SCHEDULER_add_now (&endbadly, NULL);
+  }
+
+  if (3 == c)
+  {
+    /* Start monitoring */
+    zm = GNUNET_NAMESTORE_zone_monitor_start (cfg,
+                                                privkey,
+                                            &zone_proc,
+                                            NULL,
+                                            NULL);
+    if (NULL == zm)
+    {
+      GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Failed to create zone monitor\n");
+      GNUNET_break (0);
+      endbadly_task = GNUNET_SCHEDULER_add_now (&endbadly, NULL);
+      return;
+    }
+  }
+}
+
+
+static struct GNUNET_NAMESTORE_RecordData *
+create_record (unsigned int count)
+{
+  unsigned int c;
+  struct GNUNET_NAMESTORE_RecordData * rd;
+
+  rd = GNUNET_malloc (count * sizeof (struct GNUNET_NAMESTORE_RecordData));
+  for (c = 0; c < count; c++)
+  {
+    rd[c].expiration_time = GNUNET_TIME_relative_to_absolute (GNUNET_TIME_UNIT_HOURS).abs_value_us;
+    rd[c].record_type = 1111;
+    rd[c].data_size = 50;
+    rd[c].data = GNUNET_malloc(50);
+    memset ((char *) rd[c].data, 'a', 50);
+  }
+  return rd;
+}
+
+
+static void
+run (void *cls, 
+     const struct GNUNET_CONFIGURATION_Handle *mycfg,
+     struct GNUNET_TESTING_Peer *peer)
+{
+  char *hostkey_file;
+
+  res = 1;
+
+  GNUNET_asprintf(&hostkey_file,
+                  "zonefiles%s%s",
+                  DIR_SEPARATOR_STR,
+                  "N0UJMP015AFUNR2BTNM3FKPBLG38913BL8IDMCO2H0A1LIB81960.zkey");
+  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, 
+              "Using zonekey file `%s' \n", hostkey_file);
+  privkey = GNUNET_CRYPTO_ecc_key_create_from_file(hostkey_file);
+  GNUNET_free (hostkey_file);
+  GNUNET_assert (privkey != NULL);
+
+  cfg = mycfg;
+  endbadly_task = GNUNET_SCHEDULER_add_delayed (TIMEOUT, &endbadly, NULL);
+  /* Connect to namestore */
+  nsh = GNUNET_NAMESTORE_connect (cfg);
+  if (NULL == nsh)
+  {
+    GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Connect to namestore\n");
+    GNUNET_break (0);
+    endbadly_task = GNUNET_SCHEDULER_add_now (&endbadly, NULL);
+    return;
+  }
+
+  GNUNET_asprintf(&hostkey_file,"zonefiles%s%s",
+                  DIR_SEPARATOR_STR,
+                  "HGU0A0VCU334DN7F2I9UIUMVQMM7JMSD142LIMNUGTTV9R0CF4EG.zkey");
+  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Using zonekey file `%s' \n", hostkey_file);
+  privkey2 = GNUNET_CRYPTO_ecc_key_create_from_file(hostkey_file);
+  GNUNET_free (hostkey_file);
+  GNUNET_assert (privkey2 != NULL);
+
+
+  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Created record 3\n");
+  /* name in different zone */
+  GNUNET_asprintf(&s_name_3, "dummy3");
+  s_rd_3 = create_record(1);
+  GNUNET_assert (NULL != (ns_ops[2] = GNUNET_NAMESTORE_records_store (nsh, privkey2, s_name_3,
+                1, s_rd_3, &put_cont, s_name_3)));
+
+  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Created record 1\n");
+  GNUNET_asprintf(&s_name_1, "dummy1");
+  s_rd_1 = create_record(1);
+  GNUNET_assert (NULL != (ns_ops[0] = GNUNET_NAMESTORE_records_store(nsh, privkey, s_name_1,
+                1, s_rd_1, &put_cont, s_name_1)));
+
+
+  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Created record 2 \n");
+  GNUNET_asprintf(&s_name_2, "dummy2");
+  s_rd_2 = create_record(1);
+  GNUNET_assert (NULL != (ns_ops[1] = GNUNET_NAMESTORE_records_store(nsh, privkey, s_name_2,
+                1, s_rd_2, &put_cont, s_name_2)));
+
+
+}
+
+
+int
+main (int argc, char *argv[])
+{
+  res = 1;
+  if (0 != 
+      GNUNET_TESTING_service_run ("test-namestore-api-monitoring",
+                                  "namestore",
+                                  "test_namestore_api.conf",
+                                  &run,
+                                  NULL))
+    return 1;
+  return res;
+}
+
+
+/* end of test_namestore_api_monitoring.c */