fixing block reconstruction start/shutdown code

[oweals/gnunet.git] / src / fs / gnunet-download.c

diff --git a/src/fs/gnunet-download.c b/src/fs/gnunet-download.c
index a171006cb57e1fb7e98662ba78f3534658d00bff..5301edb051ba4ba8bfbf328e99b106ebe764e65e 100644 (file)
--- a/src/fs/gnunet-download.c
+++ b/src/fs/gnunet-download.c
@@ -4,7 +4,7 @@
 
      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 2, or (at your
+     by the Free Software Foundation; either version 3, or (at your
      option) any later version.
 
      GNUnet is distributed in the hope that it will be useful, but
@@ -38,8 +38,6 @@ static const struct GNUNET_CONFIGURATION_Handle *cfg;
 
 static struct GNUNET_FS_Handle *ctx;
 
-static struct GNUNET_SCHEDULER_Handle *sched;
-
 static struct GNUNET_FS_DownloadContext *dc;
 
 static unsigned int anonymity = 1;
@@ -106,7 +104,7 @@ progress_cb (void *cls,
       if (verbose)
        {         
          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));
+         t = GNUNET_STRINGS_byte_size_fancy(info->value.download.completed * 1000LL / (info->value.download.duration.rel_value + 1));
          fprintf (stdout,
                   _("Downloading `%s' at %llu/%llu (%s remaining, %s/s)\n"),
                   info->value.download.filename,
@@ -122,22 +120,21 @@ progress_cb (void *cls,
       fprintf (stderr,
               _("Error downloading: %s.\n"),
               info->value.download.specifics.error.message);
-      GNUNET_SCHEDULER_shutdown (sched);
+      GNUNET_SCHEDULER_shutdown ();
       break;
     case GNUNET_FS_STATUS_DOWNLOAD_COMPLETED:
-      s = GNUNET_STRINGS_byte_size_fancy(info->value.download.completed * 1000 / (info->value.download.duration.value + 1));
+      s = GNUNET_STRINGS_byte_size_fancy(info->value.download.completed * 1000 / (info->value.download.duration.rel_value + 1));
       fprintf (stdout,
               _("Downloading `%s' done (%s/s).\n"),
               info->value.download.filename,
               s);
       GNUNET_free (s);
       if (info->value.download.dc == dc)
-       GNUNET_SCHEDULER_shutdown (sched);
+       GNUNET_SCHEDULER_shutdown ();
       break;
     case GNUNET_FS_STATUS_DOWNLOAD_STOPPED: 
       if (info->value.download.dc == dc)
-       GNUNET_SCHEDULER_add_continuation (sched,
-                                          &cleanup_task,
+       GNUNET_SCHEDULER_add_continuation (&cleanup_task,
                                           NULL,
                                           GNUNET_SCHEDULER_REASON_PREREQ_DONE);
       break;      
@@ -158,14 +155,12 @@ progress_cb (void *cls,
  * Main function that will be run by the scheduler.
  *
  * @param cls closure
- * @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 c configuration
  */
 static void
 run (void *cls,
-     struct GNUNET_SCHEDULER_Handle *s,
      char *const *args,
      const char *cfgfile,
      const struct GNUNET_CONFIGURATION_Handle *c)
@@ -174,7 +169,6 @@ run (void *cls,
   char *emsg;
   enum GNUNET_FS_DownloadOptions options;
 
-  sched = s;
   uri = GNUNET_FS_uri_parse (args[0],
                             &emsg);
   if (NULL == uri)
@@ -186,10 +180,11 @@ run (void *cls,
       ret = 1;
       return;
     }
-  if (! GNUNET_FS_uri_test_chk (uri))
+  if ( (! GNUNET_FS_uri_test_chk (uri)) &&
+       (! GNUNET_FS_uri_test_loc (uri)) )
     {
       fprintf (stderr,
-              "Only CHK URIs supported right now.\n");
+              _("Only CHK or LOC URIs supported.\n"));
       ret = 1;
       GNUNET_FS_uri_destroy (uri);
       return;           
@@ -197,14 +192,13 @@ run (void *cls,
   if (NULL == filename)
     {
       fprintf (stderr,
-              "Target filename must be specified.\n");
+              _("Target filename must be specified.\n"));
       ret = 1;
       GNUNET_FS_uri_destroy (uri);
       return;           
     }
   cfg = c;
-  ctx = GNUNET_FS_start (sched,
-                        cfg,
+  ctx = GNUNET_FS_start (cfg,
                         "gnunet-download",
                         &progress_cb,
                         NULL,
@@ -245,8 +239,7 @@ run (void *cls,
       ctx = NULL;
       return;
     }
-  GNUNET_SCHEDULER_add_delayed (sched,
-                               GNUNET_TIME_UNIT_FOREVER_REL,
+  GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_FOREVER_REL,
                                &shutdown_task,
                                NULL);
 }