1 files changed, 143 insertions, 157 deletions

diff --git a/src/fs/test_fs_search_persistence.c b/src/fs/test_fs_search_persistence.c
index 47d177a81..eceb4d1d5 100644
--- a/src/fs/test_fs_search_persistence.c
+++ b/src/fs/test_fs_search_persistence.c
@@ -45,13 +45,13 @@
 
 /**
  * How long should our test-content live?
- */ 
+ */
 #define LIFETIME GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_MINUTES, 15)
 
 struct PeerContext
 {
   struct GNUNET_CONFIGURATION_Handle *cfg;
-  struct GNUNET_PeerIdentity id;   
+  struct GNUNET_PeerIdentity id;
 #if START_ARM
   struct GNUNET_OS_Process *arm_proc;
 #endif
@@ -70,8 +70,7 @@ static struct GNUNET_FS_PublishContext *publish;
 static const struct GNUNET_CONFIGURATION_Handle *cfg;
 
 static void
-abort_publish_task (void *cls,
-                     const struct GNUNET_SCHEDULER_TaskContext *tc)
+abort_publish_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
 {
   GNUNET_FS_publish_stop (publish);
   publish = NULL;
@@ -79,8 +78,7 @@ abort_publish_task (void *cls,
 
 
 static void
-abort_search_task (void *cls,
-                     const struct GNUNET_SCHEDULER_TaskContext *tc)
+abort_search_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
 {
   if (search != NULL)
     GNUNET_FS_search_stop (search);
@@ -88,22 +86,19 @@ abort_search_task (void *cls,
 }
 
 
-static void *
-progress_cb (void *cls, 
-             const struct GNUNET_FS_ProgressInfo *event);
+static void *progress_cb (void *cls,
+                          const struct GNUNET_FS_ProgressInfo *event);
 
 
 static void
-restart_fs_task (void *cls,
-                 const struct GNUNET_SCHEDULER_TaskContext *tc)
+restart_fs_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
 {
   GNUNET_FS_stop (fs);
   fs = GNUNET_FS_start (cfg,
-                        "test-fs-search-persistence",
-                        &progress_cb,
-                        NULL,
-                        GNUNET_FS_FLAGS_PERSISTENCE,
-                        GNUNET_FS_OPTIONS_END);
+                        "test-fs-search-persistence",
+                        &progress_cb,
+                        NULL,
+                        GNUNET_FS_FLAGS_PERSISTENCE, GNUNET_FS_OPTIONS_END);
 }
 
 
@@ -122,129 +117,124 @@ consider_restart (int ev)
   static int prev[32];
   static int off;
   int i;
-  for (i=0;i<off;i++)
+
+  for (i = 0; i < off; i++)
     if (prev[i] == ev)
       return;
   prev[off++] = ev;
   GNUNET_SCHEDULER_add_with_priority (GNUNET_SCHEDULER_PRIORITY_URGENT,
-                                      &restart_fs_task,
-                                      NULL);
+                                      &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)
+{
   const char *keywords[] = {
     "down_foo"
   };
   struct GNUNET_FS_Uri *kuri;
 
   switch (event->status)
-    {
-    case GNUNET_FS_STATUS_PUBLISH_PROGRESS:
+  {
+  case GNUNET_FS_STATUS_PUBLISH_PROGRESS:
 #if VERBOSE
-      printf ("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);
-#endif      
-      break;
-    case GNUNET_FS_STATUS_PUBLISH_COMPLETED:
-      kuri = GNUNET_FS_uri_ksk_create_from_args (1, keywords);
-      start = GNUNET_TIME_absolute_get ();
-      GNUNET_FS_search_start (fs,
-                              kuri,
-                              1,
-                              GNUNET_FS_SEARCH_OPTION_NONE,
-                              "search");
-      GNUNET_FS_uri_destroy (kuri);
-      GNUNET_assert (search != NULL);
-      break;
-    case GNUNET_FS_STATUS_PUBLISH_SUSPEND:
-      if  (event->value.publish.pc == publish)
-        publish = NULL;
-      break;
-    case GNUNET_FS_STATUS_PUBLISH_RESUME:
-      if (NULL == publish)
-        publish = event->value.publish.pc;
-      break;
-    case GNUNET_FS_STATUS_SEARCH_RESULT:
-      /* FIXME: consider_restart (event->status); cannot be tested with
-         search result since we exit here after the first one... */
+    printf ("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);
+#endif
+    break;
+  case GNUNET_FS_STATUS_PUBLISH_COMPLETED:
+    kuri = GNUNET_FS_uri_ksk_create_from_args (1, keywords);
+    start = GNUNET_TIME_absolute_get ();
+    GNUNET_FS_search_start (fs,
+                            kuri, 1, GNUNET_FS_SEARCH_OPTION_NONE, "search");
+    GNUNET_FS_uri_destroy (kuri);
+    GNUNET_assert (search != NULL);
+    break;
+  case GNUNET_FS_STATUS_PUBLISH_SUSPEND:
+    if (event->value.publish.pc == publish)
+      publish = NULL;
+    break;
+  case GNUNET_FS_STATUS_PUBLISH_RESUME:
+    if (NULL == publish)
+      publish = event->value.publish.pc;
+    break;
+  case GNUNET_FS_STATUS_SEARCH_RESULT:
+    /* FIXME: consider_restart (event->status); cannot be tested with
+     * search result since we exit here after the first one... */
 #if VERBOSE
-      printf ("Search complete.\n");
+    printf ("Search complete.\n");
 #endif
-      GNUNET_SCHEDULER_add_continuation (&abort_search_task,
-                                         NULL,
-                                         GNUNET_SCHEDULER_REASON_PREREQ_DONE);
-      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_continuation (&abort_publish_task,
-                                         NULL,
-                                         GNUNET_SCHEDULER_REASON_PREREQ_DONE);
-      break;
-    case GNUNET_FS_STATUS_SEARCH_ERROR:
-      fprintf (stderr,
-               "Error searching file: %s\n",
-               event->value.search.specifics.error.message);
-      GNUNET_SCHEDULER_add_continuation (&abort_search_task,
-                                         NULL,
-                                         GNUNET_SCHEDULER_REASON_PREREQ_DONE);
-      break;
-    case GNUNET_FS_STATUS_SEARCH_SUSPEND:
-      if  (event->value.search.sc == search)
-        search = NULL;
-      break;
-    case GNUNET_FS_STATUS_SEARCH_RESUME:
-      if (NULL == search)
-        {
-          search = event->value.search.sc;
-          return "search";
-        }
-      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_SEARCH_START:
-      consider_restart (event->status);
-      GNUNET_assert (search == NULL);
-      search = event->value.search.sc;
-      GNUNET_assert (0 == strcmp ("search", event->value.search.cctx));
-      GNUNET_assert (1 == event->value.search.anonymity);
-      break;
-    case GNUNET_FS_STATUS_SEARCH_RESULT_STOPPED:
-      break;
-    case GNUNET_FS_STATUS_SEARCH_STOPPED:
-      GNUNET_assert (search == event->value.search.sc);
-      GNUNET_SCHEDULER_add_continuation (&abort_publish_task,
-                                         NULL,
-                                         GNUNET_SCHEDULER_REASON_PREREQ_DONE);
+    GNUNET_SCHEDULER_add_continuation (&abort_search_task,
+                                       NULL,
+                                       GNUNET_SCHEDULER_REASON_PREREQ_DONE);
+    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_continuation (&abort_publish_task,
+                                       NULL,
+                                       GNUNET_SCHEDULER_REASON_PREREQ_DONE);
+    break;
+  case GNUNET_FS_STATUS_SEARCH_ERROR:
+    fprintf (stderr,
+             "Error searching file: %s\n",
+             event->value.search.specifics.error.message);
+    GNUNET_SCHEDULER_add_continuation (&abort_search_task,
+                                       NULL,
+                                       GNUNET_SCHEDULER_REASON_PREREQ_DONE);
+    break;
+  case GNUNET_FS_STATUS_SEARCH_SUSPEND:
+    if (event->value.search.sc == search)
       search = NULL;
-      break;
-    default:
-      fprintf (stderr,
-               "Unexpected event: %d\n", 
-               event->status);
-      break;
+    break;
+  case GNUNET_FS_STATUS_SEARCH_RESUME:
+    if (NULL == search)
+    {
+      search = event->value.search.sc;
+      return "search";
     }
+    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_SEARCH_START:
+    consider_restart (event->status);
+    GNUNET_assert (search == NULL);
+    search = event->value.search.sc;
+    GNUNET_assert (0 == strcmp ("search", event->value.search.cctx));
+    GNUNET_assert (1 == event->value.search.anonymity);
+    break;
+  case GNUNET_FS_STATUS_SEARCH_RESULT_STOPPED:
+    break;
+  case GNUNET_FS_STATUS_SEARCH_STOPPED:
+    GNUNET_assert (search == event->value.search.sc);
+    GNUNET_SCHEDULER_add_continuation (&abort_publish_task,
+                                       NULL,
+                                       GNUNET_SCHEDULER_REASON_PREREQ_DONE);
+    search = NULL;
+    break;
+  default:
+    fprintf (stderr, "Unexpected event: %d\n", event->status);
+    break;
+  }
   return NULL;
 }
 
@@ -255,11 +245,11 @@ setup_peer (struct PeerContext *p, const char *cfgname)
   p->cfg = GNUNET_CONFIGURATION_create ();
 #if START_ARM
   p->arm_proc = GNUNET_OS_start_process (NULL, NULL, "gnunet-service-arm",
-                                        "gnunet-service-arm",
+                                         "gnunet-service-arm",
 #if VERBOSE
-                                        "-L", "DEBUG",
+                                         "-L", "DEBUG",
 #endif
-                                        "-c", cfgname, NULL);
+                                         "-c", cfgname, NULL);
 #endif
   GNUNET_assert (GNUNET_OK == GNUNET_CONFIGURATION_load (p->cfg, cfgname));
 }
@@ -270,16 +260,17 @@ stop_arm (struct PeerContext *p)
 {
 #if START_ARM
   if (NULL != p->arm_proc)
-    {
-      if (0 != GNUNET_OS_process_kill (p->arm_proc, SIGTERM))
-        GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING, "kill");
-      if (GNUNET_OS_process_wait(p->arm_proc) != GNUNET_OK)
-        GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING, "waitpid");
-      GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-                  "ARM process %u stopped\n", GNUNET_OS_process_get_pid (p->arm_proc));
-      GNUNET_OS_process_close (p->arm_proc);
-      p->arm_proc = NULL;
-    }
+  {
+    if (0 != GNUNET_OS_process_kill (p->arm_proc, SIGTERM))
+      GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING, "kill");
+    if (GNUNET_OS_process_wait (p->arm_proc) != GNUNET_OK)
+      GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING, "waitpid");
+    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+                "ARM process %u stopped\n",
+                GNUNET_OS_process_get_pid (p->arm_proc));
+    GNUNET_OS_process_close (p->arm_proc);
+    p->arm_proc = NULL;
+  }
 #endif
   GNUNET_CONFIGURATION_destroy (p->cfg);
 }
@@ -288,8 +279,7 @@ stop_arm (struct PeerContext *p)
 static void
 run (void *cls,
      char *const *args,
-     const char *cfgfile,
-     const struct GNUNET_CONFIGURATION_Handle *c)
+     const char *cfgfile, const struct GNUNET_CONFIGURATION_Handle *c)
 {
   const char *keywords[] = {
     "down_foo",
@@ -305,12 +295,11 @@ run (void *cls,
   cfg = c;
   setup_peer (&p1, "test_fs_search_data.conf");
   fs = GNUNET_FS_start (cfg,
-                        "test-fs-search-persistence",
-                        &progress_cb,
-                        NULL,
-                        GNUNET_FS_FLAGS_PERSISTENCE,
-                        GNUNET_FS_OPTIONS_END);
-  GNUNET_assert (NULL != fs); 
+                        "test-fs-search-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);
@@ -321,21 +310,18 @@ run (void *cls,
   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);
+                                                    "publish-context",
+                                                    FILESIZE,
+                                                    buf,
+                                                    kuri, meta, GNUNET_NO, &bo);
   GNUNET_FS_uri_destroy (kuri);
   GNUNET_CONTAINER_meta_data_destroy (meta);
   GNUNET_assert (NULL != fi);
   start = GNUNET_TIME_absolute_get ();
   publish = GNUNET_FS_publish_start (fs,
-                                    fi,
-                                    NULL, NULL, NULL,
-                                    GNUNET_FS_PUBLISH_OPTION_NONE);
+                                     fi,
+                                     NULL, NULL, NULL,
+                                     GNUNET_FS_PUBLISH_OPTION_NONE);
   GNUNET_assert (publish != NULL);
 }
 
@@ -343,7 +329,7 @@ run (void *cls,
 int
 main (int argc, char *argv[])
 {
-  char *const argvx[] = { 
+  char *const argvx[] = {
     "test-fs-search-persistence",
     "-c",
     "test_fs_search_data.conf",
@@ -357,16 +343,16 @@ main (int argc, char *argv[])
   };
 
   GNUNET_DISK_directory_remove ("/tmp/gnunet-test-fs-search/");
-  GNUNET_log_setup ("test_fs_search_persistence", 
+  GNUNET_log_setup ("test_fs_search_persistence",
 #if VERBOSE
-                    "DEBUG",
+                    "DEBUG",
 #else
-                    "WARNING",
+                    "WARNING",
 #endif
-                    NULL);
+                    NULL);
   GNUNET_PROGRAM_run ((sizeof (argvx) / sizeof (char *)) - 1,
                       argvx, "test-fs-search-persistence",
-                      "nohelp", options, &run, NULL);
+                      "nohelp", options, &run, NULL);
   stop_arm (&p1);
   GNUNET_DISK_directory_remove ("/tmp/gnunet-test-fs-search/");
   return 0;