1 files changed, 166 insertions, 161 deletions

diff --git a/src/fs/test_fs_namespace.c b/src/fs/test_fs_namespace.c
index 43c899b72..3abbd5063 100644
--- a/src/fs/test_fs_namespace.c
+++ b/src/fs/test_fs_namespace.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 fs/test_fs_namespace.c
@@ -49,118 +49,123 @@ static int err;
 
 
 static void
-abort_ksk_search_task (void *cls)
+abort_ksk_search_task(void *cls)
 {
   if (ksk_search != NULL)
-  {
-    GNUNET_FS_search_stop (ksk_search);
-    ksk_search = NULL;
-    if (sks_search == NULL)
     {
-      GNUNET_FS_stop (fs);
-      if (NULL != kill_task)
-        GNUNET_SCHEDULER_cancel (kill_task);
+      GNUNET_FS_search_stop(ksk_search);
+      ksk_search = NULL;
+      if (sks_search == NULL)
+        {
+          GNUNET_FS_stop(fs);
+          if (NULL != kill_task)
+            GNUNET_SCHEDULER_cancel(kill_task);
+        }
     }
-  }
 }
 
 
 static void
-abort_sks_search_task (void *cls)
+abort_sks_search_task(void *cls)
 {
   if (sks_search == NULL)
     return;
-  GNUNET_FS_search_stop (sks_search);
+  GNUNET_FS_search_stop(sks_search);
   sks_search = NULL;
   if (ksk_search == NULL)
-  {
-    GNUNET_FS_stop (fs);
-    if (NULL != kill_task)
-      GNUNET_SCHEDULER_cancel (kill_task);
-  }
+    {
+      GNUNET_FS_stop(fs);
+      if (NULL != kill_task)
+        GNUNET_SCHEDULER_cancel(kill_task);
+    }
 }
 
 
 static void
-do_timeout (void *cls)
+do_timeout(void *cls)
 {
   err = 1;
-  fprintf (stderr, "%s",  "Operation timed out\n");
+  fprintf(stderr, "%s", "Operation timed out\n");
   kill_task = NULL;
-  abort_sks_search_task (NULL);
-  abort_ksk_search_task (NULL);
+  abort_sks_search_task(NULL);
+  abort_ksk_search_task(NULL);
 }
 
 
 static void *
-progress_cb (void *cls, const struct GNUNET_FS_ProgressInfo *event)
+progress_cb(void *cls, const struct GNUNET_FS_ProgressInfo *event)
 {
   switch (event->status)
-  {
-  case GNUNET_FS_STATUS_SEARCH_RESULT:
-    if (sks_search == event->value.search.sc)
-    {
-      if (!GNUNET_FS_uri_test_equal
-          (sks_expect_uri, event->value.search.specifics.result.uri))
-      {
-        fprintf (stderr, "%s",  "Wrong result for sks search!\n");
-        err = 1;
-      }
-      /* give system 1ms to initiate update search! */
-      GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_MILLISECONDS,
-                                    &abort_sks_search_task, NULL);
-    }
-    else if (ksk_search == event->value.search.sc)
-    {
-      if (!GNUNET_FS_uri_test_equal
-          (ksk_expect_uri, event->value.search.specifics.result.uri))
-      {
-        fprintf (stderr, "%s",  "Wrong result for ksk search!\n");
-        err = 1;
-      }
-      GNUNET_SCHEDULER_add_now (&abort_ksk_search_task, NULL);
-    }
-    else
-    {
-      fprintf (stderr, "%s",  "Unexpected search result received!\n");
-      GNUNET_break (0);
-    }
-    break;
-  case GNUNET_FS_STATUS_SEARCH_ERROR:
-    fprintf (stderr, "Error searching file: %s\n",
-             event->value.search.specifics.error.message);
-    if (sks_search == event->value.search.sc)
-      GNUNET_SCHEDULER_add_now (&abort_sks_search_task, NULL);
-    else if (ksk_search == event->value.search.sc)
-      GNUNET_SCHEDULER_add_now (&abort_ksk_search_task, NULL);
-    else
-      GNUNET_break (0);
-    break;
-  case GNUNET_FS_STATUS_SEARCH_START:
-    GNUNET_assert ((NULL == event->value.search.cctx) ||
-                   (0 == strcmp ("sks_search", event->value.search.cctx)) ||
-                   (0 == strcmp ("ksk_search", event->value.search.cctx)));
-    if (NULL == event->value.search.cctx)
     {
-      GNUNET_assert (0 == strcmp ("sks_search", event->value.search.pctx));
-      update_started = GNUNET_YES;
+    case GNUNET_FS_STATUS_SEARCH_RESULT:
+      if (sks_search == event->value.search.sc)
+        {
+          if (!GNUNET_FS_uri_test_equal
+                (sks_expect_uri, event->value.search.specifics.result.uri))
+            {
+              fprintf(stderr, "%s", "Wrong result for sks search!\n");
+              err = 1;
+            }
+          /* give system 1ms to initiate update search! */
+          GNUNET_SCHEDULER_add_delayed(GNUNET_TIME_UNIT_MILLISECONDS,
+                                       &abort_sks_search_task, NULL);
+        }
+      else if (ksk_search == event->value.search.sc)
+        {
+          if (!GNUNET_FS_uri_test_equal
+                (ksk_expect_uri, event->value.search.specifics.result.uri))
+            {
+              fprintf(stderr, "%s", "Wrong result for ksk search!\n");
+              err = 1;
+            }
+          GNUNET_SCHEDULER_add_now(&abort_ksk_search_task, NULL);
+        }
+      else
+        {
+          fprintf(stderr, "%s", "Unexpected search result received!\n");
+          GNUNET_break(0);
+        }
+      break;
+
+    case GNUNET_FS_STATUS_SEARCH_ERROR:
+      fprintf(stderr, "Error searching file: %s\n",
+              event->value.search.specifics.error.message);
+      if (sks_search == event->value.search.sc)
+        GNUNET_SCHEDULER_add_now(&abort_sks_search_task, NULL);
+      else if (ksk_search == event->value.search.sc)
+        GNUNET_SCHEDULER_add_now(&abort_ksk_search_task, NULL);
+      else
+        GNUNET_break(0);
+      break;
+
+    case GNUNET_FS_STATUS_SEARCH_START:
+      GNUNET_assert((NULL == event->value.search.cctx) ||
+                    (0 == strcmp("sks_search", event->value.search.cctx)) ||
+                    (0 == strcmp("ksk_search", event->value.search.cctx)));
+      if (NULL == event->value.search.cctx)
+        {
+          GNUNET_assert(0 == strcmp("sks_search", event->value.search.pctx));
+          update_started = GNUNET_YES;
+        }
+      GNUNET_assert(1 == event->value.search.anonymity);
+      break;
+
+    case GNUNET_FS_STATUS_SEARCH_RESULT_STOPPED:
+      return NULL;
+
+    case GNUNET_FS_STATUS_SEARCH_STOPPED:
+      return NULL;
+
+    default:
+      fprintf(stderr, "Unexpected event: %d\n", event->status);
+      break;
     }
-    GNUNET_assert (1 == event->value.search.anonymity);
-    break;
-  case GNUNET_FS_STATUS_SEARCH_RESULT_STOPPED:
-    return NULL;
-  case GNUNET_FS_STATUS_SEARCH_STOPPED:
-    return NULL;
-  default:
-    fprintf (stderr, "Unexpected event: %d\n", event->status);
-    break;
-  }
   return event->value.search.cctx;
 }
 
 
 static void
-publish_cont (void *cls, const struct GNUNET_FS_Uri *ksk_uri, const char *emsg)
+publish_cont(void *cls, const struct GNUNET_FS_Uri *ksk_uri, const char *emsg)
 {
   char *msg;
   struct GNUNET_FS_Uri *sks_uri;
@@ -169,37 +174,37 @@ publish_cont (void *cls, const struct GNUNET_FS_Uri *ksk_uri, const char *emsg)
   char *ret;
 
   if (NULL != emsg)
-  {
-    fprintf (stderr, "Error publishing: %s\n", emsg);
-    err = 1;
-    GNUNET_FS_stop (fs);
-    return;
-  }
-  ret = GNUNET_STRINGS_data_to_string (&nsid, sizeof (nsid), buf, sizeof (buf));
-  GNUNET_assert (NULL != ret);
+    {
+      fprintf(stderr, "Error publishing: %s\n", emsg);
+      err = 1;
+      GNUNET_FS_stop(fs);
+      return;
+    }
+  ret = GNUNET_STRINGS_data_to_string(&nsid, sizeof(nsid), buf, sizeof(buf));
+  GNUNET_assert(NULL != ret);
   ret[0] = '\0';
-  GNUNET_snprintf (sbuf, sizeof (sbuf), "gnunet://fs/sks/%s/this", buf);
-  sks_uri = GNUNET_FS_uri_parse (sbuf, &msg);
+  GNUNET_snprintf(sbuf, sizeof(sbuf), "gnunet://fs/sks/%s/this", buf);
+  sks_uri = GNUNET_FS_uri_parse(sbuf, &msg);
   if (NULL == sks_uri)
-  {
-    fprintf (stderr, "failed to parse URI `%s': %s\n", sbuf, msg);
-    err = 1;
-    GNUNET_FS_stop (fs);
-    GNUNET_free_non_null (msg);
-    return;
-  }
+    {
+      fprintf(stderr, "failed to parse URI `%s': %s\n", sbuf, msg);
+      err = 1;
+      GNUNET_FS_stop(fs);
+      GNUNET_free_non_null(msg);
+      return;
+    }
   ksk_search =
-      GNUNET_FS_search_start (fs, ksk_uri, 1, GNUNET_FS_SEARCH_OPTION_NONE,
-                              "ksk_search");
+    GNUNET_FS_search_start(fs, ksk_uri, 1, GNUNET_FS_SEARCH_OPTION_NONE,
+                           "ksk_search");
   sks_search =
-      GNUNET_FS_search_start (fs, sks_uri, 1, GNUNET_FS_SEARCH_OPTION_NONE,
-                              "sks_search");
-  GNUNET_FS_uri_destroy (sks_uri);
+    GNUNET_FS_search_start(fs, sks_uri, 1, GNUNET_FS_SEARCH_OPTION_NONE,
+                           "sks_search");
+  GNUNET_FS_uri_destroy(sks_uri);
 }
 
 
 static void
-sks_cont (void *cls, const struct GNUNET_FS_Uri *uri, const char *emsg)
+sks_cont(void *cls, const struct GNUNET_FS_Uri *uri, const char *emsg)
 {
   struct GNUNET_CONTAINER_MetaData *meta;
   struct GNUNET_FS_Uri *ksk_uri;
@@ -207,61 +212,61 @@ sks_cont (void *cls, const struct GNUNET_FS_Uri *uri, const char *emsg)
   struct GNUNET_FS_BlockOptions bo;
 
   if (NULL == uri)
-  {
-    fprintf (stderr, "Error publishing: %s\n", emsg);
-    err = 1;
-    GNUNET_FS_stop (fs);
-    return;
-  }
-  meta = GNUNET_CONTAINER_meta_data_create ();
+    {
+      fprintf(stderr, "Error publishing: %s\n", emsg);
+      err = 1;
+      GNUNET_FS_stop(fs);
+      return;
+    }
+  meta = GNUNET_CONTAINER_meta_data_create();
   msg = NULL;
-  ksk_uri = GNUNET_FS_uri_parse ("gnunet://fs/ksk/ns-search", &msg);
-  GNUNET_assert (NULL == msg);
-  ksk_expect_uri = GNUNET_FS_uri_dup (uri);
+  ksk_uri = GNUNET_FS_uri_parse("gnunet://fs/ksk/ns-search", &msg);
+  GNUNET_assert(NULL == msg);
+  ksk_expect_uri = GNUNET_FS_uri_dup(uri);
   bo.content_priority = 1;
   bo.anonymity_level = 1;
   bo.replication_level = 0;
   bo.expiration_time =
-      GNUNET_TIME_relative_to_absolute (GNUNET_TIME_UNIT_MINUTES);
-  GNUNET_FS_publish_ksk (fs, ksk_uri, meta, uri, &bo,
-                         GNUNET_FS_PUBLISH_OPTION_NONE, &publish_cont, NULL);
-  GNUNET_FS_uri_destroy (ksk_uri);
-  GNUNET_CONTAINER_meta_data_destroy (meta);
+    GNUNET_TIME_relative_to_absolute(GNUNET_TIME_UNIT_MINUTES);
+  GNUNET_FS_publish_ksk(fs, ksk_uri, meta, uri, &bo,
+                        GNUNET_FS_PUBLISH_OPTION_NONE, &publish_cont, NULL);
+  GNUNET_FS_uri_destroy(ksk_uri);
+  GNUNET_CONTAINER_meta_data_destroy(meta);
 }
 
 
 static void
-adv_cont (void *cls, const struct GNUNET_FS_Uri *uri, const char *emsg)
+adv_cont(void *cls, const struct GNUNET_FS_Uri *uri, const char *emsg)
 {
   struct GNUNET_CONTAINER_MetaData *meta;
   struct GNUNET_CRYPTO_EcdsaPrivateKey *ns;
   struct GNUNET_FS_BlockOptions bo;
 
   if (NULL != emsg)
-  {
-    fprintf (stderr, "Error publishing: %s\n", emsg);
-    err = 1;
-    GNUNET_FS_stop (fs);
-    return;
-  }
-  ns = GNUNET_CRYPTO_ecdsa_key_create ();
-  meta = GNUNET_CONTAINER_meta_data_create ();
-  sks_expect_uri = GNUNET_FS_uri_dup (uri);
+    {
+      fprintf(stderr, "Error publishing: %s\n", emsg);
+      err = 1;
+      GNUNET_FS_stop(fs);
+      return;
+    }
+  ns = GNUNET_CRYPTO_ecdsa_key_create();
+  meta = GNUNET_CONTAINER_meta_data_create();
+  sks_expect_uri = GNUNET_FS_uri_dup(uri);
   bo.content_priority = 1;
   bo.anonymity_level = 1;
   bo.replication_level = 0;
   bo.expiration_time =
-      GNUNET_TIME_relative_to_absolute (GNUNET_TIME_UNIT_MINUTES);
-  GNUNET_CRYPTO_ecdsa_key_get_public (ns, &nsid);
-  GNUNET_FS_publish_sks (fs, ns, "this", "next", meta, uri,
-                         &bo, GNUNET_FS_PUBLISH_OPTION_NONE, &sks_cont, NULL);
-  GNUNET_CONTAINER_meta_data_destroy (meta);
-  GNUNET_free (ns);
+    GNUNET_TIME_relative_to_absolute(GNUNET_TIME_UNIT_MINUTES);
+  GNUNET_CRYPTO_ecdsa_key_get_public(ns, &nsid);
+  GNUNET_FS_publish_sks(fs, ns, "this", "next", meta, uri,
+                        &bo, GNUNET_FS_PUBLISH_OPTION_NONE, &sks_cont, NULL);
+  GNUNET_CONTAINER_meta_data_destroy(meta);
+  GNUNET_free(ns);
 }
 
 
 static void
-testNamespace ()
+testNamespace()
 {
   struct GNUNET_CRYPTO_EcdsaPrivateKey *ns;
   struct GNUNET_FS_BlockOptions bo;
@@ -269,46 +274,46 @@ testNamespace ()
   struct GNUNET_FS_Uri *ksk_uri;
   struct GNUNET_FS_Uri *sks_uri;
 
-  ns = GNUNET_CRYPTO_ecdsa_key_create ();
-  meta = GNUNET_CONTAINER_meta_data_create ();
-  ksk_uri = GNUNET_FS_uri_parse ("gnunet://fs/ksk/testnsa", NULL);
+  ns = GNUNET_CRYPTO_ecdsa_key_create();
+  meta = GNUNET_CONTAINER_meta_data_create();
+  ksk_uri = GNUNET_FS_uri_parse("gnunet://fs/ksk/testnsa", NULL);
   bo.content_priority = 1;
   bo.anonymity_level = 1;
   bo.replication_level = 0;
   bo.expiration_time =
-      GNUNET_TIME_relative_to_absolute (GNUNET_TIME_UNIT_MINUTES);
-  sks_uri = GNUNET_FS_uri_sks_create (&nsid, "root");
-  GNUNET_FS_publish_ksk (fs,
-                         ksk_uri, meta, sks_uri,
-                         &bo, GNUNET_FS_PUBLISH_OPTION_NONE,
-                         &adv_cont, NULL);
-  GNUNET_FS_uri_destroy (sks_uri);
+    GNUNET_TIME_relative_to_absolute(GNUNET_TIME_UNIT_MINUTES);
+  sks_uri = GNUNET_FS_uri_sks_create(&nsid, "root");
+  GNUNET_FS_publish_ksk(fs,
+                        ksk_uri, meta, sks_uri,
+                        &bo, GNUNET_FS_PUBLISH_OPTION_NONE,
+                        &adv_cont, NULL);
+  GNUNET_FS_uri_destroy(sks_uri);
   kill_task =
-      GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_MINUTES, &do_timeout,
-                                    NULL);
-  GNUNET_FS_uri_destroy (ksk_uri);
-  GNUNET_CONTAINER_meta_data_destroy (meta);
-  GNUNET_free (ns);
+    GNUNET_SCHEDULER_add_delayed(GNUNET_TIME_UNIT_MINUTES, &do_timeout,
+                                 NULL);
+  GNUNET_FS_uri_destroy(ksk_uri);
+  GNUNET_CONTAINER_meta_data_destroy(meta);
+  GNUNET_free(ns);
 }
 
 
 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)
 {
-  fs = GNUNET_FS_start (cfg, "test-fs-namespace", &progress_cb, NULL,
-                        GNUNET_FS_FLAGS_NONE, GNUNET_FS_OPTIONS_END);
-  testNamespace ();
+  fs = GNUNET_FS_start(cfg, "test-fs-namespace", &progress_cb, NULL,
+                       GNUNET_FS_FLAGS_NONE, GNUNET_FS_OPTIONS_END);
+  testNamespace();
 }
 
 
 int
-main (int argc, char *argv[])
+main(int argc, char *argv[])
 {
-  if (0 != GNUNET_TESTING_peer_run ("test-fs-namespace",
-                                    "test_fs_namespace_data.conf",
-                                    &run, NULL))
+  if (0 != GNUNET_TESTING_peer_run("test-fs-namespace",
+                                   "test_fs_namespace_data.conf",
+                                   &run, NULL))
     return 1;
   return err;
 }