projects
/
oweals
/
gnunet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fix #3704
[oweals/gnunet.git]
/
src
/
fs
/
test_fs_download.c
diff --git
a/src/fs/test_fs_download.c
b/src/fs/test_fs_download.c
index c069875cfb082322fc8f761630ca92af7383657f..d645444acdf2a86c8ffe5b2b0efc6939c2fc5fa7 100644
(file)
--- a/
src/fs/test_fs_download.c
+++ b/
src/fs/test_fs_download.c
@@
-1,6
+1,6
@@
/*
This file is part of GNUnet.
/*
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 Christian Grothoff (and other contributing authors)
GNUnet is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published
GNUnet is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published
@@
-57,7
+57,7
@@
static struct GNUNET_FS_DownloadContext *download;
static struct GNUNET_FS_PublishContext *publish;
static struct GNUNET_FS_PublishContext *publish;
-static
GNUNET_SCHEDULER_TaskIdentifier
timeout_kill;
+static
struct GNUNET_SCHEDULER_Task *
timeout_kill;
static char *fn;
static char *fn;
@@
-80,7
+80,7
@@
timeout_kill_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
publish = NULL;
}
GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Timeout downloading file\n");
publish = NULL;
}
GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Timeout downloading file\n");
- timeout_kill =
GNUNET_SCHEDULER_NO_TASK
;
+ timeout_kill =
NULL
;
err = 1;
}
err = 1;
}
@@
-120,7
+120,7
@@
abort_download_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
GNUNET_free (fn);
fn = NULL;
GNUNET_SCHEDULER_cancel (timeout_kill);
GNUNET_free (fn);
fn = NULL;
GNUNET_SCHEDULER_cancel (timeout_kill);
- timeout_kill =
GNUNET_SCHEDULER_NO_TASK
;
+ timeout_kill =
NULL
;
}
}
@@
-139,6
+139,8
@@
progress_cb (void *cls, const struct GNUNET_FS_ProgressInfo *event)
(unsigned long long) event->value.publish.specifics.
progress.offset);
break;
(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",
case GNUNET_FS_STATUS_PUBLISH_COMPLETED:
fprintf (stdout,
"Publishing complete, %llu kb/s.\n",
@@
-146,8
+148,8
@@
progress_cb (void *cls, const struct GNUNET_FS_ProgressInfo *event)
(1 +
GNUNET_TIME_absolute_get_duration
(start).rel_value_us) / 1024LL));
(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 /
? "Publishing speed (indexing)"
: "Publishing speed (insertion)",
(unsigned long long) (FILESIZE * 1000000LL /
@@
-160,7
+162,7
@@
progress_cb (void *cls, const struct GNUNET_FS_ProgressInfo *event)
GNUNET_FS_download_start (fs,
event->value.publish.specifics.
completed.chk_uri, NULL, fn, NULL, 0,
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_FS_DOWNLOAD_OPTION_NONE,
"download", NULL);
GNUNET_assert (download != NULL);
@@
-173,8
+175,8
@@
progress_cb (void *cls, const struct GNUNET_FS_ProgressInfo *event)
GNUNET_TIME_absolute_get_duration
(start).rel_value_us) / 1024LL));
GAUGER ("FS",
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 +
: "Local download speed (inserted)",
(unsigned long long) (FILESIZE * 1000000LL /
(1 +
@@
-198,11
+200,13
@@
progress_cb (void *cls, const struct GNUNET_FS_ProgressInfo *event)
GNUNET_break (0);
GNUNET_SCHEDULER_add_continuation (&abort_publish_task, NULL,
GNUNET_SCHEDULER_REASON_PREREQ_DONE);
GNUNET_break (0);
GNUNET_SCHEDULER_add_continuation (&abort_publish_task, NULL,
GNUNET_SCHEDULER_REASON_PREREQ_DONE);
+ 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);
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_ACTIVE:
case GNUNET_FS_STATUS_DOWNLOAD_INACTIVE:
@@
-329,10
+333,10
@@
main (int argc, char *argv[])
binary_name = "test-fs-download-indexed";
config_name = "test_fs_download_indexed.conf";
}
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,
}
if (0 != GNUNET_TESTING_peer_run (binary_name,
config_name,