1 files changed, 231 insertions, 232 deletions

diff --git a/src/namestore/test_namestore_api_zone_iteration_nick.c b/src/namestore/test_namestore_api_zone_iteration_nick.c
index 069c6d831..739e71c05 100644
--- a/src/namestore/test_namestore_api_zone_iteration_nick.c
+++ b/src/namestore/test_namestore_api_zone_iteration_nick.c
@@ -11,12 +11,12 @@
      WITHOUT ANY WARRANTY; without even the implied warranty of
      MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
      Affero General Public License for more details.
-    
+
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
      SPDX-License-Identifier: AGPL3.0-or-later
-*/
+ */
 /**
  * @file namestore/test_namestore_api_zone_iteration.c
  * @brief testcase for zone iteration functionality: iterate all zones
@@ -32,7 +32,7 @@
 #define ZONE_NICK_1 "nick1"
 #define ZONE_NICK_2 "nick2"
 
-#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;
@@ -69,266 +69,266 @@ static struct GNUNET_NAMESTORE_QueueEntry *nsqe;
  * @param tc scheduler context
  */
 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 (nsh != NULL)
-  {
-    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);
+    {
+      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);
-  }
+    {
+      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 (privkey != NULL)
-  {
-    GNUNET_free (privkey);
-    privkey = NULL;
-  }
+    {
+      GNUNET_free(privkey);
+      privkey = NULL;
+    }
   if (privkey2 != NULL)
-  {
-    GNUNET_free (privkey2);
-    privkey2 = NULL;
-  }
+    {
+      GNUNET_free(privkey2);
+      privkey2 = NULL;
+    }
 }
 
 
 static int
-check_zone_1 (const char *label, unsigned int rd_count,
-              const struct GNUNET_GNSRECORD_Data *rd)
+check_zone_1(const char *label, unsigned int rd_count,
+             const struct GNUNET_GNSRECORD_Data *rd)
 {
-  for (unsigned int c = 0; c< rd_count ; c++)
-  {
-    if ( (rd[c].record_type == GNUNET_GNSRECORD_TYPE_NICK) &&
-         (0 != strcmp (rd[c].data, ZONE_NICK_1)) )
+  for (unsigned int c = 0; c < rd_count; c++)
     {
-      GNUNET_break (0);
-      return GNUNET_YES;
+      if ((rd[c].record_type == GNUNET_GNSRECORD_TYPE_NICK) &&
+          (0 != strcmp(rd[c].data, ZONE_NICK_1)))
+        {
+          GNUNET_break(0);
+          return GNUNET_YES;
+        }
     }
-  }
   return GNUNET_NO;
 }
 
 
 static int
-check_zone_2 (const char *label,
-              unsigned int rd_count,
-              const struct GNUNET_GNSRECORD_Data *rd)
+check_zone_2(const char *label,
+             unsigned int rd_count,
+             const struct GNUNET_GNSRECORD_Data *rd)
 {
-  for (unsigned int c = 0; c< rd_count ; c++)
-  {
-    if ( (rd[c].record_type == GNUNET_GNSRECORD_TYPE_NICK) &&
-         (0 != strcmp (rd[c].data, ZONE_NICK_2)) )
+  for (unsigned int c = 0; c < rd_count; c++)
     {
-      GNUNET_break (0);
-      return GNUNET_YES;
+      if ((rd[c].record_type == GNUNET_GNSRECORD_TYPE_NICK) &&
+          (0 != strcmp(rd[c].data, ZONE_NICK_2)))
+        {
+          GNUNET_break(0);
+          return GNUNET_YES;
+        }
     }
-  }
   return GNUNET_NO;
 }
 
 
 static void
-zone_proc_end (void *cls)
+zone_proc_end(void *cls)
 {
   zi = NULL;
   res = 0;
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-              "Received last result, iteration done after receing %u results\n",
-              returned_records);
-  GNUNET_SCHEDULER_shutdown ();
+  GNUNET_log(GNUNET_ERROR_TYPE_DEBUG,
+             "Received last result, iteration done after receing %u results\n",
+             returned_records);
+  GNUNET_SCHEDULER_shutdown();
 }
 
 
 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))
-  {
-    failed = check_zone_1 (label, rd_count, rd);
-    if (GNUNET_YES == failed)
-      GNUNET_break (0);
-  }
-  else if (0 == GNUNET_memcmp (zone, privkey2))
-  {
-    failed = check_zone_2 (label, rd_count, rd);
-    if (GNUNET_YES == failed)
-      GNUNET_break (0);
-  }
+  GNUNET_assert(NULL != zone);
+  if (0 == GNUNET_memcmp(zone, privkey))
+    {
+      failed = check_zone_1(label, rd_count, rd);
+      if (GNUNET_YES == failed)
+        GNUNET_break(0);
+    }
+  else if (0 == GNUNET_memcmp(zone, privkey2))
+    {
+      failed = check_zone_2(label, rd_count, rd);
+      if (GNUNET_YES == failed)
+        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 = 1;
-    GNUNET_SCHEDULER_shutdown ();
-  }
+    {
+      GNUNET_break(0);
+      res = 1;
+      GNUNET_SCHEDULER_shutdown();
+    }
 }
 
 
 static void
-fail_cb (void *cls)
+fail_cb(void *cls)
 {
-  GNUNET_assert (0);
+  GNUNET_assert(0);
 }
 
 
 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);
-    GNUNET_SCHEDULER_shutdown ();
-    return;
-  }
+    {
+      GNUNET_log(GNUNET_ERROR_TYPE_ERROR, "Failed to created records: `%s'\n",
+                 emsg);
+      GNUNET_break(0);
+      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,
-                                                NULL,
-                                                &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);
-      GNUNET_SCHEDULER_shutdown ();
-      return;
+      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,
+                                                 NULL,
+                                                 &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);
+          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;
 }
 
 
 static void
-nick_2_cont (void *cls,
-             int32_t success,
-             const char *emsg)
+nick_2_cont(void *cls,
+            int32_t success,
+            const char *emsg)
 {
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-              "Nick added : %s\n",
-              (success == GNUNET_OK) ? "SUCCESS" : "FAIL");
+  GNUNET_log(GNUNET_ERROR_TYPE_DEBUG,
+             "Nick added : %s\n",
+             (success == GNUNET_OK) ? "SUCCESS" : "FAIL");
 
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Created record 1\n");
+  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_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_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_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");
+  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_NAMESTORE_records_store(nsh, privkey2, s_name_3,
+                                 1, s_rd_3,
+                                 &put_cont, NULL);
 }
 
 
 static void
-nick_1_cont (void *cls, int32_t success, const char *emsg)
+nick_1_cont(void *cls, int32_t success, const char *emsg)
 {
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-              "Nick 1 added : %s\n",
-              (success == GNUNET_OK) ? "SUCCESS" : "FAIL");
+  GNUNET_log(GNUNET_ERROR_TYPE_DEBUG,
+             "Nick 1 added : %s\n",
+             (success == GNUNET_OK) ? "SUCCESS" : "FAIL");
 
-  nsqe = GNUNET_NAMESTORE_set_nick (nsh, privkey2, ZONE_NICK_2, &nick_2_cont, &privkey2);
+  nsqe = GNUNET_NAMESTORE_set_nick(nsh, privkey2, ZONE_NICK_2, &nick_2_cont, &privkey2);
   if (NULL == nsqe)
-  {
-    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-              _("Namestore cannot store no block\n"));
-  }
+    {
+      GNUNET_log(GNUNET_ERROR_TYPE_ERROR,
+                 _("Namestore cannot store no block\n"));
+    }
 }
 
 
@@ -338,70 +338,69 @@ nick_1_cont (void *cls, int32_t success, const char *emsg)
  * 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);
-    GNUNET_SCHEDULER_shutdown ();
-    return;
-  }
+    {
+      GNUNET_log(GNUNET_ERROR_TYPE_ERROR,
+                 _("Expected empty zone but received zone private key\n"));
+      GNUNET_break(0);
+      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);
-    GNUNET_SCHEDULER_shutdown ();
-    return;
-  }
-  GNUNET_assert (0);
+    {
+      GNUNET_log(GNUNET_ERROR_TYPE_ERROR,
+                 _("Expected no zone content but received data\n"));
+      GNUNET_break(0);
+      GNUNET_SCHEDULER_shutdown();
+      return;
+    }
+  GNUNET_assert(0);
 }
 
 
 static void
-empty_zone_end (void *cls)
+empty_zone_end(void *cls)
 {
-  GNUNET_assert (nsh == cls);
+  GNUNET_assert(nsh == cls);
   zi = NULL;
-  privkey = GNUNET_CRYPTO_ecdsa_key_create ();
-  GNUNET_assert (privkey != NULL);
-  privkey2 = GNUNET_CRYPTO_ecdsa_key_create ();
-  GNUNET_assert (privkey2 != NULL);
-
-  nsqe = GNUNET_NAMESTORE_set_nick (nsh,
-                                    privkey,
-                                    ZONE_NICK_1,
-                                    &nick_1_cont,
-                                    &privkey);
+  privkey = GNUNET_CRYPTO_ecdsa_key_create();
+  GNUNET_assert(privkey != NULL);
+  privkey2 = GNUNET_CRYPTO_ecdsa_key_create();
+  GNUNET_assert(privkey2 != NULL);
+
+  nsqe = GNUNET_NAMESTORE_set_nick(nsh,
+                                   privkey,
+                                   ZONE_NICK_1,
+                                   &nick_1_cont,
+                                   &privkey);
   if (NULL == nsqe)
-  {
-    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-              _("Namestore cannot store no block\n"));
-  }
-
+    {
+      GNUNET_log(GNUNET_ERROR_TYPE_ERROR,
+                 _("Namestore cannot store no block\n"));
+    }
 }
 
 
 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)
 {
-  nsh = GNUNET_NAMESTORE_connect (cfg);
-  GNUNET_break (NULL != nsh);
-  GNUNET_SCHEDULER_add_shutdown (&end,
-                                 NULL);
+  nsh = GNUNET_NAMESTORE_connect(cfg);
+  GNUNET_break(NULL != nsh);
+  GNUNET_SCHEDULER_add_shutdown(&end,
+                                NULL);
   /* first, iterate over empty namestore */
   zi = GNUNET_NAMESTORE_zone_iteration_start(nsh,
-                                             NULL,
+                                             NULL,
                                              &fail_cb,
                                              NULL,
                                              &empty_zone_proc,
@@ -409,12 +408,12 @@ run (void *cls,
                                              &empty_zone_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();
+    }
 }
 
 
@@ -422,24 +421,24 @@ 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-nick",
-                               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-nick",
+                              cfg_name,
+                              &run,
+                              NULL))
+    {
+      res = 1;
+    }
+  GNUNET_DISK_purge_cfg_dir(cfg_name,
+                            "GNUNET_TEST_HOME");
+  GNUNET_free(cfg_name);
   return res;
 }