Do not crash if key is NULL.

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

diff --git a/src/fs/test_gnunet_service_fs_migration.c b/src/fs/test_gnunet_service_fs_migration.c
index 550c79c4bc1f6ba8f9b3ff39cc383feb867ed69b..4defe119bc83a8128908344c3850ce49a01b5e43 100644 (file)
--- a/src/fs/test_gnunet_service_fs_migration.c
+++ b/src/fs/test_gnunet_service_fs_migration.c
@@ -55,6 +55,14 @@ static struct GNUNET_TIME_Absolute start_time;
 static struct GNUNET_TESTBED_Operation *op;
 
 
+struct DownloadContext
+{
+  char *fn;
+
+  struct GNUNET_FS_Uri *uri;
+};
+
+
 static void
 do_stop (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
 {
@@ -65,11 +73,11 @@ do_stop (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
   if (0 == (tc->reason & GNUNET_SCHEDULER_REASON_TIMEOUT))
   {
     del = GNUNET_TIME_absolute_get_duration (start_time);
-    if (del.rel_value == 0)
-      del.rel_value = 1;
+    if (del.rel_value_us == 0)
+      del.rel_value_us = 1;
     fancy =
         GNUNET_STRINGS_byte_size_fancy (((unsigned long long) FILESIZE) *
-                                        1000LL / del.rel_value);
+                                        1000000LL / del.rel_value_us);
     FPRINTF (stdout, "Download speed was %s/s\n", fancy);
     GNUNET_free (fancy);
     GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Finished download, shutting down\n",
@@ -85,13 +93,20 @@ do_stop (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
 
 
 static void
-do_download (void *cls, 
+do_download (void *cls,
             const char *emsg)
 {
-  struct GNUNET_FS_Uri *uri = cls;
+  struct DownloadContext *dc = cls;
+  struct GNUNET_FS_Uri *uri = dc->uri;
 
   GNUNET_TESTBED_operation_done (op);
   op = NULL;
+  if (NULL != dc->fn)
+  {
+    GNUNET_DISK_directory_remove (dc->fn);
+    GNUNET_free (dc->fn);
+  }
+  GNUNET_free (dc);
   if (NULL != emsg)
   {
     GNUNET_SCHEDULER_shutdown ();
@@ -113,18 +128,19 @@ do_download (void *cls,
 static void
 stop_source_peer (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
 {
-  struct GNUNET_FS_Uri *uri = cls;
+  struct DownloadContext *dc = cls;
 
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Stopping source peer\n");
-  op = GNUNET_TESTBED_peer_stop (daemons[1], &do_download, uri);
+  op = GNUNET_TESTBED_peer_stop (NULL, daemons[1], &do_download, dc);
   GNUNET_assert (NULL != op);
 }
 
 
 static void
-do_wait (void *cls, const struct GNUNET_FS_Uri *uri)
+do_wait (void *cls, const struct GNUNET_FS_Uri *uri,
+        const char *fn)
 {
-  struct GNUNET_FS_Uri *d;
+  struct DownloadContext *dc;
 
   if (NULL == uri)
   {
@@ -135,62 +151,43 @@ do_wait (void *cls, const struct GNUNET_FS_Uri *uri)
     return;
   }
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Waiting to allow content to migrate\n");
-  d = GNUNET_FS_uri_dup (uri);
-  (void) GNUNET_SCHEDULER_add_delayed (MIGRATION_DELAY, &stop_source_peer, d);
+  dc = GNUNET_new (struct DownloadContext);
+  dc->uri = GNUNET_FS_uri_dup (uri);
+  if (NULL != fn)
+    dc->fn = GNUNET_strdup (fn);
+  (void) GNUNET_SCHEDULER_add_delayed (MIGRATION_DELAY, &stop_source_peer, dc);
 }
 
 
 static void
-do_publish (void *cls, 
-           struct GNUNET_TESTBED_Operation *oparg,
-           const char *emsg)
-{
-  GNUNET_assert (op == oparg);
-  GNUNET_TESTBED_operation_done (op);
-  op = NULL;
-  if (NULL != emsg)
-  {
-    GNUNET_SCHEDULER_shutdown ();
-    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-                "Error connecting peers: %s\n",
-               emsg);
-    ok = 1;
-    return;
-  }
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Publishing %llu bytes\n",
-              (unsigned long long) FILESIZE);
-  GNUNET_FS_TEST_publish (daemons[1], TIMEOUT, 1, GNUNET_NO, FILESIZE, SEED,
-                          VERBOSE, &do_wait, NULL);
-}
-
-
-static void
-do_connect (void *cls, 
+do_publish (void *cls,
+            struct GNUNET_TESTBED_RunHandle *h,
            unsigned int num_peers,
-           struct GNUNET_TESTBED_Peer **peers)
+           struct GNUNET_TESTBED_Peer **peers,
+            unsigned int links_succeeded,
+            unsigned int links_failed)
 {
   unsigned int i;
 
   GNUNET_assert (2 == num_peers);
   for (i=0;i<num_peers;i++)
     daemons[i] = peers[i];
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-              "Daemons started, will now try to connect them\n");
-  op = GNUNET_TESTBED_overlay_connect (NULL,
-                                      &do_publish, NULL,
-                                      daemons[0], daemons[1]);
+  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Publishing %llu bytes\n",
+              (unsigned long long) FILESIZE);
+  GNUNET_FS_TEST_publish (daemons[1], TIMEOUT, 1, GNUNET_NO, FILESIZE, SEED,
+                          VERBOSE, &do_wait, NULL);
 }
 
 
 int
 main (int argc, char *argv[])
 {
-  GNUNET_TESTBED_test_run ("test-gnunet-service-fs-migration",
-                          "fs_test_lib_data.conf",
-                          2,
-                          0, NULL, NULL,
-                          &do_connect,
-                          NULL);
+  (void) GNUNET_TESTBED_test_run ("test-gnunet-service-fs-migration",
+                                  "fs_test_lib_data.conf",
+                                  2,
+                                  0, NULL, NULL,
+                                  &do_publish,
+                                  NULL);
   GNUNET_DISK_directory_remove ("/tmp/test-gnunet-service-fs-migration/");
   return ok;
 }