/*
This file is part of GNUnet.
- (C) 2004, 2005, 2006, 2008, 2009, 2011, 2012 Christian Grothoff (and other contributing authors)
+ Copyright (C) 2004, 2005, 2006, 2008, 2009, 2011, 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 struct GNUNET_FS_PublishContext *publish;
-static GNUNET_SCHEDULER_TaskIdentifier timeout_kill;
+static struct GNUNET_SCHEDULER_Task * timeout_kill;
static char *fn;
static void
-timeout_kill_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
+timeout_kill_task (void *cls)
{
if (NULL != download)
{
publish = NULL;
}
GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Timeout downloading file\n");
- timeout_kill = GNUNET_SCHEDULER_NO_TASK;
+ timeout_kill = NULL;
err = 1;
}
static void
-abort_publish_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
+abort_publish_task (void *cls)
{
if (NULL != publish)
{
static void
-stop_fs_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
+stop_fs_task (void *cls)
{
GNUNET_FS_stop (fs);
fs = NULL;
static void
-abort_download_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
+abort_download_task (void *cls)
{
uint64_t size;
GNUNET_free (fn);
fn = NULL;
GNUNET_SCHEDULER_cancel (timeout_kill);
- timeout_kill = GNUNET_SCHEDULER_NO_TASK;
+ timeout_kill = NULL;
}
(unsigned long long) event->value.publish.specifics.
progress.offset);
break;
+ case GNUNET_FS_STATUS_PUBLISH_PROGRESS_DIRECTORY:
+ break;
case GNUNET_FS_STATUS_PUBLISH_COMPLETED:
fprintf (stdout,
"Publishing complete, %llu kb/s.\n",
(1 +
GNUNET_TIME_absolute_get_duration
(start).rel_value_us) / 1024LL));
- GAUGER ("FS",
- (GNUNET_YES == indexed)
+ GAUGER ("FS",
+ (GNUNET_YES == indexed)
? "Publishing speed (indexing)"
: "Publishing speed (insertion)",
(unsigned long long) (FILESIZE * 1000000LL /
GNUNET_FS_download_start (fs,
event->value.publish.specifics.
completed.chk_uri, NULL, fn, NULL, 0,
- FILESIZE, anonymity_level,
+ FILESIZE, anonymity_level,
GNUNET_FS_DOWNLOAD_OPTION_NONE,
"download", NULL);
GNUNET_assert (download != NULL);
GNUNET_TIME_absolute_get_duration
(start).rel_value_us) / 1024LL));
GAUGER ("FS",
- (GNUNET_YES == indexed)
- ? "Local download speed (indexed)"
+ (GNUNET_YES == indexed)
+ ? "Local download speed (indexed)"
: "Local download speed (inserted)",
(unsigned long long) (FILESIZE * 1000000LL /
(1 +
FPRINTF (stderr, "Error publishing file: %s\n",
event->value.publish.specifics.error.message);
GNUNET_break (0);
- GNUNET_SCHEDULER_add_continuation (&abort_publish_task, NULL,
- GNUNET_SCHEDULER_REASON_PREREQ_DONE);
+ GNUNET_SCHEDULER_add_now (&abort_publish_task, NULL);
+ GNUNET_SCHEDULER_shutdown ();
break;
case GNUNET_FS_STATUS_DOWNLOAD_ERROR:
FPRINTF (stderr, "Error downloading file: %s\n",
event->value.download.specifics.error.message);
GNUNET_SCHEDULER_add_now (&abort_download_task, NULL);
+ GNUNET_SCHEDULER_shutdown ();
break;
case GNUNET_FS_STATUS_DOWNLOAD_ACTIVE:
case GNUNET_FS_STATUS_DOWNLOAD_INACTIVE:
break;
case GNUNET_FS_STATUS_DOWNLOAD_STOPPED:
GNUNET_assert (download == event->value.download.dc);
- GNUNET_SCHEDULER_add_continuation (&abort_publish_task, NULL,
- GNUNET_SCHEDULER_REASON_PREREQ_DONE);
+ GNUNET_SCHEDULER_add_now (&abort_publish_task, NULL);
break;
default:
printf ("Unexpected event: %d\n", event->status);
binary_name = "test-fs-download-indexed";
config_name = "test_fs_download_indexed.conf";
}
- if (NULL != strstr (argv[0], "mesh"))
+ if (NULL != strstr (argv[0], "cadet"))
{
- binary_name = "test-fs-download-mesh";
- config_name = "test_fs_download_mesh.conf";
+ binary_name = "test-fs-download-cadet";
+ config_name = "test_fs_download_cadet.conf";
}
if (0 != GNUNET_TESTING_peer_run (binary_name,
config_name,