arg

[oweals/gnunet.git] / src / fs / test_fs_publish_persistence.c

diff --git a/src/fs/test_fs_publish_persistence.c b/src/fs/test_fs_publish_persistence.c
index 52b2b270e6fd1c7d424ba69f4733fb38ce02786a..fdb5beb7d66781f9e85c657552fac0738df631fc 100644 (file)
--- a/src/fs/test_fs_publish_persistence.c
+++ b/src/fs/test_fs_publish_persistence.c
@@ -157,10 +157,10 @@ progress_cb (void *cls,
       GNUNET_assert (publish == event->value.publish.pc);
 #if VERBOSE
       printf ("Publish is progressing (%llu/%llu at level %u off %llu)...\n",
-              (unsigned long long) event->abs_value.publish.completed,
-              (unsigned long long) event->abs_value.publish.size,
-             event->abs_value.publish.specifics.progress.depth,
-             (unsigned long long) event->abs_value.publish.specifics.progress.offset);
+              (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_SUSPEND:
@@ -252,14 +252,17 @@ static void
 stop_arm (struct PeerContext *p)
 {
 #if START_ARM
-  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 (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;
+    }
 #endif
   GNUNET_CONFIGURATION_destroy (p->cfg);
 }
@@ -282,6 +285,7 @@ run (void *cls,
   struct GNUNET_FS_FileInformation *fi2;
   struct GNUNET_FS_FileInformation *fidir;
   size_t i;
+  struct GNUNET_FS_BlockOptions bo;
 
   cfg = c;
   setup_peer (&p1, "test_fs_publish_data.conf");
@@ -316,33 +320,33 @@ run (void *cls,
 
   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); 
   fi1 = GNUNET_FS_file_information_create_from_file (fs,
                                                     "publish-context1",
                                                     fn1,
                                                     kuri,
                                                     meta,
                                                     GNUNET_YES,
-                                                    1,
-                                                    42,
-                                                    GNUNET_TIME_relative_to_absolute (LIFETIME)); 
+                                                    &bo);
   GNUNET_assert (NULL != fi1);
+  bo.anonymity_level = 2;
   fi2 = GNUNET_FS_file_information_create_from_file (fs,
                                                     "publish-context2",
                                                     fn2,
                                                     kuri,
                                                     meta,
                                                     GNUNET_YES,
-                                                    2,
-                                                    42,
-                                                    GNUNET_TIME_relative_to_absolute (LIFETIME)); 
+                                                    &bo);
   GNUNET_assert (NULL != fi2);
+  bo.anonymity_level = 3;
   fidir = GNUNET_FS_file_information_create_empty_directory (fs,
                                                             "publish-context-dir",
                                                             kuri,
                                                             meta,
-                                                            3,
-                                                            42,
-                                                            GNUNET_TIME_relative_to_absolute (LIFETIME)); 
+                                                            &bo);
   GNUNET_assert (GNUNET_OK == GNUNET_FS_file_information_add (fidir, fi1));
   GNUNET_assert (GNUNET_OK == GNUNET_FS_file_information_add (fidir, fi2));
   GNUNET_FS_uri_destroy (kuri);