Do not crash if key is NULL.

[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 985732739f4ed84e3a8fe38ce74f38695e25aaab..8e5e5f53bfbe7d500426a37a515a4bfc5e342a8d 100644 (file)
--- a/src/fs/test_fs_publish_persistence.c
+++ b/src/fs/test_fs_publish_persistence.c
@@ -24,7 +24,7 @@
  */
 #include "platform.h"
 #include "gnunet_util_lib.h"
-#include "gnunet_testing_lib-new.h"
+#include "gnunet_testing_lib.h"
 #include "gnunet_fs_service.h"
 
 
@@ -93,8 +93,10 @@ restart_fs_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
 {
   rtask = GNUNET_SCHEDULER_NO_TASK;
   GNUNET_FS_stop (fs);
-  fs = GNUNET_FS_start (cfg, "test-fs-publish-persistence", &progress_cb, NULL,
-                        GNUNET_FS_FLAGS_PERSISTENCE, GNUNET_FS_OPTIONS_END);
+  fs = GNUNET_FS_start (cfg, "test-fs-publish-persistence",
+                       &progress_cb, NULL,
+                        GNUNET_FS_FLAGS_PERSISTENCE,
+                       GNUNET_FS_OPTIONS_END);
 }
 
 
@@ -123,7 +125,8 @@ consider_restart (int ev)
 
 
 static void *
-progress_cb (void *cls, const struct GNUNET_FS_ProgressInfo *event)
+progress_cb (void *cls,
+            const struct GNUNET_FS_ProgressInfo *event)
 {
   void *ret;
 
@@ -134,13 +137,17 @@ progress_cb (void *cls, const struct GNUNET_FS_ProgressInfo *event)
     consider_restart (event->status);
     ret = event->value.publish.cctx;
     printf ("Publish complete,  %llu kbps.\n",
-            (unsigned long long) (FILESIZE * 1000LL /
+            (unsigned long long) (FILESIZE * 1000000LL /
                                   (1 +
                                    GNUNET_TIME_absolute_get_duration
-                                   (start).rel_value) / 1024));
-    if (0 == strcmp ("publish-context-dir", event->value.publish.cctx))
+                                   (start).rel_value_us) / 1024));
+    if ( (NULL != event->value.publish.cctx) &&
+        (0 == strcmp ("publish-context-dir", event->value.publish.cctx)) )
       GNUNET_SCHEDULER_add_now (&abort_publish_task, NULL);
     break;
+  case GNUNET_FS_STATUS_PUBLISH_PROGRESS_DIRECTORY:
+    ret = event->value.publish.cctx;
+    return ret;
   case GNUNET_FS_STATUS_PUBLISH_PROGRESS:
     consider_restart (event->status);
     ret = event->value.publish.cctx;
@@ -206,7 +213,8 @@ progress_cb (void *cls, const struct GNUNET_FS_ProgressInfo *event)
     break;
   case GNUNET_FS_STATUS_PUBLISH_STOPPED:
     consider_restart (event->status);
-    if (0 == strcmp ("publish-context-dir", event->value.publish.cctx))
+    if ( (NULL != event->value.publish.cctx) &&
+        (0 == strcmp ("publish-context-dir", event->value.publish.cctx)) )
       GNUNET_assert (publish == event->value.publish.pc);
     break;
   default:
@@ -218,7 +226,7 @@ progress_cb (void *cls, const struct GNUNET_FS_ProgressInfo *event)
 
 
 static void
-run (void *cls, 
+run (void *cls,
      const struct GNUNET_CONFIGURATION_Handle *c,
      struct GNUNET_TESTING_Peer *peer)
 {