/*
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
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.
+ Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ Boston, MA 02110-1301, USA.
*/
/**
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_us == 0)
+ if (0 == del.rel_value_us)
del.rel_value_us = 1;
fancy =
GNUNET_STRINGS_byte_size_fancy (((unsigned long long) FILESIZE) *
1000000LL / del.rel_value_us);
- FPRINTF (stdout, "Download speed was %s/s\n", fancy);
+ 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);
- }
- else
- {
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "Timeout during download, shutting down with error\n");
- ok = 1;
+ "Finished download, shutting down\n");
}
if (NULL != fn)
{
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 == fn)
+ (NULL == fn)
? NULL
: GNUNET_strdup (fn));
}
unsigned int links_failed)
{
unsigned int i;
-
- if (NULL != strstr (progname, "mesh"))
+
+ if (NULL != strstr (progname, "cadet"))
anonymity_level = 0;
else
anonymity_level = 1;
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);
}
const char *config;
progname = argv[0];
- if (NULL != strstr (progname, "mesh"))
- config = "test_gnunet_service_fs_p2p_mesh.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",