1 files changed, 263 insertions, 264 deletions

diff --git a/src/namestore/test_namestore_api_zone_iteration_stop.c b/src/namestore/test_namestore_api_zone_iteration_stop.c
index 28f424b23..89007c82c 100644
--- a/src/namestore/test_namestore_api_zone_iteration_stop.c
+++ b/src/namestore/test_namestore_api_zone_iteration_stop.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_stop.c
  * @brief testcase for zone iteration functionality: stop iterating of zones
@@ -29,8 +29,8 @@
 
 #define TEST_RECORD_TYPE GNUNET_DNSPARSER_TYPE_TXT
 
-#define TIMEOUT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 100)
-#define WAIT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 2)
+#define TIMEOUT GNUNET_TIME_relative_multiply(GNUNET_TIME_UNIT_SECONDS, 100)
+#define WAIT GNUNET_TIME_relative_multiply(GNUNET_TIME_UNIT_SECONDS, 2)
 
 static struct GNUNET_NAMESTORE_Handle * nsh;
 
@@ -63,257 +63,257 @@ static struct GNUNET_GNSRECORD_Data *s_rd_3;
  * @param cls handle to use to re-connect.
  */
 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 void
-delayed_end (void *cls)
+delayed_end(void *cls)
 {
-  GNUNET_SCHEDULER_shutdown ();
+  GNUNET_SCHEDULER_shutdown();
 }
 
 
 static void
-fail_cb (void *cls)
+fail_cb(void *cls)
 {
-  GNUNET_assert (0);
+  GNUNET_assert(0);
 }
 
 
 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))
-  {
-    if (0 == strcmp (label, s_name_1))
+  GNUNET_assert(NULL != zone);
+  if (0 == GNUNET_memcmp(zone, privkey))
     {
-      if (rd_count == 1)
-      {
-        if (GNUNET_YES != GNUNET_GNSRECORD_records_cmp(rd, s_rd_1))
+      if (0 == strcmp(label, s_name_1))
         {
-          failed = GNUNET_YES;
-          GNUNET_break (0);
+          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);
+            }
         }
-      }
       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
-    {
-      GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-                  "Comparing result failed: got name `%s' for first zone\n", label);
-      failed = GNUNET_YES;
-      GNUNET_break (0);
     }
-  }
-  else if (0 == GNUNET_memcmp (zone, privkey2))
-  {
-    if (0 == strcmp (label, s_name_3))
+  else if (0 == GNUNET_memcmp(zone, privkey2))
     {
-      if (rd_count == 1)
-      {
-        if (GNUNET_YES != GNUNET_GNSRECORD_records_cmp(rd, s_rd_3))
+      if (0 == strcmp(label, s_name_3))
         {
-          failed = GNUNET_YES;
-          GNUNET_break (0);
+          if (rd_count == 1)
+            {
+              if (GNUNET_YES != GNUNET_GNSRECORD_records_cmp(rd, s_rd_3))
+                {
+                  failed = GNUNET_YES;
+                  GNUNET_break(0);
+                }
+            }
+          else
+            {
+              GNUNET_log(GNUNET_ERROR_TYPE_ERROR,
+                         "Received invalid record count\n");
+              failed = GNUNET_YES;
+              GNUNET_break(0);
+            }
         }
-      }
       else
-      {
-        GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-                    "Received invalid record count\n");
-        failed = GNUNET_YES;
-        GNUNET_break (0);
-      }
+        {
+          GNUNET_log(GNUNET_ERROR_TYPE_DEBUG,
+                     "Comparing result failed: got name `%s' for first zone\n", label);
+          failed = GNUNET_YES;
+          GNUNET_break(0);
+        }
     }
-    else
+  else
     {
-      GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-                  "Comparing result failed: got name `%s' for first zone\n", label);
+      GNUNET_log(GNUNET_ERROR_TYPE_ERROR,
+                 "Received invalid zone\n");
       failed = GNUNET_YES;
-      GNUNET_break (0);
+      GNUNET_break(0);
     }
-  }
-  else
-  {
-    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-                "Received invalid zone\n");
-    failed = GNUNET_YES;
-    GNUNET_break (0);
-  }
   if (failed == GNUNET_NO)
-  {
-    if (1 == returned_records)
     {
-      GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-                  "Telling namestore to stop zone iteration\n");
-      GNUNET_NAMESTORE_zone_iteration_stop (zi);
-      zi = NULL;
-      res = 0;
-      GNUNET_SCHEDULER_add_delayed (WAIT,
-                                    &delayed_end,
-                                    NULL);
-      return;
+      if (1 == returned_records)
+        {
+          GNUNET_log(GNUNET_ERROR_TYPE_DEBUG,
+                     "Telling namestore to stop zone iteration\n");
+          GNUNET_NAMESTORE_zone_iteration_stop(zi);
+          zi = NULL;
+          res = 0;
+          GNUNET_SCHEDULER_add_delayed(WAIT,
+                                       &delayed_end,
+                                       NULL);
+          return;
+        }
+      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);
-    GNUNET_SCHEDULER_shutdown ();
-  }
+    {
+      GNUNET_break(0);
+      GNUNET_SCHEDULER_shutdown();
+    }
 }
 
 
 static void
-zone_proc_end (void *cls)
+zone_proc_end(void *cls)
 {
-  GNUNET_break (1 <= returned_records);
+  GNUNET_break(1 <= returned_records);
   if (1 >= returned_records)
     res = 1; /* Last iteraterator callback, we are done */
   else
     res = 0;
   zi = NULL;
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-              "Received last result, iteration done after receing %u results\n",
-              returned_records);
-  GNUNET_SCHEDULER_add_now (&end, NULL);
+  GNUNET_log(GNUNET_ERROR_TYPE_DEBUG,
+             "Received last result, iteration done after receing %u results\n",
+             returned_records);
+  GNUNET_SCHEDULER_add_now(&end, NULL);
 }
 
 
 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;
 }
 
@@ -324,86 +324,85 @@ 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);
-    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_proc_end (void *cls)
+empty_zone_proc_end(void *cls)
 {
   char *hostkey_file;
 
-  GNUNET_assert (nsh == cls);
+  GNUNET_assert(nsh == cls);
   zi = NULL;
   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);
+  GNUNET_log(GNUNET_ERROR_TYPE_DEBUG,
+             "Using zonekey file `%s' \n",
+             hostkey_file);
   privkey = GNUNET_CRYPTO_ecdsa_key_create_from_file(hostkey_file);
-  GNUNET_free (hostkey_file);
-  GNUNET_assert (privkey != NULL);
-
-  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);
+  GNUNET_free(hostkey_file);
+  GNUNET_assert(privkey != NULL);
+
+  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_ecdsa_key_create_from_file(hostkey_file);
-  GNUNET_free (hostkey_file);
-  GNUNET_assert (privkey2 != NULL);
+  GNUNET_free(hostkey_file);
+  GNUNET_assert(privkey2 != NULL);
 
-  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);
+                                 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");
@@ -418,30 +417,30 @@ empty_zone_proc_end (void *cls)
 
 
 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,
-                                              &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();
+    }
 }
 
 
@@ -449,24 +448,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-stop",
-                               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-stop",
+                              cfg_name,
+                              &run,
+                              NULL))
+    {
+      res = 1;
+    }
+  GNUNET_DISK_purge_cfg_dir(cfg_name,
+                            "GNUNET_TEST_HOME");
+  GNUNET_free(cfg_name);
 
   return res;
 }