- update fs

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

diff --git a/src/fs/test_fs_search_persistence.c b/src/fs/test_fs_search_persistence.c
index 82f77d9e2ca00bf2d509dac031f623deb1593ceb..34ea04acad8ff69849fd6944be9a6545414d26fa 100644 (file)
--- a/src/fs/test_fs_search_persistence.c
+++ b/src/fs/test_fs_search_persistence.c
@@ -62,6 +62,7 @@ static int err;
 static void
 abort_error (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
 {
+  timeout_task = GNUNET_SCHEDULER_NO_TASK;
   fprintf (stderr,
           "Timeout\n");
   if (NULL != search)
@@ -80,17 +81,27 @@ abort_error (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
 static void
 abort_publish_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
 {
-  GNUNET_FS_publish_stop (publish);
-  publish = NULL;
+  if (NULL != publish)
+  {
+    GNUNET_FS_publish_stop (publish);
+    publish = NULL;
+  }
+  if (GNUNET_SCHEDULER_NO_TASK != timeout_task)
+  {
+    GNUNET_SCHEDULER_cancel (timeout_task);
+    timeout_task = GNUNET_SCHEDULER_NO_TASK;
+  }
 }
 
 
 static void
 abort_search_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
 {
-  if (search != NULL)
+  if (NULL != search)
+  {
     GNUNET_FS_search_stop (search);
-  search = NULL;
+    search = NULL;
+  }
 }
 
 
@@ -149,6 +160,8 @@ progress_cb (void *cls, const struct GNUNET_FS_ProgressInfo *event)
                (unsigned long long) event->value.publish.specifics.
                progress.offset);
     break;
+  case GNUNET_FS_STATUS_PUBLISH_PROGRESS_DIRECTORY:
+    break;
   case GNUNET_FS_STATUS_PUBLISH_COMPLETED:
     kuri = GNUNET_FS_uri_ksk_create_from_args (1, keywords);
     start = GNUNET_TIME_absolute_get ();