1 files changed, 280 insertions, 278 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 924e1eb1e..50c247b14 100644
--- a/src/namestore/test_namestore_api_zone_iteration_specific_zone.c
+++ b/src/namestore/test_namestore_api_zone_iteration_specific_zone.c
@@ -31,16 +31,16 @@
 #define TEST_RECORD_TYPE GNUNET_DNSPARSER_TYPE_TXT
 
 
-#define TIMEOUT GNUNET_TIME_relative_multiply(GNUNET_TIME_UNIT_SECONDS, 100)
+#define TIMEOUT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 100)
 
 
-static struct GNUNET_NAMESTORE_Handle * nsh;
+static struct GNUNET_NAMESTORE_Handle *nsh;
 
-static struct GNUNET_SCHEDULER_Task * endbadly_task;
+static struct GNUNET_SCHEDULER_Task *endbadly_task;
 
-static struct GNUNET_CRYPTO_EcdsaPrivateKey * privkey;
+static struct GNUNET_CRYPTO_EcdsaPrivateKey *privkey;
 
-static struct GNUNET_CRYPTO_EcdsaPrivateKey * privkey2;
+static struct GNUNET_CRYPTO_EcdsaPrivateKey *privkey2;
 
 static struct GNUNET_NAMESTORE_ZoneIterator *zi;
 
@@ -48,15 +48,15 @@ static int res;
 
 static int returned_records;
 
-static char * s_name_1;
+static char *s_name_1;
 
 static struct GNUNET_GNSRECORD_Data *s_rd_1;
 
-static char * s_name_2;
+static char *s_name_2;
 
 static struct GNUNET_GNSRECORD_Data *s_rd_2;
 
-static char * s_name_3;
+static char *s_name_3;
 
 static struct GNUNET_GNSRECORD_Data *s_rd_3;
 
@@ -67,246 +67,247 @@ static struct GNUNET_GNSRECORD_Data *s_rd_3;
  * @param cls handle to use to re-connect.
  */
 static void
-endbadly(void *cls)
+endbadly (void *cls)
 {
   endbadly_task = NULL;
-  GNUNET_SCHEDULER_shutdown();
+  GNUNET_SCHEDULER_shutdown ();
   res = 1;
 }
 
 
 static void
-end(void *cls)
+end (void *cls)
 {
   if (NULL != zi)
-    {
-      GNUNET_NAMESTORE_zone_iteration_stop(zi);
-      zi = NULL;
-    }
+  {
+    GNUNET_NAMESTORE_zone_iteration_stop (zi);
+    zi = NULL;
+  }
   if (NULL != endbadly_task)
-    {
-      GNUNET_SCHEDULER_cancel(endbadly_task);
-      endbadly_task = NULL;
-    }
+  {
+    GNUNET_SCHEDULER_cancel (endbadly_task);
+    endbadly_task = NULL;
+  }
   if (NULL != privkey)
-    {
-      GNUNET_free(privkey);
-      privkey = NULL;
-    }
+  {
+    GNUNET_free (privkey);
+    privkey = NULL;
+  }
   if (NULL != privkey2)
-    {
-      GNUNET_free(privkey2);
-      privkey2 = NULL;
-    }
-  GNUNET_free_non_null(s_name_1);
-  GNUNET_free_non_null(s_name_2);
-  GNUNET_free_non_null(s_name_3);
+  {
+    GNUNET_free (privkey2);
+    privkey2 = 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);
-    }
+  {
+    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);
-    }
+  {
+    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);
-    }
+  {
+    GNUNET_free ((void *) s_rd_3->data);
+    GNUNET_free (s_rd_3);
+  }
   if (nsh != NULL)
-    {
-      GNUNET_NAMESTORE_disconnect(nsh);
-      nsh = NULL;
-    }
+  {
+    GNUNET_NAMESTORE_disconnect (nsh);
+    nsh = NULL;
+  }
 }
 
 
 static void
-fail_cb(void *cls)
+fail_cb (void *cls)
 {
-  GNUNET_assert(0);
+  GNUNET_assert (0);
   zi = NULL;
 }
 
 
 static void
-zone_proc(void *cls,
-          const struct GNUNET_CRYPTO_EcdsaPrivateKey *zone,
-          const char *label,
-          unsigned int rd_count,
-          const struct GNUNET_GNSRECORD_Data *rd)
+zone_proc (void *cls,
+           const struct GNUNET_CRYPTO_EcdsaPrivateKey *zone,
+           const char *label,
+           unsigned int rd_count,
+           const struct GNUNET_GNSRECORD_Data *rd)
 {
   int failed = GNUNET_NO;
 
-  GNUNET_assert(NULL != zone);
-  if (0 == GNUNET_memcmp(zone,
-                         privkey))
+  GNUNET_assert (NULL != zone);
+  if (0 == GNUNET_memcmp (zone,
+                          privkey))
+  {
+    if (0 == strcmp (label, s_name_1))
     {
-      if (0 == strcmp(label, s_name_1))
+      if (rd_count == 1)
+      {
+        if (GNUNET_YES != GNUNET_GNSRECORD_records_cmp (rd, s_rd_1))
         {
-          if (rd_count == 1)
-            {
-              if (GNUNET_YES != GNUNET_GNSRECORD_records_cmp(rd, s_rd_1))
-                {
-                  failed = GNUNET_YES;
-                  GNUNET_break(0);
-                }
-            }
-          else
-            {
-              failed = GNUNET_YES;
-              GNUNET_break(0);
-            }
-        }
-      else if (0 == strcmp(label, s_name_2))
-        {
-          if (rd_count == 1)
-            {
-              if (GNUNET_YES != GNUNET_GNSRECORD_records_cmp(rd, s_rd_2))
-                {
-                  failed = GNUNET_YES;
-                  GNUNET_break(0);
-                }
-            }
-          else
-            {
-              GNUNET_log(GNUNET_ERROR_TYPE_ERROR,
-                         "Received invalid record count\n");
-              failed = GNUNET_YES;
-              GNUNET_break(0);
-            }
+          failed = GNUNET_YES;
+          GNUNET_break (0);
         }
+      }
       else
+      {
+        failed = GNUNET_YES;
+        GNUNET_break (0);
+      }
+    }
+    else if (0 == strcmp (label, s_name_2))
+    {
+      if (rd_count == 1)
+      {
+        if (GNUNET_YES != GNUNET_GNSRECORD_records_cmp (rd, s_rd_2))
         {
-          GNUNET_log(GNUNET_ERROR_TYPE_DEBUG,
-                     "Comparing result failed: got name `%s' for first zone\n",
-                     label);
           failed = GNUNET_YES;
-          GNUNET_break(0);
+          GNUNET_break (0);
         }
+      }
+      else
+      {
+        GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+                    "Received invalid record count\n");
+        failed = GNUNET_YES;
+        GNUNET_break (0);
+      }
     }
-  else if (0 == GNUNET_memcmp(zone, privkey2))
+    else
     {
-      GNUNET_log(GNUNET_ERROR_TYPE_ERROR,
-                 "Received data for not requested zone\n");
+      GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+                  "Comparing result failed: got name `%s' for first zone\n",
+                  label);
       failed = GNUNET_YES;
-      GNUNET_break(0);
+      GNUNET_break (0);
     }
+  }
+  else if (0 == GNUNET_memcmp (zone, privkey2))
+  {
+    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+                "Received data for not requested zone\n");
+    failed = GNUNET_YES;
+    GNUNET_break (0);
+  }
   else
-    {
-      GNUNET_log(GNUNET_ERROR_TYPE_ERROR,
-                 "Received invalid zone\n");
-      failed = GNUNET_YES;
-      GNUNET_break(0);
-    }
+  {
+    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+                "Received invalid zone\n");
+    failed = GNUNET_YES;
+    GNUNET_break (0);
+  }
   if (failed == GNUNET_NO)
-    {
-      returned_records++;
-      GNUNET_log(GNUNET_ERROR_TYPE_DEBUG,
-                 "Telling namestore to send the next result\n");
-      GNUNET_NAMESTORE_zone_iterator_next(zi,
-                                          1);
-    }
+  {
+    returned_records++;
+    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+                "Telling namestore to send the next result\n");
+    GNUNET_NAMESTORE_zone_iterator_next (zi,
+                                         1);
+  }
   else
-    {
-      GNUNET_break(0);
-      res = 2;
-      GNUNET_SCHEDULER_shutdown();
-    }
+  {
+    GNUNET_break (0);
+    res = 2;
+    GNUNET_SCHEDULER_shutdown ();
+  }
 }
 
 
 static void
-zone_proc_end(void *cls)
+zone_proc_end (void *cls)
 {
   zi = NULL;
-  GNUNET_break(2 == returned_records);
+  GNUNET_break (2 == returned_records);
   if (2 == returned_records)
-    {
-      res = 0; /* Last iteraterator callback, we are done */
-    }
+  {
+    res = 0;   /* Last iteraterator callback, we are done */
+  }
   else
-    {
-      res = 1;
-    }
-
-  GNUNET_log(GNUNET_ERROR_TYPE_DEBUG,
-             "Received last result, iteration done after receing %u results\n",
-             returned_records);
-  GNUNET_SCHEDULER_shutdown();
+  {
+    res = 1;
+  }
+
+  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+              "Received last result, iteration done after receing %u results\n",
+              returned_records);
+  GNUNET_SCHEDULER_shutdown ();
 }
 
 
 static void
-put_cont(void *cls,
-         int32_t success,
-         const char *emsg)
+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);
-    }
+  {
+    c++;
+    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+                "Created record %u \n", c);
+  }
   else
-    {
-      GNUNET_log(GNUNET_ERROR_TYPE_ERROR,
-                 "Failed to created records: `%s'\n",
-                 emsg);
-      GNUNET_break(0);
-      res = 2;
-      GNUNET_SCHEDULER_shutdown();
-      return;
-    }
+  {
+    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+                "Failed to created records: `%s'\n",
+                emsg);
+    GNUNET_break (0);
+    res = 2;
+    GNUNET_SCHEDULER_shutdown ();
+    return;
+  }
 
   if (c == 3)
+  {
+    res = 1;
+    returned_records = 0;
+    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+                "All records created, starting iteration over all zones \n");
+    zi = GNUNET_NAMESTORE_zone_iteration_start (nsh,
+                                                privkey,
+                                                &fail_cb,
+                                                NULL,
+                                                &zone_proc,
+                                                NULL,
+                                                &zone_proc_end,
+                                                NULL);
+    if (zi == NULL)
     {
-      res = 1;
-      returned_records = 0;
-      GNUNET_log(GNUNET_ERROR_TYPE_DEBUG,
-                 "All records created, starting iteration over all zones \n");
-      zi = GNUNET_NAMESTORE_zone_iteration_start(nsh,
-                                                 privkey,
-                                                 &fail_cb,
-                                                 NULL,
-                                                 &zone_proc,
-                                                 NULL,
-                                                 &zone_proc_end,
-                                                 NULL);
-      if (zi == NULL)
-        {
-          GNUNET_log(GNUNET_ERROR_TYPE_ERROR,
-                     "Failed to create zone iterator\n");
-          GNUNET_break(0);
-          res = 2;
-          GNUNET_SCHEDULER_shutdown();
-          return;
-        }
+      GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+                  "Failed to create zone iterator\n");
+      GNUNET_break (0);
+      res = 2;
+      GNUNET_SCHEDULER_shutdown ();
+      return;
     }
+  }
 }
 
 
 static struct GNUNET_GNSRECORD_Data *
-create_record(unsigned int count)
+create_record (unsigned int count)
 {
   struct GNUNET_GNSRECORD_Data *rd;
 
-  rd = GNUNET_new_array(count,
-                        struct GNUNET_GNSRECORD_Data);
+  rd = GNUNET_new_array (count,
+                         struct GNUNET_GNSRECORD_Data);
   for (unsigned int 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 = TEST_RECORD_TYPE;
-      rd[c].data_size = 50;
-      rd[c].data = GNUNET_malloc(50);
-      rd[c].flags = 0;
-      memset((char *)rd[c].data, 'a', 50);
-    }
+  {
+    rd[c].expiration_time = GNUNET_TIME_relative_to_absolute (
+      GNUNET_TIME_UNIT_HOURS).abs_value_us;
+    rd[c].record_type = TEST_RECORD_TYPE;
+    rd[c].data_size = 50;
+    rd[c].data = GNUNET_malloc (50);
+    rd[c].flags = 0;
+    memset ((char *) rd[c].data, 'a', 50);
+  }
   return rd;
 }
 
@@ -317,114 +318,114 @@ create_record(unsigned int count)
  * start the actual tests by filling the zone.
  */
 static void
-empty_zone_proc(void *cls,
-                const struct GNUNET_CRYPTO_EcdsaPrivateKey *zone,
-                const char *label,
-                unsigned int rd_count,
-                const struct GNUNET_GNSRECORD_Data *rd)
+empty_zone_proc (void *cls,
+                 const struct GNUNET_CRYPTO_EcdsaPrivateKey *zone,
+                 const char *label,
+                 unsigned int rd_count,
+                 const struct GNUNET_GNSRECORD_Data *rd)
 {
-  GNUNET_assert(nsh == cls);
+  GNUNET_assert (nsh == cls);
   if (NULL != zone)
-    {
-      GNUNET_log(GNUNET_ERROR_TYPE_ERROR,
-                 _("Expected empty zone but received zone private key\n"));
-      GNUNET_break(0);
-      res = 2;
-      GNUNET_SCHEDULER_shutdown();
-      return;
-    }
+  {
+    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+                _ ("Expected empty zone but received zone private key\n"));
+    GNUNET_break (0);
+    res = 2;
+    GNUNET_SCHEDULER_shutdown ();
+    return;
+  }
   if ((NULL != label) || (NULL != rd) || (0 != rd_count))
-    {
-      GNUNET_log(GNUNET_ERROR_TYPE_ERROR,
-                 _("Expected no zone content but received data\n"));
-      GNUNET_break(0);
-      res = 2;
-      GNUNET_SCHEDULER_shutdown();
-      return;
-    }
-  GNUNET_assert(0);
+  {
+    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+                _ ("Expected no zone content but received data\n"));
+    GNUNET_break (0);
+    res = 2;
+    GNUNET_SCHEDULER_shutdown ();
+    return;
+  }
+  GNUNET_assert (0);
 }
 
 
 static void
-empty_zone_proc_end(void *cls)
+empty_zone_proc_end (void *cls)
 {
   zi = NULL;
-  privkey = GNUNET_CRYPTO_ecdsa_key_create();
-  GNUNET_assert(privkey != NULL);
-  privkey2 = GNUNET_CRYPTO_ecdsa_key_create();
-  GNUNET_assert(privkey2 != NULL);
-
-  GNUNET_log(GNUNET_ERROR_TYPE_DEBUG,
-             "Created record 1\n");
-  GNUNET_asprintf(&s_name_1,
-                  "dummy1");
-  s_rd_1 = create_record(1);
-  GNUNET_NAMESTORE_records_store(nsh,
-                                 privkey,
-                                 s_name_1,
-                                 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);
-  GNUNET_NAMESTORE_records_store(nsh,
-                                 privkey,
-                                 s_name_2,
-                                 1,
-                                 s_rd_2,
-                                 &put_cont,
-                                 NULL);
-
-  GNUNET_log(GNUNET_ERROR_TYPE_DEBUG,
-             "Created record 3\n");
+  privkey = GNUNET_CRYPTO_ecdsa_key_create ();
+  GNUNET_assert (privkey != NULL);
+  privkey2 = GNUNET_CRYPTO_ecdsa_key_create ();
+  GNUNET_assert (privkey2 != NULL);
+
+  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+              "Created record 1\n");
+  GNUNET_asprintf (&s_name_1,
+                   "dummy1");
+  s_rd_1 = create_record (1);
+  GNUNET_NAMESTORE_records_store (nsh,
+                                  privkey,
+                                  s_name_1,
+                                  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);
+  GNUNET_NAMESTORE_records_store (nsh,
+                                  privkey,
+                                  s_name_2,
+                                  1,
+                                  s_rd_2,
+                                  &put_cont,
+                                  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_NAMESTORE_records_store(nsh,
-                                 privkey2,
-                                 s_name_3,
-                                 1, s_rd_3,
-                                 &put_cont,
-                                 NULL);
+  GNUNET_asprintf (&s_name_3,
+                   "dummy3");
+  s_rd_3 = create_record (1);
+  GNUNET_NAMESTORE_records_store (nsh,
+                                  privkey2,
+                                  s_name_3,
+                                  1, s_rd_3,
+                                  &put_cont,
+                                  NULL);
 }
 
 
 static void
-run(void *cls,
-    const struct GNUNET_CONFIGURATION_Handle *cfg,
-    struct GNUNET_TESTING_Peer *peer)
+run (void *cls,
+     const struct GNUNET_CONFIGURATION_Handle *cfg,
+     struct GNUNET_TESTING_Peer *peer)
 {
-  GNUNET_SCHEDULER_add_shutdown(&end,
-                                NULL);
-  endbadly_task = GNUNET_SCHEDULER_add_delayed(TIMEOUT,
-                                               &endbadly,
-                                               NULL);
-  nsh = GNUNET_NAMESTORE_connect(cfg);
-  GNUNET_break(NULL != nsh);
+  GNUNET_SCHEDULER_add_shutdown (&end,
+                                 NULL);
+  endbadly_task = GNUNET_SCHEDULER_add_delayed (TIMEOUT,
+                                                &endbadly,
+                                                NULL);
+  nsh = GNUNET_NAMESTORE_connect (cfg);
+  GNUNET_break (NULL != nsh);
   /* first, iterate over empty namestore */
-  zi = GNUNET_NAMESTORE_zone_iteration_start(nsh,
-                                             NULL,
-                                             &fail_cb,
-                                             NULL,
-                                             &empty_zone_proc,
-                                             nsh,
-                                             &empty_zone_proc_end,
-                                             nsh);
+  zi = GNUNET_NAMESTORE_zone_iteration_start (nsh,
+                                              NULL,
+                                              &fail_cb,
+                                              NULL,
+                                              &empty_zone_proc,
+                                              nsh,
+                                              &empty_zone_proc_end,
+                                              nsh);
   if (NULL == zi)
-    {
-      GNUNET_log(GNUNET_ERROR_TYPE_ERROR,
-                 "Failed to create zone iterator\n");
-      GNUNET_break(0);
-      GNUNET_SCHEDULER_shutdown();
-    }
+  {
+    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+                "Failed to create zone iterator\n");
+    GNUNET_break (0);
+    GNUNET_SCHEDULER_shutdown ();
+  }
 }
 
 
@@ -432,24 +433,25 @@ run(void *cls,
 
 
 int
-main(int argc, char *argv[])
+main (int argc, char *argv[])
 {
   const char *plugin_name;
   char *cfg_name;
 
-  SETUP_CFG(plugin_name, cfg_name);
+  SETUP_CFG (plugin_name, cfg_name);
   res = 1;
   if (0 !=
-      GNUNET_TESTING_peer_run("test-namestore-api-zone-iteration-specific-zone",
-                              cfg_name,
-                              &run,
-                              NULL))
-    {
-      res = 1;
-    }
-  GNUNET_DISK_purge_cfg_dir(cfg_name,
-                            "GNUNET_TEST_HOME");
-  GNUNET_free(cfg_name);
+      GNUNET_TESTING_peer_run (
+        "test-namestore-api-zone-iteration-specific-zone",
+        cfg_name,
+        &run,
+        NULL))
+  {
+    res = 1;
+  }
+  GNUNET_DISK_purge_cfg_dir (cfg_name,
+                             "GNUNET_TEST_HOME");
+  GNUNET_free (cfg_name);
   return res;
 }