- final zone iteration code

1 files changed, 39 insertions, 8 deletions

diff --git a/src/namestore/test_namestore_api_zone_iteration_specific_zone.c b/src/namestore/test_namestore_api_zone_iteration_specific_zone.c
index 7d98eefb0..7cdcea42a 100644
--- a/src/namestore/test_namestore_api_zone_iteration_specific_zone.c
+++ b/src/namestore/test_namestore_api_zone_iteration_specific_zone.c
@@ -18,8 +18,8 @@
      Boston, MA 02111-1307, USA.
 */
 /**
- * @file namestore/test_namestore_api_zone_iteration.c
- * @brief testcase for namestore_api.c zone iteration functionality
+ * @file namestore/test_namestore_api_zone_iteration_specific_zone.c
+ * @brief testcase for zone iteration functionality: iterate of a specific zone
  */
 #include "platform.h"
 #include "gnunet_common.h"
@@ -46,6 +46,7 @@ static GNUNET_HashCode zone2;
 
 static struct GNUNET_NAMESTORE_ZoneIterator *zi;
 static int res;
+static int returned_records;
 
 struct GNUNET_CRYPTO_RsaSignature *sig_1;
 char * s_name_1;
@@ -106,8 +107,10 @@ endbadly (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
 
   GNUNET_free_non_null(sig_1);
   GNUNET_free_non_null(sig_2);
+  GNUNET_free_non_null(sig_3);
   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)
   {
@@ -119,11 +122,20 @@ endbadly (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
     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 (privkey != NULL)
     GNUNET_CRYPTO_rsa_key_free (privkey);
   privkey = NULL;
 
+  if (privkey2 != NULL)
+    GNUNET_CRYPTO_rsa_key_free (privkey2);
+  privkey2 = NULL;
+
   if (NULL != arm)
     stop_arm();
 
@@ -150,10 +162,16 @@ end (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
     GNUNET_CRYPTO_rsa_key_free (privkey);
   privkey = NULL;
 
+  if (privkey2 != NULL)
+    GNUNET_CRYPTO_rsa_key_free (privkey2);
+  privkey2 = NULL;
+
   GNUNET_free (sig_1);
   GNUNET_free (sig_2);
+  GNUNET_free (sig_3);
   GNUNET_free (s_name_1);
   GNUNET_free (s_name_2);
+  GNUNET_free (s_name_3);
   if (s_rd_1 != NULL)
   {
     GNUNET_free ((void *)s_rd_1->data);
@@ -164,6 +182,11 @@ end (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
     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 (nsh != NULL)
     GNUNET_NAMESTORE_disconnect (nsh, GNUNET_YES);
@@ -186,7 +209,13 @@ void zone_proc (void *cls,
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Callback for zone `%s'\n", GNUNET_h2s (&zone));
   if ((zone_key == NULL) &&  (name == NULL))
   {
-    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Received last result, iteration done\n");
+    GNUNET_break (2 == returned_records);
+    if (2 == returned_records)
+      res = 0;
+    else
+      res = 1;
+
+    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Received last result, iteration done after %u records\n", returned_records);
     GNUNET_SCHEDULER_add_now (&end, NULL);
   }
   else
@@ -236,14 +265,15 @@ void zone_proc (void *cls,
     }
     else
     {
-      GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Comparing result `%s'\n", name);
+      GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Comparing result failed: got name `%s'\n", name);
+      res = 1;
       GNUNET_break (0);
       GNUNET_SCHEDULER_add_now (&end, NULL);
     }
 
     if (failed == GNUNET_NO)
     {
-      res --;
+      returned_records ++;
       GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Telling namestore to send the next result\n");
       GNUNET_NAMESTORE_zone_iterator_next (zi);
     }
@@ -291,9 +321,10 @@ put_cont (void *cls, int32_t success, const char *emsg)
     endbadly_task = GNUNET_SCHEDULER_add_now (&endbadly, NULL);
   }
 
-  if (c == 2)
+  if (c == 3)
   {
-    res = 2;
+    res = 1;
+    returned_records = 0;
     GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "All records created, starting iteration over zone `%s'\n",
         GNUNET_h2s(&zone));
     zi = GNUNET_NAMESTORE_zone_iteration_start(nsh,
@@ -408,4 +439,4 @@ main (int argc, char *argv[])
   return ret;
 }
 
-/* end of test_namestore_api_zone_iteration.c */
+/* end of test_namestore_api_zone_iteration_specific_zone.c */