* @author Krista Bennett
* @author James Blackwell
* @author Igor Wronsky
- *
- * TODO:
- * - many command-line options
*/
#include "platform.h"
#include "gnunet_fs_service.h"
static struct GNUNET_FS_Handle *ctx;
+static struct GNUNET_SCHEDULER_Handle *sched;
+
static struct GNUNET_FS_DownloadContext *dc;
static unsigned int anonymity = 1;
+static unsigned int parallelism = 16;
+
+static unsigned int request_parallelism = 4092;
+
+static int do_recursive;
+
static char *filename;
+static int local_only;
+
+static void
+cleanup_task (void *cls,
+ const struct GNUNET_SCHEDULER_TaskContext *tc)
+{
+ GNUNET_FS_stop (ctx);
+ ctx = NULL;
+}
+
+
+static void
+shutdown_task (void *cls,
+ const struct GNUNET_SCHEDULER_TaskContext *tc)
+{
+ struct GNUNET_FS_DownloadContext *d;
+
+ if (dc != NULL)
+ {
+ d = dc;
+ dc = NULL;
+ GNUNET_FS_download_stop (d, delete_incomplete);
+ }
+}
+
+
/**
* Called by FS client to give information about the progress of an
* operation.
progress_cb (void *cls,
const struct GNUNET_FS_ProgressInfo *info)
{
+ char *s;
+ char *t;
+
switch (info->status)
{
case GNUNET_FS_STATUS_DOWNLOAD_START:
break;
case GNUNET_FS_STATUS_DOWNLOAD_PROGRESS:
if (verbose)
- fprintf (stdout,
- _("Downloading `%s' at %llu/%llu (%s remaining, %s/s)\n"),
- info->value.download.filename,
- (unsigned long long) info->value.download.completed,
- (unsigned long long) info->value.download.length,
- GNUNET_STRINGS_relative_time_to_string(info->value.download.eta),
- GNUNET_STRINGS_byte_size_fancy(info->value.download.completed * 1000 / (info->value.download.duration.value + 1)));
+ {
+ s = GNUNET_STRINGS_relative_time_to_string(info->value.download.eta);
+ t = GNUNET_STRINGS_byte_size_fancy(info->value.download.completed * 1000LL / (info->value.download.duration.value + 1));
+ fprintf (stdout,
+ _("Downloading `%s' at %llu/%llu (%s remaining, %s/s)\n"),
+ info->value.download.filename,
+ (unsigned long long) info->value.download.completed,
+ (unsigned long long) info->value.download.size,
+ s,
+ t);
+ GNUNET_free (s);
+ GNUNET_free (t);
+ }
break;
case GNUNET_FS_STATUS_DOWNLOAD_ERROR:
fprintf (stderr,
_("Error downloading: %s.\n"),
info->value.download.specifics.error.message);
- GNUNET_FS_file_download_stop (dc, delete_incomplete);
+ GNUNET_SCHEDULER_shutdown (sched);
break;
case GNUNET_FS_STATUS_DOWNLOAD_COMPLETED:
+ s = GNUNET_STRINGS_byte_size_fancy(info->value.download.completed * 1000 / (info->value.download.duration.value + 1));
fprintf (stdout,
_("Downloading `%s' done (%s/s).\n"),
info->value.download.filename,
- GNUNET_STRINGS_byte_size_fancy(info->value.download.completed * 1000 / (info->value.download.duration.value + 1)));
+ s);
+ GNUNET_free (s);
if (info->value.download.dc == dc)
- GNUNET_FS_file_download_stop (dc, delete_incomplete);
+ GNUNET_SCHEDULER_shutdown (sched);
break;
case GNUNET_FS_STATUS_DOWNLOAD_STOPPED:
if (info->value.download.dc == dc)
- GNUNET_FS_stop (ctx);
+ GNUNET_SCHEDULER_add_continuation (sched,
+ &cleanup_task,
+ NULL,
+ GNUNET_SCHEDULER_REASON_PREREQ_DONE);
break;
+ case GNUNET_FS_STATUS_DOWNLOAD_ACTIVE:
+ case GNUNET_FS_STATUS_DOWNLOAD_INACTIVE:
+ break;
default:
fprintf (stderr,
_("Unexpected status: %d\n"),
* Main function that will be run by the scheduler.
*
* @param cls closure
- * @param sched the scheduler to use
+ * @param s the scheduler to use
* @param args remaining command-line arguments
* @param cfgfile name of the configuration file used (for saving, can be NULL!)
- * @param cfg configuration
+ * @param c configuration
*/
static void
run (void *cls,
- struct GNUNET_SCHEDULER_Handle *sched,
+ struct GNUNET_SCHEDULER_Handle *s,
char *const *args,
const char *cfgfile,
const struct GNUNET_CONFIGURATION_Handle *c)
char *emsg;
enum GNUNET_FS_DownloadOptions options;
- /* FIXME: check arguments */
+ sched = s;
uri = GNUNET_FS_uri_parse (args[0],
&emsg);
if (NULL == uri)
&progress_cb,
NULL,
GNUNET_FS_FLAGS_NONE,
+ GNUNET_FS_OPTIONS_DOWNLOAD_PARALLELISM,
+ parallelism,
+ GNUNET_FS_OPTIONS_REQUEST_PARALLELISM,
+ request_parallelism,
GNUNET_FS_OPTIONS_END);
if (NULL == ctx)
{
return;
}
options = GNUNET_FS_DOWNLOAD_OPTION_NONE;
- dc = GNUNET_FS_file_download_start (ctx,
- uri,
- NULL,
- filename,
- 0,
- GNUNET_FS_uri_chk_get_file_size (uri),
- anonymity,
- options,
- NULL);
+ if (do_recursive)
+ options |= GNUNET_FS_DOWNLOAD_OPTION_RECURSIVE;
+ if (local_only)
+ options |= GNUNET_FS_DOWNLOAD_OPTION_LOOPBACK_ONLY;
+ dc = GNUNET_FS_download_start (ctx,
+ uri,
+ NULL,
+ filename, NULL,
+ 0,
+ GNUNET_FS_uri_chk_get_file_size (uri),
+ anonymity,
+ options,
+ NULL,
+ NULL);
GNUNET_FS_uri_destroy (uri);
+ if (dc == NULL)
+ {
+ GNUNET_FS_stop (ctx);
+ ctx = NULL;
+ return;
+ }
+ GNUNET_SCHEDULER_add_delayed (sched,
+ GNUNET_TIME_UNIT_FOREVER_REL,
+ &shutdown_task,
+ NULL);
}
-/**
- * gnunet-download command line options
- */
-static struct GNUNET_GETOPT_CommandLineOption options[] = {
- {'a', "anonymity", "LEVEL",
- gettext_noop ("set the desired LEVEL of receiver-anonymity"),
- 1, &GNUNET_GETOPT_set_uint, &anonymity},
-#if 0
- // FIXME: options!
- {'d', "directory", NULL,
- gettext_noop
- ("download a GNUnet directory that has already been downloaded. Requires that a filename of an existing file is specified instead of the URI. The download will only download the top-level files in the directory unless the `-R' option is also specified."),
- 0, &GNUNET_getopt_configure_set_one, &do_directory},
- {'D', "delete-incomplete", NULL,
- gettext_noop ("delete incomplete downloads (when aborted with CTRL-C)"),
- 0, &GNUNET_getopt_configure_set_one, &do_delete_incomplete},
-#endif
- {'o', "output", "FILENAME",
- gettext_noop ("write the file to FILENAME"),
- 1, &GNUNET_GETOPT_set_string, &filename},
-#if 0
- {'p', "parallelism", "DOWNLOADS",
- gettext_noop
- ("set the maximum number of parallel downloads that are allowed"),
- 1, &GNUNET_getopt_configure_set_uint, ¶llelism},
- {'R', "recursive", NULL,
- gettext_noop ("download a GNUnet directory recursively"),
- 0, &GNUNET_getopt_configure_set_one, &do_recursive},
-#endif
- {'V', "verbose", NULL,
- gettext_noop ("be verbose (print progress information)"),
- 0, &GNUNET_GETOPT_set_one, &verbose},
- GNUNET_GETOPT_OPTION_END
-};
-
-
/**
* The main function to download GNUnet.
*
int
main (int argc, char *const *argv)
{
+ static const struct GNUNET_GETOPT_CommandLineOption options[] = {
+ {'a', "anonymity", "LEVEL",
+ gettext_noop ("set the desired LEVEL of receiver-anonymity"),
+ 1, &GNUNET_GETOPT_set_uint, &anonymity},
+ {'D', "delete-incomplete", NULL,
+ gettext_noop ("delete incomplete downloads (when aborted with CTRL-C)"),
+ 0, &GNUNET_GETOPT_set_one, &delete_incomplete},
+ {'n', "no-network", NULL,
+ gettext_noop ("only search the local peer (no P2P network search)"),
+ 1, &GNUNET_GETOPT_set_uint, &local_only},
+ {'o', "output", "FILENAME",
+ gettext_noop ("write the file to FILENAME"),
+ 1, &GNUNET_GETOPT_set_string, &filename},
+ {'p', "parallelism", "DOWNLOADS",
+ gettext_noop
+ ("set the maximum number of parallel downloads that is allowed"),
+ 1, &GNUNET_GETOPT_set_uint, ¶llelism},
+ {'r', "request-parallelism", "REQUESTS",
+ gettext_noop
+ ("set the maximum number of parallel requests for blocks that is allowed"),
+ 1, &GNUNET_GETOPT_set_uint, &request_parallelism},
+ {'R', "recursive", NULL,
+ gettext_noop ("download a GNUnet directory recursively"),
+ 0, &GNUNET_GETOPT_set_one, &do_recursive},
+ {'V', "verbose", NULL,
+ gettext_noop ("be verbose (print progress information)"),
+ 0, &GNUNET_GETOPT_set_one, &verbose},
+ GNUNET_GETOPT_OPTION_END
+ };
return (GNUNET_OK ==
GNUNET_PROGRAM_run (argc,
argv,
projects / oweals / gnunet.git / blobdiff