first batch of license fixes (boring)

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

diff --git a/src/fs/test_gnunet_service_fs_p2p.c b/src/fs/test_gnunet_service_fs_p2p.c
index 889337ff41bc106c253aa47b4c2e7aa29937f3eb..40e341c20edcd31271628f1d9811de24e1104d48 100644 (file)
--- a/src/fs/test_gnunet_service_fs_p2p.c
+++ b/src/fs/test_gnunet_service_fs_p2p.c
@@ -1,21 +1,16 @@
 /*
      This file is part of GNUnet.
-     (C) 2010, 2012 Christian Grothoff (and other contributing authors)
+     Copyright (C) 2010, 2012 GNUnet e.V.
 
-     GNUnet is free software; you can redistribute it and/or modify
-     it under the terms of the GNU General Public License as published
-     by the Free Software Foundation; either version 3, or (at your
-     option) any later version.
+     GNUnet is free software: you can redistribute it and/or modify it
+     under the terms of the GNU General Public License as published
+     by the Free Software Foundation, either version 3 of the License,
+     or (at your option) any later version.
 
      GNUnet is distributed in the hope that it will be useful, but
      WITHOUT ANY WARRANTY; without even the implied warranty of
      MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-     General Public License for more details.
-
-     You should have received a copy of the GNU General Public License
-     along with GNUnet; see the file COPYING.  If not, write to the
-     Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-     Boston, MA 02111-1307, USA.
+     Affero General Public License for more details.
 */
 
 /**
@@ -54,36 +49,47 @@ static struct GNUNET_TIME_Absolute start_time;
 
 
 static void
-do_stop (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
+do_stop (void *cls)
 {
+  char *fn = cls;
   struct GNUNET_TIME_Relative del;
   char *fancy;
 
   GNUNET_SCHEDULER_shutdown ();
-  if (0 == (tc->reason & GNUNET_SCHEDULER_REASON_TIMEOUT))
+  if (0 ==
+      GNUNET_TIME_absolute_get_remaining (GNUNET_TIME_absolute_add (start_time,
+                                                                    TIMEOUT)).rel_value_us)
+  {
+    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+                "Timeout during download, shutting down with error\n");
+    ok = 1;
+  }
+  else
   {
     del = GNUNET_TIME_absolute_get_duration (start_time);
-    if (del.rel_value == 0)
-      del.rel_value = 1;
+    if (0 == del.rel_value_us)
+      del.rel_value_us = 1;
     fancy =
-        GNUNET_STRINGS_byte_size_fancy (((unsigned long long) FILESIZE) *
-                                        1000LL / del.rel_value);
-    FPRINTF (stdout, "Download speed was %s/s\n", fancy);
+      GNUNET_STRINGS_byte_size_fancy (((unsigned long long) FILESIZE) *
+                                     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",
-                (unsigned long long) FILESIZE);
+    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+                "Finished download, shutting down\n");
   }
-  else
+  if (NULL != fn)
   {
-    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-                "Timeout during download, shutting down with error\n");
-    ok = 1;
+    GNUNET_DISK_directory_remove (fn);
+    GNUNET_free (fn);
   }
 }
 
 
 static void
-do_download (void *cls, const struct GNUNET_FS_Uri *uri)
+do_download (void *cls, const struct GNUNET_FS_Uri *uri,
+            const char *fn)
 {
   if (NULL == uri)
   {
@@ -96,21 +102,26 @@ do_download (void *cls, const struct GNUNET_FS_Uri *uri)
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Downloading %llu bytes\n",
               (unsigned long long) FILESIZE);
   start_time = GNUNET_TIME_absolute_get ();
-  GNUNET_FS_TEST_download (daemons[0], TIMEOUT, 
-                          anonymity_level, SEED, uri, 
+  GNUNET_FS_TEST_download (daemons[0], TIMEOUT,
+                          anonymity_level, SEED, uri,
                           VERBOSE, &do_stop,
-                           NULL);
+                           (NULL == fn)
+                          ? NULL
+                          : GNUNET_strdup (fn));
 }
 
 
 static void
 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;
- 
-  if (NULL != strstr (progname, "stream"))
+
+  if (NULL != strstr (progname, "cadet"))
     anonymity_level = 0;
   else
     anonymity_level = 1;
@@ -119,8 +130,8 @@ do_publish (void *cls,
     daemons[i] = peers[i];
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Publishing %llu bytes\n",
               (unsigned long long) FILESIZE);
-  GNUNET_FS_TEST_publish (daemons[1], TIMEOUT, 
-                         anonymity_level, GNUNET_NO, 
+  GNUNET_FS_TEST_publish (daemons[1], TIMEOUT,
+                         anonymity_level, GNUNET_NO,
                          FILESIZE, SEED,
                           VERBOSE, &do_download, NULL);
 }
@@ -132,8 +143,8 @@ main (int argc, char *argv[])
   const char *config;
 
   progname = argv[0];
-  if (NULL != strstr (progname, "stream"))
-    config = "test_gnunet_service_fs_p2p_stream.conf";
+  if (NULL != strstr (progname, "cadet"))
+    config = "test_gnunet_service_fs_p2p_cadet.conf";
   else
     config = "fs_test_lib_data.conf";
   (void) GNUNET_TESTBED_test_run ("test-gnunet-service-fs-p2p",