fixing common off-by-one error with respect to maximum message size

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

diff --git a/src/fs/gnunet-download.c b/src/fs/gnunet-download.c
index 63895d4b2c3562deab12715d15aa0598ba85898f..a171006cb57e1fb7e98662ba78f3534658d00bff 100644 (file)
--- a/src/fs/gnunet-download.c
+++ b/src/fs/gnunet-download.c
@@ -24,9 +24,6 @@
  * @author Krista Bennett
  * @author James Blackwell
  * @author Igor Wronsky
- *
- * TODO:
- * - download-directory option support (do_directory)
  */
 #include "platform.h"
 #include "gnunet_fs_service.h"
@@ -49,12 +46,13 @@ static unsigned int anonymity = 1;
 
 static unsigned int parallelism = 16;
 
-static int do_recursive;
+static unsigned int request_parallelism = 4092;
 
-static int do_directory;
+static int do_recursive;
 
 static char *filename;
 
+static int local_only;
 
 static void
 cleanup_task (void *cls,
@@ -133,15 +131,8 @@ progress_cb (void *cls,
               info->value.download.filename,
               s);
       GNUNET_free (s);
-      if (do_directory)
-       {
-         GNUNET_break (0); //FIXME: not implemented
-       }
-      else
-       {
-         if (info->value.download.dc == dc)
-           GNUNET_SCHEDULER_shutdown (sched);
-       }
+      if (info->value.download.dc == dc)
+       GNUNET_SCHEDULER_shutdown (sched);
       break;
     case GNUNET_FS_STATUS_DOWNLOAD_STOPPED: 
       if (info->value.download.dc == dc)
@@ -150,6 +141,9 @@ progress_cb (void *cls,
                                           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"),
@@ -181,31 +175,24 @@ run (void *cls,
   enum GNUNET_FS_DownloadOptions options;
 
   sched = s;
-  if (do_directory)
+  uri = GNUNET_FS_uri_parse (args[0],
+                            &emsg);
+  if (NULL == uri)
     {
-      GNUNET_break (0); //FIXME: not implemented    
+      fprintf (stderr,
+              _("Failed to parse URI: %s\n"),
+              emsg);
+      GNUNET_free (emsg);
+      ret = 1;
+      return;
     }
-  else
+  if (! GNUNET_FS_uri_test_chk (uri))
     {
-      uri = GNUNET_FS_uri_parse (args[0],
-                                &emsg);
-      if (NULL == uri)
-       {
-         fprintf (stderr,
-                  _("Failed to parse URI: %s\n"),
-                  emsg);
-         GNUNET_free (emsg);
-         ret = 1;
-         return;
-       }
-      if (! GNUNET_FS_uri_test_chk (uri))
-       {
-         fprintf (stderr,
-                  "Only CHK URIs supported right now.\n");
-         ret = 1;
-         GNUNET_FS_uri_destroy (uri);
-         return;                
-       }
+      fprintf (stderr,
+              "Only CHK URIs supported right now.\n");
+      ret = 1;
+      GNUNET_FS_uri_destroy (uri);
+      return;           
     }
   if (NULL == filename)
     {
@@ -224,6 +211,8 @@ run (void *cls,
                         GNUNET_FS_FLAGS_NONE,
                         GNUNET_FS_OPTIONS_DOWNLOAD_PARALLELISM,
                         parallelism,
+                        GNUNET_FS_OPTIONS_REQUEST_PARALLELISM,
+                        request_parallelism,
                         GNUNET_FS_OPTIONS_END);
   if (NULL == ctx)
     {
@@ -237,29 +226,24 @@ run (void *cls,
   options = GNUNET_FS_DOWNLOAD_OPTION_NONE;
   if (do_recursive)
     options |= GNUNET_FS_DOWNLOAD_OPTION_RECURSIVE;
-  if (do_directory)
+  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_break (0); //FIXME: not implemented
-    }
-  else
-    {  
-      dc = GNUNET_FS_download_start (ctx,
-                                    uri,
-                                    NULL,
-                                    filename,
-                                    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_FS_stop (ctx);
+      ctx = NULL;
+      return;
     }
   GNUNET_SCHEDULER_add_delayed (sched,
                                GNUNET_TIME_UNIT_FOREVER_REL,
@@ -268,37 +252,6 @@ run (void *cls,
 }
 
 
-/**
- * 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},
-  {'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_set_one, &do_directory},
-  {'D', "delete-incomplete", NULL,
-   gettext_noop ("delete incomplete downloads (when aborted with CTRL-C)"),
-   0, &GNUNET_GETOPT_set_one, &delete_incomplete},
-  {'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 are allowed"),
-   1, &GNUNET_GETOPT_set_uint, &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
-};
-
-
 /**
  * The main function to download GNUnet.
  *
@@ -309,6 +262,35 @@ static struct GNUNET_GETOPT_CommandLineOption options[] = {
 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, &parallelism},
+    {'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,