1 files changed, 196 insertions, 179 deletions

diff --git a/src/fs/test_fs_download_persistence.c b/src/fs/test_fs_download_persistence.c
index 97c2a338c..78dbe821e 100644
--- a/src/fs/test_fs_download_persistence.c
+++ b/src/fs/test_fs_download_persistence.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_download_persistence.c
@@ -36,12 +36,12 @@
 /**
  * How long until we give up on transmitting the message?
  */
-#define TIMEOUT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 60)
+#define TIMEOUT GNUNET_TIME_relative_multiply(GNUNET_TIME_UNIT_SECONDS, 60)
 
 /**
  * How long should our test-content live?
  */
-#define LIFETIME GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_MINUTES, 15)
+#define LIFETIME GNUNET_TIME_relative_multiply(GNUNET_TIME_UNIT_MINUTES, 15)
 
 
 static struct GNUNET_TIME_Absolute start;
@@ -62,66 +62,66 @@ static int err;
 
 
 static void
-timeout_kill_task (void *cls)
+timeout_kill_task(void *cls)
 {
-  GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Timeout downloading file\n");
+  GNUNET_log(GNUNET_ERROR_TYPE_ERROR, "Timeout downloading file\n");
   if (download != NULL)
-  {
-    GNUNET_FS_download_stop (download, GNUNET_YES);
-    download = NULL;
-  }
+    {
+      GNUNET_FS_download_stop(download, GNUNET_YES);
+      download = NULL;
+    }
   else if (publish != NULL)
-  {
-    GNUNET_FS_publish_stop (publish);
-    publish = NULL;
-  }
+    {
+      GNUNET_FS_publish_stop(publish);
+      publish = NULL;
+    }
   timeout_kill = NULL;
   err = 1;
 }
 
 
 static void
-abort_publish_task (void *cls)
+abort_publish_task(void *cls)
 {
   if (publish != NULL)
-  {
-    GNUNET_FS_publish_stop (publish);
-    publish = NULL;
-  }
+    {
+      GNUNET_FS_publish_stop(publish);
+      publish = NULL;
+    }
 }
 
 
 static void
-abort_download_task (void *cls)
+abort_download_task(void *cls)
 {
   uint64_t size;
 
   if (download != NULL)
-  {
-    GNUNET_FS_download_stop (download, GNUNET_YES);
-    download = NULL;
-  }
-  GNUNET_assert (GNUNET_OK == GNUNET_DISK_file_size (fn, &size, GNUNET_YES, GNUNET_NO));
-  GNUNET_assert (size == FILESIZE);
-  GNUNET_DISK_directory_remove (fn);
-  GNUNET_free (fn);
+    {
+      GNUNET_FS_download_stop(download, GNUNET_YES);
+      download = NULL;
+    }
+  GNUNET_assert(GNUNET_OK == GNUNET_DISK_file_size(fn, &size, GNUNET_YES, GNUNET_NO));
+  GNUNET_assert(size == FILESIZE);
+  GNUNET_DISK_directory_remove(fn);
+  GNUNET_free(fn);
   fn = NULL;
-  GNUNET_SCHEDULER_cancel (timeout_kill);
+  GNUNET_SCHEDULER_cancel(timeout_kill);
   timeout_kill = NULL;
 }
 
 
 static void *
-progress_cb (void *cls, const struct GNUNET_FS_ProgressInfo *event);
+progress_cb(void *cls, const struct GNUNET_FS_ProgressInfo *event);
 
 
 static void
-restart_fs_task (void *cls)
+restart_fs_task(void *cls)
 {
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Restarting FS.\n");
-  GNUNET_FS_stop (fs);
-  fs = GNUNET_FS_start (cfg, "test-fs-download-persistence", &progress_cb, NULL,
-                        GNUNET_FS_FLAGS_PERSISTENCE, GNUNET_FS_OPTIONS_END);
+  GNUNET_log(GNUNET_ERROR_TYPE_DEBUG, "Restarting FS.\n");
+  GNUNET_FS_stop(fs);
+  fs = GNUNET_FS_start(cfg, "test-fs-download-persistence", &progress_cb, NULL,
+                       GNUNET_FS_FLAGS_PERSISTENCE, GNUNET_FS_OPTIONS_END);
 }
 
 
@@ -133,7 +133,7 @@ restart_fs_task (void *cls)
  * @param ev type of the event to consider
  */
 static void
-consider_restart (int ev)
+consider_restart(int ev)
 {
   static int prev[32];
   static int off;
@@ -143,141 +143,158 @@ consider_restart (int ev)
     if (prev[i] == ev)
       return;
   prev[off++] = ev;
-  GNUNET_SCHEDULER_add_with_priority (GNUNET_SCHEDULER_PRIORITY_URGENT,
-                                      &restart_fs_task, NULL);
+  GNUNET_SCHEDULER_add_with_priority(GNUNET_SCHEDULER_PRIORITY_URGENT,
+                                     &restart_fs_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_PUBLISH_PROGRESS:
-    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-                "Publish is progressing (%llu/%llu at level %u off %llu)...\n",
-                (unsigned long long) event->value.publish.completed,
-                (unsigned long long) event->value.publish.size,
-                event->value.publish.specifics.progress.depth,
-                (unsigned long long) event->value.publish.specifics.
-                progress.offset);
-    break;
-  case GNUNET_FS_STATUS_PUBLISH_PROGRESS_DIRECTORY:
-    break;
-  case GNUNET_FS_STATUS_PUBLISH_COMPLETED:
-    printf ("Publishing complete, %llu kbps.\n",
-            (unsigned long long) (FILESIZE * 1000000LL /
+    {
+    case GNUNET_FS_STATUS_PUBLISH_PROGRESS:
+      GNUNET_log(GNUNET_ERROR_TYPE_DEBUG,
+                 "Publish is progressing (%llu/%llu at level %u off %llu)...\n",
+                 (unsigned long long)event->value.publish.completed,
+                 (unsigned long long)event->value.publish.size,
+                 event->value.publish.specifics.progress.depth,
+                 (unsigned long long)event->value.publish.specifics.
+                 progress.offset);
+      break;
+
+    case GNUNET_FS_STATUS_PUBLISH_PROGRESS_DIRECTORY:
+      break;
+
+    case GNUNET_FS_STATUS_PUBLISH_COMPLETED:
+      printf("Publishing complete, %llu kbps.\n",
+             (unsigned long long)(FILESIZE * 1000000LL /
                                   (1 +
                                    GNUNET_TIME_absolute_get_duration
-                                   (start).rel_value_us) / 1024LL));
-    fn = GNUNET_DISK_mktemp ("gnunet-download-test-dst");
-    start = GNUNET_TIME_absolute_get ();
-    GNUNET_assert (download == NULL);
-    GNUNET_FS_download_start (fs,
-                              event->value.publish.specifics.completed.chk_uri,
-                              NULL, fn, NULL, 0, FILESIZE, 1,
-                              GNUNET_FS_DOWNLOAD_OPTION_NONE, "download", NULL);
-    break;
-  case GNUNET_FS_STATUS_DOWNLOAD_COMPLETED:
-    printf ("Download complete,  %llu kbps.\n",
-            (unsigned long long) (FILESIZE * 1000000LL /
+                                     (start).rel_value_us) / 1024LL));
+      fn = GNUNET_DISK_mktemp("gnunet-download-test-dst");
+      start = GNUNET_TIME_absolute_get();
+      GNUNET_assert(download == NULL);
+      GNUNET_FS_download_start(fs,
+                               event->value.publish.specifics.completed.chk_uri,
+                               NULL, fn, NULL, 0, FILESIZE, 1,
+                               GNUNET_FS_DOWNLOAD_OPTION_NONE, "download", NULL);
+      break;
+
+    case GNUNET_FS_STATUS_DOWNLOAD_COMPLETED:
+      printf("Download complete,  %llu kbps.\n",
+             (unsigned long long)(FILESIZE * 1000000LL /
                                   (1 +
                                    GNUNET_TIME_absolute_get_duration
-                                   (start).rel_value_us) / 1024LL));
-    GNUNET_SCHEDULER_add_now (&abort_download_task, NULL);
-    break;
-  case GNUNET_FS_STATUS_DOWNLOAD_PROGRESS:
-    consider_restart (event->status);
-    GNUNET_assert (download == event->value.download.dc);
-    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-                "Download is progressing (%llu/%llu at level %u off %llu)...\n",
-                (unsigned long long) event->value.download.completed,
-                (unsigned long long) event->value.download.size,
-                event->value.download.specifics.progress.depth,
-                (unsigned long long) event->value.download.specifics.
-                progress.offset);
-    break;
-  case GNUNET_FS_STATUS_PUBLISH_ERROR:
-    fprintf (stderr, "Error publishing file: %s\n",
-             event->value.publish.specifics.error.message);
-    GNUNET_break (0);
-    GNUNET_SCHEDULER_add_now (&abort_publish_task, NULL);
-    break;
-  case GNUNET_FS_STATUS_DOWNLOAD_ERROR:
-    fprintf (stderr, "Error downloading file: %s\n",
-             event->value.download.specifics.error.message);
-    GNUNET_SCHEDULER_add_now (&abort_download_task, NULL);
-    break;
-  case GNUNET_FS_STATUS_PUBLISH_SUSPEND:
-    GNUNET_assert (event->value.publish.pc == publish);
-    publish = NULL;
-    break;
-  case GNUNET_FS_STATUS_PUBLISH_RESUME:
-    GNUNET_assert (NULL == publish);
-    publish = event->value.publish.pc;
-    break;
-  case GNUNET_FS_STATUS_DOWNLOAD_SUSPEND:
-    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Download suspended.\n");
-    GNUNET_assert (event->value.download.dc == download);
-    download = NULL;
-    break;
-  case GNUNET_FS_STATUS_DOWNLOAD_RESUME:
-    GNUNET_assert (NULL == download);
-    download = event->value.download.dc;
-    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Download resumed.\n");
-    break;
-  case GNUNET_FS_STATUS_DOWNLOAD_ACTIVE:
-    consider_restart (event->status);
-    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Download active.\n");
-    break;
-  case GNUNET_FS_STATUS_DOWNLOAD_INACTIVE:
-    consider_restart (event->status);
-    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Download inactive.\n");
-    break;
-  case GNUNET_FS_STATUS_PUBLISH_START:
-    GNUNET_assert (0 == strcmp ("publish-context", event->value.publish.cctx));
-    GNUNET_assert (NULL == event->value.publish.pctx);
-    GNUNET_assert (FILESIZE == event->value.publish.size);
-    GNUNET_assert (0 == event->value.publish.completed);
-    GNUNET_assert (1 == event->value.publish.anonymity);
-    break;
-  case GNUNET_FS_STATUS_PUBLISH_STOPPED:
-    GNUNET_assert (publish == event->value.publish.pc);
-    GNUNET_assert (FILESIZE == event->value.publish.size);
-    GNUNET_assert (1 == event->value.publish.anonymity);
-    GNUNET_FS_stop (fs);
-    fs = NULL;
-    break;
-  case GNUNET_FS_STATUS_DOWNLOAD_START:
-    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Download started.\n");
-    consider_restart (event->status);
-    GNUNET_assert (download == NULL);
-    download = event->value.download.dc;
-    GNUNET_assert (0 == strcmp ("download", event->value.download.cctx));
-    GNUNET_assert (NULL == event->value.download.pctx);
-    GNUNET_assert (NULL != event->value.download.uri);
-    GNUNET_assert (0 == strcmp (fn, event->value.download.filename));
-    GNUNET_assert (FILESIZE == event->value.download.size);
-    GNUNET_assert (0 == event->value.download.completed);
-    GNUNET_assert (1 == event->value.download.anonymity);
-    break;
-  case GNUNET_FS_STATUS_DOWNLOAD_STOPPED:
-    GNUNET_assert (download == event->value.download.dc);
-    GNUNET_SCHEDULER_add_now (&abort_publish_task, NULL);
-    download = NULL;
-    break;
-  default:
-    printf ("Unexpected event: %d\n", event->status);
-    break;
-  }
+                                     (start).rel_value_us) / 1024LL));
+      GNUNET_SCHEDULER_add_now(&abort_download_task, NULL);
+      break;
+
+    case GNUNET_FS_STATUS_DOWNLOAD_PROGRESS:
+      consider_restart(event->status);
+      GNUNET_assert(download == event->value.download.dc);
+      GNUNET_log(GNUNET_ERROR_TYPE_DEBUG,
+                 "Download is progressing (%llu/%llu at level %u off %llu)...\n",
+                 (unsigned long long)event->value.download.completed,
+                 (unsigned long long)event->value.download.size,
+                 event->value.download.specifics.progress.depth,
+                 (unsigned long long)event->value.download.specifics.
+                 progress.offset);
+      break;
+
+    case GNUNET_FS_STATUS_PUBLISH_ERROR:
+      fprintf(stderr, "Error publishing file: %s\n",
+              event->value.publish.specifics.error.message);
+      GNUNET_break(0);
+      GNUNET_SCHEDULER_add_now(&abort_publish_task, NULL);
+      break;
+
+    case GNUNET_FS_STATUS_DOWNLOAD_ERROR:
+      fprintf(stderr, "Error downloading file: %s\n",
+              event->value.download.specifics.error.message);
+      GNUNET_SCHEDULER_add_now(&abort_download_task, NULL);
+      break;
+
+    case GNUNET_FS_STATUS_PUBLISH_SUSPEND:
+      GNUNET_assert(event->value.publish.pc == publish);
+      publish = NULL;
+      break;
+
+    case GNUNET_FS_STATUS_PUBLISH_RESUME:
+      GNUNET_assert(NULL == publish);
+      publish = event->value.publish.pc;
+      break;
+
+    case GNUNET_FS_STATUS_DOWNLOAD_SUSPEND:
+      GNUNET_log(GNUNET_ERROR_TYPE_DEBUG, "Download suspended.\n");
+      GNUNET_assert(event->value.download.dc == download);
+      download = NULL;
+      break;
+
+    case GNUNET_FS_STATUS_DOWNLOAD_RESUME:
+      GNUNET_assert(NULL == download);
+      download = event->value.download.dc;
+      GNUNET_log(GNUNET_ERROR_TYPE_DEBUG, "Download resumed.\n");
+      break;
+
+    case GNUNET_FS_STATUS_DOWNLOAD_ACTIVE:
+      consider_restart(event->status);
+      GNUNET_log(GNUNET_ERROR_TYPE_DEBUG, "Download active.\n");
+      break;
+
+    case GNUNET_FS_STATUS_DOWNLOAD_INACTIVE:
+      consider_restart(event->status);
+      GNUNET_log(GNUNET_ERROR_TYPE_DEBUG, "Download inactive.\n");
+      break;
+
+    case GNUNET_FS_STATUS_PUBLISH_START:
+      GNUNET_assert(0 == strcmp("publish-context", event->value.publish.cctx));
+      GNUNET_assert(NULL == event->value.publish.pctx);
+      GNUNET_assert(FILESIZE == event->value.publish.size);
+      GNUNET_assert(0 == event->value.publish.completed);
+      GNUNET_assert(1 == event->value.publish.anonymity);
+      break;
+
+    case GNUNET_FS_STATUS_PUBLISH_STOPPED:
+      GNUNET_assert(publish == event->value.publish.pc);
+      GNUNET_assert(FILESIZE == event->value.publish.size);
+      GNUNET_assert(1 == event->value.publish.anonymity);
+      GNUNET_FS_stop(fs);
+      fs = NULL;
+      break;
+
+    case GNUNET_FS_STATUS_DOWNLOAD_START:
+      GNUNET_log(GNUNET_ERROR_TYPE_DEBUG, "Download started.\n");
+      consider_restart(event->status);
+      GNUNET_assert(download == NULL);
+      download = event->value.download.dc;
+      GNUNET_assert(0 == strcmp("download", event->value.download.cctx));
+      GNUNET_assert(NULL == event->value.download.pctx);
+      GNUNET_assert(NULL != event->value.download.uri);
+      GNUNET_assert(0 == strcmp(fn, event->value.download.filename));
+      GNUNET_assert(FILESIZE == event->value.download.size);
+      GNUNET_assert(0 == event->value.download.completed);
+      GNUNET_assert(1 == event->value.download.anonymity);
+      break;
+
+    case GNUNET_FS_STATUS_DOWNLOAD_STOPPED:
+      GNUNET_assert(download == event->value.download.dc);
+      GNUNET_SCHEDULER_add_now(&abort_publish_task, NULL);
+      download = NULL;
+      break;
+
+    default:
+      printf("Unexpected event: %d\n", event->status);
+      break;
+    }
   return NULL;
 }
 
 
 static void
-run (void *cls,
-     const struct GNUNET_CONFIGURATION_Handle *c,
-     struct GNUNET_TESTING_Peer *peer)
+run(void *cls,
+    const struct GNUNET_CONFIGURATION_Handle *c,
+    struct GNUNET_TESTING_Peer *peer)
 {
   const char *keywords[] = {
     "down_foo",
@@ -291,40 +308,40 @@ run (void *cls,
   struct GNUNET_FS_BlockOptions bo;
 
   cfg = c;
-  fs = GNUNET_FS_start (cfg, "test-fs-download-persistence", &progress_cb, NULL,
-                        GNUNET_FS_FLAGS_PERSISTENCE, GNUNET_FS_OPTIONS_END);
-  GNUNET_assert (NULL != fs);
-  buf = GNUNET_malloc (FILESIZE);
+  fs = GNUNET_FS_start(cfg, "test-fs-download-persistence", &progress_cb, NULL,
+                       GNUNET_FS_FLAGS_PERSISTENCE, GNUNET_FS_OPTIONS_END);
+  GNUNET_assert(NULL != fs);
+  buf = GNUNET_malloc(FILESIZE);
   for (i = 0; i < FILESIZE; i++)
-    buf[i] = GNUNET_CRYPTO_random_u32 (GNUNET_CRYPTO_QUALITY_WEAK, 256);
-  meta = GNUNET_CONTAINER_meta_data_create ();
-  kuri = GNUNET_FS_uri_ksk_create_from_args (2, keywords);
+    buf[i] = GNUNET_CRYPTO_random_u32(GNUNET_CRYPTO_QUALITY_WEAK, 256);
+  meta = GNUNET_CONTAINER_meta_data_create();
+  kuri = GNUNET_FS_uri_ksk_create_from_args(2, keywords);
   bo.content_priority = 42;
   bo.anonymity_level = 1;
   bo.replication_level = 0;
-  bo.expiration_time = GNUNET_TIME_relative_to_absolute (LIFETIME);
-  fi = GNUNET_FS_file_information_create_from_data (fs, "publish-context",
-                                                    FILESIZE, buf, kuri, meta,
-                                                    GNUNET_NO, &bo);
-  GNUNET_FS_uri_destroy (kuri);
-  GNUNET_CONTAINER_meta_data_destroy (meta);
-  GNUNET_assert (NULL != fi);
+  bo.expiration_time = GNUNET_TIME_relative_to_absolute(LIFETIME);
+  fi = GNUNET_FS_file_information_create_from_data(fs, "publish-context",
+                                                   FILESIZE, buf, kuri, meta,
+                                                   GNUNET_NO, &bo);
+  GNUNET_FS_uri_destroy(kuri);
+  GNUNET_CONTAINER_meta_data_destroy(meta);
+  GNUNET_assert(NULL != fi);
   timeout_kill =
-      GNUNET_SCHEDULER_add_delayed (TIMEOUT, &timeout_kill_task, NULL);
-  start = GNUNET_TIME_absolute_get ();
+    GNUNET_SCHEDULER_add_delayed(TIMEOUT, &timeout_kill_task, NULL);
+  start = GNUNET_TIME_absolute_get();
   publish =
-      GNUNET_FS_publish_start (fs, fi, NULL, NULL, NULL,
-                               GNUNET_FS_PUBLISH_OPTION_NONE);
-  GNUNET_assert (publish != NULL);
+    GNUNET_FS_publish_start(fs, fi, NULL, NULL, NULL,
+                            GNUNET_FS_PUBLISH_OPTION_NONE);
+  GNUNET_assert(publish != NULL);
 }
 
 
 int
-main (int argc, char *argv[])
+main(int argc, char *argv[])
 {
-  if (0 != GNUNET_TESTING_peer_run ("test-fs-download-persistence",
-                                    "test_fs_download_data.conf",
-                                    &run, NULL))
+  if (0 != GNUNET_TESTING_peer_run("test-fs-download-persistence",
+                                   "test_fs_download_data.conf",
+                                   &run, NULL))
     return 1;
   return err;
 }