1 files changed, 173 insertions, 27 deletions

diff --git a/src/namestore/test_namestore_api_zone_iteration.c b/src/namestore/test_namestore_api_zone_iteration.c
index 95755ceee..e70a3baf0 100644
--- a/src/namestore/test_namestore_api_zone_iteration.c
+++ b/src/namestore/test_namestore_api_zone_iteration.c
@@ -24,6 +24,7 @@
 #include "platform.h"
 #include "gnunet_common.h"
 #include "gnunet_namestore_service.h"
+#include "namestore.h"
 
 #define VERBOSE GNUNET_NO
 
@@ -42,6 +43,14 @@ static GNUNET_HashCode zone;
 static struct GNUNET_NAMESTORE_ZoneIterator *zi;
 static int res;
 
+struct GNUNET_CRYPTO_RsaSignature *sig_1;
+char * s_name_1;
+struct GNUNET_NAMESTORE_RecordData *s_rd_1;
+
+struct GNUNET_CRYPTO_RsaSignature *sig_2;
+char * s_name_2;
+struct GNUNET_NAMESTORE_RecordData *s_rd_2;
+
 static void
 start_arm (const char *cfgname)
 {
@@ -87,6 +96,21 @@ endbadly (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
     GNUNET_NAMESTORE_disconnect (nsh, GNUNET_YES);
   nsh = NULL;
 
+  GNUNET_free_non_null(sig_1);
+  GNUNET_free_non_null(sig_2);
+  GNUNET_free_non_null(s_name_1);
+  GNUNET_free_non_null(s_name_2);
+  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 (privkey != NULL)
     GNUNET_CRYPTO_rsa_key_free (privkey);
   privkey = NULL;
@@ -118,6 +142,21 @@ end (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
     GNUNET_CRYPTO_rsa_key_free (privkey);
   privkey = NULL;
 
+  GNUNET_free_non_null(sig_1);
+  GNUNET_free_non_null(sig_2);
+  GNUNET_free_non_null(s_name_1);
+  GNUNET_free_non_null(s_name_2);
+  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 (nsh != NULL)
     GNUNET_NAMESTORE_disconnect (nsh, GNUNET_YES);
   nsh = NULL;
@@ -129,17 +168,6 @@ end (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
   res = 0;
 }
 
-static void
-stop_iteration (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
-{
-  stopiteration_task = GNUNET_SCHEDULER_NO_TASK;
-
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Stopping iteration for zone `%s'\n", GNUNET_h2s (&zone));
-  GNUNET_NAMESTORE_zone_iteration_stop (zi);
-
-  GNUNET_SCHEDULER_add_now (&end, NULL);
-}
-
 void zone_proc (void *cls,
                 const struct GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded *zone_key,
                 struct GNUNET_TIME_Absolute expire,
@@ -148,9 +176,77 @@ void zone_proc (void *cls,
                 const struct GNUNET_NAMESTORE_RecordData *rd,
                 const struct GNUNET_CRYPTO_RsaSignature *signature)
 {
+  int failed = GNUNET_NO;
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Callback for zone `%s'\n", GNUNET_h2s (&zone));
-
-  stopiteration_task = GNUNET_SCHEDULER_add_now (&stop_iteration, NULL);
+  if ((zone_key == NULL) &&  (name == NULL))
+  {
+    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Received last result, iteration done\n");
+    GNUNET_SCHEDULER_add_now (&end, NULL);
+  }
+  else
+  {
+    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Comparing results name %s \n", name);
+    if (0 == strcmp (name, s_name_1))
+    {
+      if (rd_count == 1)
+      {
+        if (GNUNET_YES != GNUNET_NAMESTORE_records_cmp(rd, s_rd_1))
+        {
+          failed = GNUNET_YES;
+          GNUNET_break (0);
+        }
+      }
+      else
+      {
+        failed = GNUNET_YES;
+        GNUNET_break (0);
+      }
+      if (0 != memcmp (signature, sig_1, sizeof (struct GNUNET_CRYPTO_RsaSignature)))
+      {
+        failed = GNUNET_YES;
+        GNUNET_break (0);
+      }
+    }
+    else if (0 == strcmp (name, s_name_2))
+    {
+      if (rd_count == 1)
+      {
+        if (GNUNET_YES != GNUNET_NAMESTORE_records_cmp(rd, s_rd_2))
+        {
+          failed = GNUNET_YES;
+          GNUNET_break (0);
+        }
+      }
+      else
+      {
+        failed = GNUNET_YES;
+        GNUNET_break (0);
+      }
+      if (0 != memcmp (signature, sig_2, sizeof (struct GNUNET_CRYPTO_RsaSignature)))
+      {
+        failed = GNUNET_YES;
+        GNUNET_break (0);
+      }
+
+    }
+    else
+    {
+      GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Comparing result `%s'\n", name);
+      GNUNET_break (0);
+      GNUNET_SCHEDULER_add_now (&end, NULL);
+    }
+
+    if (failed == GNUNET_NO)
+    {
+      GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Telling namestore to send the next result\n");
+      GNUNET_NAMESTORE_zone_iterator_next (zi);
+    }
+    else
+    {
+      GNUNET_break (0);
+      GNUNET_SCHEDULER_add_now (&end, NULL);
+    }
+  }
 }
 
 void
@@ -171,6 +267,53 @@ delete_existing_db (const struct GNUNET_CONFIGURATION_Handle *cfg)
 
 }
 
+void
+put_cont (void *cls, int32_t success, const char *emsg)
+{
+  static int c = 0;
+
+  if (success == GNUNET_OK)
+  {
+    c++;
+    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Created record %u \n", c);
+
+  }
+
+  if (c == 2)
+  {
+    zi = GNUNET_NAMESTORE_zone_iteration_start(nsh,
+                                        NULL,
+                                        GNUNET_NAMESTORE_RF_NONE,
+                                        GNUNET_NAMESTORE_RF_NONE,
+                                        zone_proc,
+                                        &zone);
+    if (zi == NULL)
+    {
+      GNUNET_break (0);
+      GNUNET_SCHEDULER_cancel (endbadly_task);
+      endbadly_task = GNUNET_SCHEDULER_add_now (&endbadly, NULL);
+    }
+  }
+}
+
+static struct GNUNET_NAMESTORE_RecordData *
+create_record (int count)
+{
+  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 = GNUNET_TIME_absolute_get();
+  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, char *const *args, const char *cfgfile,
      const struct GNUNET_CONFIGURATION_Handle *cfg)
@@ -181,8 +324,7 @@ run (void *cls, char *const *args, const char *cfgfile,
   privkey = GNUNET_CRYPTO_rsa_key_create_from_file("hostkey");
   GNUNET_assert (privkey != NULL);
   GNUNET_CRYPTO_rsa_key_get_public(privkey, &pubkey);
-
-  GNUNET_CRYPTO_hash_create_random (GNUNET_CRYPTO_QUALITY_WEAK, &zone);
+  GNUNET_CRYPTO_hash(&pubkey, sizeof (pubkey), &zone);
 
   start_arm (cfgfile);
   GNUNET_assert (arm != NULL);
@@ -190,18 +332,22 @@ run (void *cls, char *const *args, const char *cfgfile,
   nsh = GNUNET_NAMESTORE_connect (cfg);
   GNUNET_break (NULL != nsh);
 
-  zi = GNUNET_NAMESTORE_zone_iteration_start(nsh,
-                                        &zone,
-                                        GNUNET_NAMESTORE_RF_NONE,
-                                        GNUNET_NAMESTORE_RF_NONE,
-                                        zone_proc,
-                                        &zone);
-  if (zi == NULL)
-  {
-    GNUNET_break (0);
-    GNUNET_SCHEDULER_cancel (endbadly_task);
-    endbadly_task = GNUNET_SCHEDULER_add_now (&endbadly, NULL);
-  }
+  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Created record 1\n");
+
+
+
+  GNUNET_asprintf(&s_name_1, "dummy1");
+  s_rd_1 = create_record(1);
+  sig_1 = GNUNET_NAMESTORE_create_signature(privkey, s_name_1, s_rd_1, 1);
+  GNUNET_NAMESTORE_record_create(nsh, privkey, s_name_1, s_rd_1, &put_cont, NULL);
+
+
+  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Created record 2 \n");
+  GNUNET_asprintf(&s_name_2, "dummy2");
+  s_rd_2 = create_record(1);
+
+  sig_2 = GNUNET_NAMESTORE_create_signature(privkey, s_name_2, s_rd_2, 1);
+  GNUNET_NAMESTORE_record_create(nsh, privkey, s_name_2, s_rd_2, &put_cont, NULL);
 }
 
 static int