expose our hello to plugins
[oweals/gnunet.git] / src / fs / fs_download.c
index f1954ea89bd30da59a56c728b287f3d9289ac7c3..80758ebc72dc3b16b69177d67b19b5f7ee0c49d6 100644 (file)
@@ -1,10 +1,10 @@
 /*
      This file is part of GNUnet.
-     (C) 2001, 2002, 2003, 2004, 2005, 2006, 2008 Christian Grothoff (and other contributing authors)
+     (C) 2001, 2002, 2003, 2004, 2005, 2006, 2008, 2009, 2010 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
-     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
 */
 /**
  * @file fs/fs_download.c
- * @brief DOWNLOAD helper methods (which do the real work).
+ * @brief download methods
  * @author Christian Grothoff
+ *
+ * TODO:
+ * - different priority for scheduling probe downloads?
+ * - check if iblocks can be computed from existing blocks (can wait, hard)
  */
-
 #include "platform.h"
+#include "gnunet_constants.h"
 #include "gnunet_fs_service.h"
 #include "fs.h"
+#include "fs_tree.h"
 
-#define DEBUG_DOWNLOAD GNUNET_YES
+#define DEBUG_DOWNLOAD GNUNET_NO
 
+/**
+ * Determine if the given download (options and meta data) should cause
+ * use to try to do a recursive download.
+ */
+static int
+is_recursive_download (struct GNUNET_FS_DownloadContext *dc)
+{
+  return  (0 != (dc->options & GNUNET_FS_DOWNLOAD_OPTION_RECURSIVE)) &&
+    ( (GNUNET_YES == GNUNET_FS_meta_data_test_for_directory (dc->meta)) ||
+      ( (dc->meta == NULL) &&
+       ( (NULL == dc->filename) ||            
+         ( (strlen (dc->filename) >= strlen (GNUNET_FS_DIRECTORY_EXT)) &&
+           (NULL !=
+            strstr (dc->filename + strlen(dc->filename) - strlen(GNUNET_FS_DIRECTORY_EXT),
+                    GNUNET_FS_DIRECTORY_EXT)) ) ) ) );              
+}
 
 
 /**
- * Download parts of a file.  Note that this will store
- * the blocks at the respective offset in the given file.  Also, the
- * download is still using the blocking of the underlying FS
- * encoding.  As a result, the download may *write* outside of the
- * given boundaries (if offset and length do not match the 32k FS
- * block boundaries). <p>
+ * We're storing the IBLOCKS after the DBLOCKS on disk (so that we
+ * only have to truncate the file once we're done).
  *
- * This function should be used to focus a download towards a
- * particular portion of the file (optimization), not to strictly
- * limit the download to exactly those bytes.
- *
- * @param h handle to the file sharing subsystem
- * @param uri the URI of the file (determines what to download); CHK or LOC URI
- * @param filename where to store the file, maybe NULL (then no file is
- *        created on disk and data must be grabbed from the callbacks)
- * @param offset at what offset should we start the download (typically 0)
- * @param length how many bytes should be downloaded starting at offset
- * @param anonymity anonymity level to use for the download
- * @param no_temporaries set to GNUNET_YES to disallow generation of temporary files
- * @param recursive should this be a recursive download (useful for directories
- *        to automatically trigger download of files in the directories)
- * @param parent parent download to associate this download with (use NULL
- *        for top-level downloads; useful for manually-triggered recursive downloads)
- * @return context that can be used to control this download
+ * Given the offset of a block (with respect to the DBLOCKS) and its
+ * depth, return the offset where we would store this block in the
+ * file.
+ * 
+ * @param fsize overall file size
+ * @param off offset of the block in the file
+ * @param depth depth of the block in the tree
+ * @param treedepth maximum depth of the tree
+ * @return off for DBLOCKS (depth == treedepth),
+ *         otherwise an offset past the end
+ *         of the file that does not overlap
+ *         with the range for any other block
  */
-struct GNUNET_FS_DownloadContext *
-GNUNET_FS_file_download_start (struct GNUNET_FS_Handle *h,
-                              const struct GNUNET_FS_Uri *uri,
-                              const char *filename,
-                              unsigned long long offset,
-                              unsigned long long length,
-                              unsigned int anonymity,
-                              int no_temporaries,      
-                              int recursive,
-                              struct GNUNET_FS_DownloadContext *parent)
+static uint64_t
+compute_disk_offset (uint64_t fsize,
+                    uint64_t off,
+                    unsigned int depth,
+                    unsigned int treedepth)
 {
-  return NULL;
+  unsigned int i;
+  uint64_t lsize; /* what is the size of all IBlocks for depth "i"? */
+  uint64_t loff; /* where do IBlocks for depth "i" start? */
+  unsigned int ioff; /* which IBlock corresponds to "off" at depth "i"? */
+  
+  if (depth == treedepth)
+    return off;
+  /* first IBlocks start at the end of file, rounded up
+     to full DBLOCK_SIZE */
+  loff = ((fsize + DBLOCK_SIZE - 1) / DBLOCK_SIZE) * DBLOCK_SIZE;
+  lsize = ( (fsize + DBLOCK_SIZE-1) / DBLOCK_SIZE) * sizeof (struct ContentHashKey);
+  GNUNET_assert (0 == (off % DBLOCK_SIZE));
+  ioff = (off / DBLOCK_SIZE);
+  for (i=treedepth-1;i>depth;i--)
+    {
+      loff += lsize;
+      lsize = (lsize + CHK_PER_INODE - 1) / CHK_PER_INODE;
+      GNUNET_assert (lsize > 0);
+      GNUNET_assert (0 == (ioff % CHK_PER_INODE));
+      ioff /= CHK_PER_INODE;
+    }
+  return loff + ioff * sizeof (struct ContentHashKey);
 }
 
+
 /**
- * Stop a download (aborts if download is incomplete).
+ * Given a file of the specified treedepth and a block at the given
+ * offset and depth, calculate the offset for the CHK at the given
+ * index.
  *
- * @param rm handle for the download
- * @param do_delete delete files of incomplete downloads
+ * @param offset the offset of the first
+ *        DBLOCK in the subtree of the 
+ *        identified IBLOCK
+ * @param depth the depth of the IBLOCK in the tree
+ * @param treedepth overall depth of the tree
+ * @param k which CHK in the IBLOCK are we 
+ *        talking about
+ * @return offset if k=0, otherwise an appropriately
+ *         larger value (i.e., if depth = treedepth-1,
+ *         the returned value should be offset+DBLOCK_SIZE)
  */
-void
-GNUNET_FS_file_download_stop (struct GNUNET_FS_DownloadContext *rm,
-                             int do_delete)
+static uint64_t
+compute_dblock_offset (uint64_t offset,
+                      unsigned int depth,
+                      unsigned int treedepth,
+                      unsigned int k)
 {
+  unsigned int i;
+  uint64_t lsize; /* what is the size of the sum of all DBlocks 
+                    that a CHK at depth i corresponds to? */
+
+  if (depth == treedepth)
+    return offset;
+  lsize = DBLOCK_SIZE;
+  for (i=treedepth-1;i>depth;i--)
+    lsize *= CHK_PER_INODE;
+  return offset + k * lsize;
 }
 
 
+/**
+ * Fill in all of the generic fields for a download event and call the
+ * callback.
+ *
+ * @param pi structure to fill in
+ * @param dc overall download context
+ */
+void
+GNUNET_FS_download_make_status_ (struct GNUNET_FS_ProgressInfo *pi,
+                                struct GNUNET_FS_DownloadContext *dc)
+{
+  pi->value.download.dc = dc;
+  pi->value.download.cctx
+    = dc->client_info;
+  pi->value.download.pctx
+    = (dc->parent == NULL) ? NULL : dc->parent->client_info;
+  pi->value.download.sctx
+    = (dc->search == NULL) ? NULL : dc->search->client_info;
+  pi->value.download.uri 
+    = dc->uri;
+  pi->value.download.filename
+    = dc->filename;
+  pi->value.download.size
+    = dc->length;
+  pi->value.download.duration
+    = GNUNET_TIME_absolute_get_duration (dc->start_time);
+  pi->value.download.completed
+    = dc->completed;
+  pi->value.download.anonymity
+    = dc->anonymity;
+  pi->value.download.eta
+    = GNUNET_TIME_calculate_eta (dc->start_time,
+                                dc->completed,
+                                dc->length);
+  pi->value.download.is_active = (dc->client == NULL) ? GNUNET_NO : GNUNET_YES;
+  if (0 == (dc->options & GNUNET_FS_DOWNLOAD_IS_PROBE))
+    dc->client_info = dc->h->upcb (dc->h->upcb_cls,
+                                  pi);
+  else
+    dc->client_info = GNUNET_FS_search_probe_progress_ (NULL,
+                                                       pi);
+}
 
+/**
+ * We're ready to transmit a search request to the
+ * file-sharing service.  Do it.  If there is 
+ * more than one request pending, try to send 
+ * multiple or request another transmission.
+ *
+ * @param cls closure
+ * @param size number of bytes available in buf
+ * @param buf where the callee should write the message
+ * @return number of bytes written to buf
+ */
+static size_t
+transmit_download_request (void *cls,
+                          size_t size, 
+                          void *buf);
 
-#if 0
 
 /**
- * Node-specific data (not shared, keep small!). 152 bytes.
- * Nodes are kept in a doubly-linked list.
+ * Closure for iterator processing results.
  */
-struct Node
+struct ProcessResultClosure
 {
+  
   /**
-   * Pointer to shared data between all nodes (request manager,
-   * progress data, etc.).
+   * Hash of data.
    */
-  struct GNUNET_ECRS_DownloadContext *ctx;
+  GNUNET_HashCode query;
 
   /**
-   * Previous entry in DLL.
-   */
-  struct Node *prev;
+   * Data found in P2P network.
+   */ 
+  const void *data;
 
   /**
-   * Next entry in DLL.
+   * Our download context.
    */
-  struct Node *next;
-
+  struct GNUNET_FS_DownloadContext *dc;
+               
   /**
-   * What is the GNUNET_EC_ContentHashKey for this block?
+   * Number of bytes in data.
    */
-  GNUNET_EC_ContentHashKey chk;
+  size_t size;
 
   /**
-   * At what offset (on the respective level!) is this
-   * block?
+   * Type of data.
    */
-  unsigned long long offset;
+  enum GNUNET_BLOCK_Type type;
 
   /**
-   * 0 for dblocks, >0 for iblocks.
+   * Flag to indicate if this block should be stored on disk.
    */
-  unsigned int level;
-
+  int do_store;
+  
 };
 
+
 /**
- * @brief structure that keeps track of currently pending requests for
- *        a download
+ * Iterator over entries in the pending requests in the 'active' map for the
+ * reply that we just got.
  *
- * Handle to the state of a request manager.  Here we keep track of
- * which queries went out with which priorities and which nodes in
- * the merkle-tree are waiting for the replies.
+ * @param cls closure (our 'struct ProcessResultClosure')
+ * @param key query for the given value / request
+ * @param value value in the hash map (a 'struct DownloadRequest')
+ * @return GNUNET_YES (we should continue to iterate); unless serious error
  */
-struct GNUNET_ECRS_DownloadContext
-{
+static int
+process_result_with_request (void *cls,
+                            const GNUNET_HashCode * key,
+                            void *value);
 
-  /**
-   * Total number of bytes in the file.
-   */
-  unsigned long long total;
 
-  /**
-   * Number of bytes already obtained
-   */
-  unsigned long long completed;
+/**
+ * We've found a matching block without downloading it.
+ * Encrypt it and pass it to our "receive" function as
+ * if we had received it from the network.
+ * 
+ * @param dc download in question
+ * @param chk request this relates to
+ * @param sm request details
+ * @param block plaintext data matching request
+ * @param len number of bytes in block
+ * @param depth depth of the block
+ * @param do_store should we still store the block on disk?
+ * @return GNUNET_OK on success
+ */
+static int
+encrypt_existing_match (struct GNUNET_FS_DownloadContext *dc,
+                       const struct ContentHashKey *chk,
+                       struct DownloadRequest *sm,
+                       const char * block,                    
+                       size_t len,
+                       int depth,
+                       int do_store)
+{
+  struct ProcessResultClosure prc;
+  char enc[len];
+  struct GNUNET_CRYPTO_AesSessionKey sk;
+  struct GNUNET_CRYPTO_AesInitializationVector iv;
+  GNUNET_HashCode query;
+  
+  GNUNET_CRYPTO_hash_to_aes_key (&chk->key, &sk, &iv);
+  if (-1 == GNUNET_CRYPTO_aes_encrypt (block, len,
+                                      &sk,
+                                      &iv,
+                                      enc))
+    {
+      GNUNET_break (0);
+      return GNUNET_SYSERR;
+    }
+  GNUNET_CRYPTO_hash (enc, len, &query);
+  if (0 != memcmp (&query,
+                  &chk->query,
+                  sizeof (GNUNET_HashCode)))
+    {
+      GNUNET_break_op (0);
+      return GNUNET_SYSERR;
+    }
+#if DEBUG_DOWNLOAD
+  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+             "Matching block already present, no need for download!\n");
+#endif
+  /* already got it! */
+  prc.dc = dc;
+  prc.data = enc;
+  prc.size = len;
+  prc.type = (dc->treedepth == depth) 
+    ? GNUNET_BLOCK_TYPE_DBLOCK 
+    : GNUNET_BLOCK_TYPE_IBLOCK;
+  prc.query = chk->query;
+  prc.do_store = do_store;
+  process_result_with_request (&prc,
+                              &chk->key,
+                              sm);
+  return GNUNET_OK;
+}
 
-  /**
-   * Starting-offset in file (for partial download)
-   */
-  unsigned long long offset;
 
+/**
+ * Closure for match_full_data.
+ */
+struct MatchDataContext 
+{
   /**
-   * Length of the download (starting at offset).
+   * CHK we are looking for.
    */
-  unsigned long long length;
+  const struct ContentHashKey *chk;
 
   /**
-   * Time download was started.
+   * Download we're processing.
    */
-  GNUNET_CronTime startTime;
+  struct GNUNET_FS_DownloadContext *dc;
 
   /**
-   * Doubly linked list of all pending requests (head)
+   * Request details.
    */
-  struct Node *head;
+  struct DownloadRequest *sm;
 
   /**
-   * Doubly linked list of all pending requests (tail)
+   * Overall offset in the file.
    */
-  struct Node *tail;
+  uint64_t offset;
 
   /**
-   * FSLIB context for issuing requests.
+   * Desired length of the block.
    */
-  struct GNUNET_FS_SearchContext *sctx;
+  size_t len;
 
   /**
-   * Context for error reporting.
+   * Flag set to GNUNET_YES on success.
    */
-  struct GNUNET_GE_Context *ectx;
+  int done;
+};
 
-  /**
-   * Configuration information.
-   */
-  struct GNUNET_GC_Configuration *cfg;
+/**
+ * Type of a function that libextractor calls for each
+ * meta data item found.
+ *
+ * @param cls closure (user-defined)
+ * @param plugin_name name of the plugin that produced this value;
+ *        special values can be used (i.e. '&lt;zlib&gt;' for zlib being
+ *        used in the main libextractor library and yielding
+ *        meta data).
+ * @param type libextractor-type describing the meta data
+ * @param format basic format information about data 
+ * @param data_mime_type mime-type of data (not of the original file);
+ *        can be NULL (if mime-type is not known)
+ * @param data actual meta-data found
+ * @param data_len number of bytes in data
+ * @return 0 to continue extracting, 1 to abort
+ */ 
+static int
+match_full_data (void *cls,
+                const char *plugin_name,
+                enum EXTRACTOR_MetaType type,
+                enum EXTRACTOR_MetaFormat format,
+                const char *data_mime_type,
+                const char *data,
+                size_t data_len)
+{
+  struct MatchDataContext *mdc = cls;
+  GNUNET_HashCode key;
 
-  /**
-   * The file handle.
-   */
-  int handle;
+  if (type == EXTRACTOR_METATYPE_GNUNET_FULL_DATA) 
+    {
+      if ( (mdc->offset > data_len) ||
+          (mdc->offset + mdc->len > data_len) )
+       return 1;
+      GNUNET_CRYPTO_hash (&data[mdc->offset],
+                         mdc->len,
+                         &key);
+      if (0 != memcmp (&key,
+                      &mdc->chk->key,
+                      sizeof (GNUNET_HashCode)))
+       {
+         GNUNET_break_op (0);
+         return 1;
+       }
+      /* match found! */
+      if (GNUNET_OK !=
+         encrypt_existing_match (mdc->dc,
+                                 mdc->chk,
+                                 mdc->sm,
+                                 &data[mdc->offset],
+                                 mdc->len,
+                                 0,
+                                 GNUNET_YES))
+       {
+         GNUNET_break_op (0);
+         return 1;
+       }
+      mdc->done = GNUNET_YES;
+      return 1;
+    }
+  return 0;
+}
 
-  /**
-   * Do we exclusively own this sctx?
-   */
-  int my_sctx;
 
-  /**
-   * The base-filename
-   */
-  char *filename;
+/**
+ * Schedule the download of the specified block in the tree.
+ *
+ * @param dc overall download this block belongs to
+ * @param chk content-hash-key of the block
+ * @param offset offset of the block in the file
+ *         (for IBlocks, the offset is the lowest
+ *          offset of any DBlock in the subtree under
+ *          the IBlock)
+ * @param depth depth of the block, 0 is the root of the tree
+ */
+static void
+schedule_block_download (struct GNUNET_FS_DownloadContext *dc,
+                        const struct ContentHashKey *chk,
+                        uint64_t offset,
+                        unsigned int depth)
+{
+  struct DownloadRequest *sm;
+  uint64_t total;
+  uint64_t off;
+  size_t len;
+  char block[DBLOCK_SIZE];
+  GNUNET_HashCode key;
+  struct MatchDataContext mdc;
+  struct GNUNET_DISK_FileHandle *fh;
+
+  total = GNUNET_ntohll (dc->uri->data.chk.file_length);
+  len = GNUNET_FS_tree_calculate_block_size (total,
+                                            dc->treedepth,
+                                            offset,
+                                            depth);
+  off = compute_disk_offset (total,
+                            offset,
+                            depth,
+                            dc->treedepth);
+  sm = GNUNET_malloc (sizeof (struct DownloadRequest));
+  sm->chk = *chk;
+  sm->offset = offset;
+  sm->depth = depth;
+  sm->is_pending = GNUNET_YES;
+  sm->next = dc->pending;
+  dc->pending = sm;
+  GNUNET_CONTAINER_multihashmap_put (dc->active,
+                                    &chk->query,
+                                    sm,
+                                    GNUNET_CONTAINER_MULTIHASHMAPOPTION_MULTIPLE);
+  if ( (dc->tried_full_data == GNUNET_NO) &&
+       (depth == 0) )
+    {      
+      mdc.dc = dc;
+      mdc.sm = sm;
+      mdc.chk = chk;
+      mdc.offset = offset;
+      mdc.len = len;
+      mdc.done = GNUNET_NO;
+      GNUNET_CONTAINER_meta_data_iterate (dc->meta,
+                                         &match_full_data,
+                                         &mdc);
+      if (mdc.done == GNUNET_YES)
+       return;
+      dc->tried_full_data = GNUNET_YES; 
+    }
+#if DEBUG_DOWNLOAD
+  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+             "Scheduling download at offset %llu and depth %u for `%s'\n",
+             (unsigned long long) offset,
+             depth,
+             GNUNET_h2s (&chk->query));
+#endif
+  fh = NULL;
+  if ( (dc->old_file_size > off) &&
+       (dc->filename != NULL) )    
+    fh = GNUNET_DISK_file_open (dc->filename,
+                               GNUNET_DISK_OPEN_READ,
+                               GNUNET_DISK_PERM_NONE);    
+  if ( (fh != NULL) &&
+       (off  == 
+       GNUNET_DISK_file_seek (fh,
+                              off,
+                              GNUNET_DISK_SEEK_SET) ) &&
+       (len == 
+       GNUNET_DISK_file_read (fh,
+                              block,
+                              len)) )
+    {
+      GNUNET_CRYPTO_hash (block, len, &key);
+      if ( (0 == memcmp (&key,
+                        &chk->key,
+                        sizeof (GNUNET_HashCode))) &&
+          (GNUNET_OK ==
+           encrypt_existing_match (dc,
+                                   chk,
+                                   sm,
+                                   block,
+                                   len,
+                                   depth,
+                                   GNUNET_NO)) )
+       {
+         GNUNET_break (GNUNET_OK == GNUNET_DISK_file_close (fh));
+         return;
+       }
+    }
+  if (fh != NULL)
+    GNUNET_break (GNUNET_OK == GNUNET_DISK_file_close (fh));
+  if (depth < dc->treedepth)
+    {
+      // FIXME: try if we could
+      // reconstitute this IBLOCK
+      // from the existing blocks on disk (can wait)
+      // (read block(s), encode, compare with
+      // query; if matches, simply return)
+    }
 
-  /**
-   * Main thread running the operation.
-   */
-  struct GNUNET_ThreadHandle *main;
+  if ( (dc->th == NULL) &&
+       (dc->client != NULL) )
+    {
+#if DEBUG_DOWNLOAD
+      GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+                 "Asking for transmission to FS service\n");
+#endif
+      dc->th = GNUNET_CLIENT_notify_transmit_ready (dc->client,
+                                                   sizeof (struct SearchMessage),
+                                                   GNUNET_CONSTANTS_SERVICE_TIMEOUT,
+                                                   GNUNET_NO,
+                                                   &transmit_download_request,
+                                                   dc);
+    }
+  else
+    {
+#if DEBUG_DOWNLOAD
+      GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+                 "Transmission request not issued (%p %p)\n",
+                 dc->th, 
+                 dc->client);
+#endif
 
-  /**
-   * Function to call when we make progress.
-   */
-  GNUNET_ECRS_DownloadProgressCallback dpcb;
+    }
 
-  /**
-   * Extra argument to dpcb.
-   */
-  void *dpcbClosure;
+}
 
-  /**
-   * Identity of the peer having the content, or all-zeros
-   * if we don't know of such a peer.
-   */
-  GNUNET_PeerIdentity target;
 
-  /**
-   * Abort?  Flag that can be set at any time
-   * to abort the RM as soon as possible.  Set
-   * to GNUNET_YES during orderly shutdown,
-   * set to GNUNET_SYSERR on error.
-   */
-  int abortFlag;
 
-  /**
-   * Do we have a specific peer from which we download
-   * from?
-   */
-  int have_target;
+/**
+ * Suggest a filename based on given metadata.
+ * 
+ * @param md given meta data
+ * @return NULL if meta data is useless for suggesting a filename
+ */
+char *
+GNUNET_FS_meta_data_suggest_filename (const struct GNUNET_CONTAINER_MetaData *md)
+{
+  static const char *mimeMap[][2] = {
+    {"application/bz2", ".bz2"},
+    {"application/gnunet-directory", ".gnd"},
+    {"application/java", ".class"},
+    {"application/msword", ".doc"},
+    {"application/ogg", ".ogg"},
+    {"application/pdf", ".pdf"},
+    {"application/pgp-keys", ".key"},
+    {"application/pgp-signature", ".pgp"},
+    {"application/postscript", ".ps"},
+    {"application/rar", ".rar"},
+    {"application/rtf", ".rtf"},
+    {"application/xml", ".xml"},
+    {"application/x-debian-package", ".deb"},
+    {"application/x-dvi", ".dvi"},
+    {"applixation/x-flac", ".flac"},
+    {"applixation/x-gzip", ".gz"},
+    {"application/x-java-archive", ".jar"},
+    {"application/x-java-vm", ".class"},
+    {"application/x-python-code", ".pyc"},
+    {"application/x-redhat-package-manager", ".rpm"},
+    {"application/x-rpm", ".rpm"},
+    {"application/x-tar", ".tar"},
+    {"application/x-tex-pk", ".pk"},
+    {"application/x-texinfo", ".texinfo"},
+    {"application/x-xcf", ".xcf"},
+    {"application/x-xfig", ".xfig"},
+    {"application/zip", ".zip"},
+    
+    {"audio/midi", ".midi"},
+    {"audio/mpeg", ".mp3"},
+    {"audio/real", ".rm"},
+    {"audio/x-wav", ".wav"},
+    
+    {"image/gif", ".gif"},
+    {"image/jpeg", ".jpg"},
+    {"image/pcx", ".pcx"},
+    {"image/png", ".png"},
+    {"image/tiff", ".tiff"},
+    {"image/x-ms-bmp", ".bmp"},
+    {"image/x-xpixmap", ".xpm"},
+    
+    {"text/css", ".css"},
+    {"text/html", ".html"},
+    {"text/plain", ".txt"},
+    {"text/rtf", ".rtf"},
+    {"text/x-c++hdr", ".h++"},
+    {"text/x-c++src", ".c++"},
+    {"text/x-chdr", ".h"},
+    {"text/x-csrc", ".c"},
+    {"text/x-java", ".java"},
+    {"text/x-moc", ".moc"},
+    {"text/x-pascal", ".pas"},
+    {"text/x-perl", ".pl"},
+    {"text/x-python", ".py"},
+    {"text/x-tex", ".tex"},
+    
+    {"video/avi", ".avi"},
+    {"video/mpeg", ".mpeg"},
+    {"video/quicktime", ".qt"},
+    {"video/real", ".rm"},
+    {"video/x-msvideo", ".avi"},
+    {NULL, NULL},
+  };
+  char *ret;
+  unsigned int i;
+  char *mime;
+  char *base;
+  const char *ext;
+
+  ret = GNUNET_CONTAINER_meta_data_get_by_type (md,
+                                               EXTRACTOR_METATYPE_FILENAME);
+  if (ret != NULL)
+    return ret;  
+  ext = NULL;
+  mime = GNUNET_CONTAINER_meta_data_get_by_type (md,
+                                                EXTRACTOR_METATYPE_MIMETYPE);
+  if (mime != NULL)
+    {
+      i = 0;
+      while ( (mimeMap[i][0] != NULL) && 
+             (0 != strcmp (mime, mimeMap[i][0])))
+        i++;
+      if (mimeMap[i][1] == NULL)
+        GNUNET_log (GNUNET_ERROR_TYPE_DEBUG | 
+                   GNUNET_ERROR_TYPE_BULK,
+                   _("Did not find mime type `%s' in extension list.\n"),
+                   mime);
+      else
+       ext = mimeMap[i][1];
+      GNUNET_free (mime);
+    }
+  base = GNUNET_CONTAINER_meta_data_get_first_by_types (md,
+                                                       EXTRACTOR_METATYPE_TITLE,
+                                                       EXTRACTOR_METATYPE_BOOK_TITLE,
+                                                       EXTRACTOR_METATYPE_ORIGINAL_TITLE,
+                                                       EXTRACTOR_METATYPE_PACKAGE_NAME,
+                                                       EXTRACTOR_METATYPE_URL,
+                                                       EXTRACTOR_METATYPE_URI, 
+                                                       EXTRACTOR_METATYPE_DESCRIPTION,
+                                                       EXTRACTOR_METATYPE_ISRC,
+                                                       EXTRACTOR_METATYPE_JOURNAL_NAME,
+                                                       EXTRACTOR_METATYPE_AUTHOR_NAME,
+                                                       EXTRACTOR_METATYPE_SUBJECT,
+                                                       EXTRACTOR_METATYPE_ALBUM,
+                                                       EXTRACTOR_METATYPE_ARTIST,
+                                                       EXTRACTOR_METATYPE_KEYWORDS,
+                                                       EXTRACTOR_METATYPE_COMMENT,
+                                                       EXTRACTOR_METATYPE_UNKNOWN,
+                                                       -1);
+  if ( (base == NULL) &&
+       (ext == NULL) )
+    return NULL;
+  if (base == NULL)
+    return GNUNET_strdup (ext);
+  if (ext == NULL)
+    return base;
+  GNUNET_asprintf (&ret,
+                  "%s%s",
+                  base,
+                  ext);
+  GNUNET_free (base);
+  return ret;
+}
 
-  /**
-   * Desired anonymity level for the download.
-   */
-  unsigned int anonymityLevel;
 
-  /**
-   * The depth of the file-tree.
-   */
-  unsigned int treedepth;
+/**
+ * We've lost our connection with the FS service.
+ * Re-establish it and re-transmit all of our
+ * pending requests.
+ *
+ * @param dc download context that is having trouble
+ */
+static void
+try_reconnect (struct GNUNET_FS_DownloadContext *dc);
 
-};
 
-static int
-content_receive_callback (const GNUNET_HashCode * query,
-                          const GNUNET_DatastoreValue * reply, void *cls,
-                          unsigned long long uid);
+/**
+ * We found an entry in a directory.  Check if the respective child
+ * already exists and if not create the respective child download.
+ *
+ * @param cls the parent download
+ * @param filename name of the file in the directory
+ * @param uri URI of the file (CHK or LOC)
+ * @param meta meta data of the file
+ * @param length number of bytes in data
+ * @param data contents of the file (or NULL if they were not inlined)
+ */
+static void 
+trigger_recursive_download (void *cls,
+                           const char *filename,
+                           const struct GNUNET_FS_Uri *uri,
+                           const struct GNUNET_CONTAINER_MetaData *meta,
+                           size_t length,
+                           const void *data);
 
 
 /**
- * Close the files and free the associated resources.
+ * We're done downloading a directory.  Open the file and
+ * trigger all of the (remaining) child downloads.
  *
- * @param self reference to the download context
+ * @param dc context of download that just completed
  */
 static void
-free_request_manager (struct GNUNET_ECRS_DownloadContext *rm)
+full_recursive_download (struct GNUNET_FS_DownloadContext *dc)
 {
-  struct Node *pos;
-
-  if (rm->abortFlag == GNUNET_NO)
-    rm->abortFlag = GNUNET_YES;
-  if (rm->my_sctx == GNUNET_YES)
-    GNUNET_FS_destroy_search_context (rm->sctx);
+  size_t size;
+  uint64_t size64;
+  void *data;
+  struct GNUNET_DISK_FileHandle *h;
+  struct GNUNET_DISK_MapHandle *m;
+  
+  size64 = GNUNET_FS_uri_chk_get_file_size (dc->uri);
+  size = (size_t) size64;
+  if (size64 != (uint64_t) size)
+    {
+      GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+                 _("Recursive downloads of directories larger than 4 GB are not supported on 32-bit systems\n"));
+      return;
+    }
+  if (dc->filename != NULL)
+    {
+      h = GNUNET_DISK_file_open (dc->filename,
+                                GNUNET_DISK_OPEN_READ,
+                                GNUNET_DISK_PERM_NONE);
+    }
   else
-    GNUNET_FS_suspend_search_context (rm->sctx);
-  while (rm->head != NULL)
-    {
-      pos = rm->head;
-      GNUNET_DLL_remove (rm->head, rm->tail, pos);
-      if (rm->my_sctx != GNUNET_YES)
-        GNUNET_FS_stop_search (rm->sctx, &content_receive_callback, pos);
-      GNUNET_free (pos);
-    }
-  if (rm->my_sctx != GNUNET_YES)
-    GNUNET_FS_resume_search_context (rm->sctx);
-  GNUNET_GE_ASSERT (NULL, rm->tail == NULL);
-  if (rm->handle >= 0)
-    CLOSE (rm->handle);
-  if (rm->main != NULL)
-    GNUNET_thread_release_self (rm->main);
-  GNUNET_free_non_null (rm->filename);
-  rm->sctx = NULL;
-  GNUNET_free (rm);
+    {
+      GNUNET_assert (dc->temp_filename != NULL);
+      h = GNUNET_DISK_file_open (dc->temp_filename,
+                                GNUNET_DISK_OPEN_READ,
+                                GNUNET_DISK_PERM_NONE);
+    }
+  if (h == NULL)
+    return; /* oops */
+  data = GNUNET_DISK_file_map (h, &m, GNUNET_DISK_MAP_TYPE_READ, size);
+  if (data == NULL)
+    {
+      GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+                 _("Directory too large for system address space\n"));
+    }
+  else
+    {
+      GNUNET_FS_directory_list_contents (size,
+                                        data,
+                                        0,
+                                        &trigger_recursive_download,
+                                        dc);         
+      GNUNET_DISK_file_unmap (m);
+    }
+  GNUNET_DISK_file_close (h);
+  if (dc->filename == NULL)
+    {
+      if (0 != UNLINK (dc->temp_filename))
+       GNUNET_log_strerror_file (GNUNET_ERROR_TYPE_WARNING,
+                                 "unlink",
+                                 dc->temp_filename);
+      GNUNET_free (dc->temp_filename);
+      dc->temp_filename = NULL;
+    }
 }
 
+
 /**
- * Read method.
+ * Check if all child-downloads have completed and
+ * if so, signal completion (and possibly recurse to
+ * parent).
+ */
+static void
+check_completed (struct GNUNET_FS_DownloadContext *dc)
+{
+  struct GNUNET_FS_ProgressInfo pi;
+  struct GNUNET_FS_DownloadContext *pos;
+
+  pos = dc->child_head;
+  while (pos != NULL)
+    {
+      if ( (pos->emsg == NULL) &&
+          (pos->completed < pos->length) )
+       return; /* not done yet */
+      if ( (pos->child_head != NULL) &&
+          (pos->has_finished != GNUNET_YES) )
+       return; /* not transitively done yet */
+      pos = pos->next;
+    }
+  dc->has_finished = GNUNET_YES;
+  GNUNET_FS_download_sync_ (dc);
+  /* signal completion */
+  pi.status = GNUNET_FS_STATUS_DOWNLOAD_COMPLETED;
+  GNUNET_FS_download_make_status_ (&pi, dc);
+  if (dc->parent != NULL)
+    check_completed (dc->parent);  
+}
+
+
+/**
+ * We found an entry in a directory.  Check if the respective child
+ * already exists and if not create the respective child download.
  *
- * @param self reference to the download context
- * @param level level in the tree to read/write at
- * @param pos position where to read or write
- * @param buf where to read from or write to
- * @param len how many bytes to read or write
- * @return number of bytes read, GNUNET_SYSERR on error
+ * @param cls the parent download
+ * @param filename name of the file in the directory
+ * @param uri URI of the file (CHK or LOC)
+ * @param meta meta data of the file
+ * @param length number of bytes in data
+ * @param data contents of the file (or NULL if they were not inlined)
  */
-static int
-read_from_files (struct GNUNET_ECRS_DownloadContext *self,
-                 unsigned int level,
-                 unsigned long long pos, void *buf, unsigned int len)
+static void 
+trigger_recursive_download (void *cls,
+                           const char *filename,
+                           const struct GNUNET_FS_Uri *uri,
+                           const struct GNUNET_CONTAINER_MetaData *meta,
+                           size_t length,
+                           const void *data)
 {
-  if ((level > 0) || (self->handle == -1))
-    return GNUNET_SYSERR;
-  LSEEK (self->handle, pos, SEEK_SET);
-  return READ (self->handle, buf, len);
+  struct GNUNET_FS_DownloadContext *dc = cls;  
+  struct GNUNET_FS_DownloadContext *cpos;
+  struct GNUNET_DISK_FileHandle *fh;
+  char *temp_name;
+  const char *real_name;
+  char *fn;
+  char *us;
+  char *ext;
+  char *dn;
+  char *pos;
+  char *full_name;
+
+  if (NULL == uri)
+    return; /* entry for the directory itself */
+  cpos = dc->child_head;
+  while (cpos != NULL)
+    {
+      if ( (GNUNET_FS_uri_test_equal (uri,
+                                     cpos->uri)) ||
+          ( (filename != NULL) &&
+            (0 == strcmp (cpos->filename,
+                          filename)) ) )
+       break;  
+      cpos = cpos->next;
+    }
+  if (cpos != NULL)
+    return; /* already exists */
+  fn = NULL;
+  if (NULL == filename)
+    {
+      fn = GNUNET_FS_meta_data_suggest_filename (meta);
+      if (fn == NULL)
+       {
+         us = GNUNET_FS_uri_to_string (uri);
+         fn = GNUNET_strdup (&us [strlen (GNUNET_FS_URI_PREFIX 
+                                          GNUNET_FS_URI_CHK_INFIX)]);
+         GNUNET_free (us);
+       }
+      else if (fn[0] == '.')
+       {
+         ext = fn;
+         us = GNUNET_FS_uri_to_string (uri);
+         GNUNET_asprintf (&fn,
+                          "%s%s",
+                          &us[strlen (GNUNET_FS_URI_PREFIX 
+                                      GNUNET_FS_URI_CHK_INFIX)], ext);
+         GNUNET_free (ext);
+         GNUNET_free (us);
+       }
+      /* change '\' to '/' (this should have happened
+       during insertion, but malicious peers may
+       not have done this) */
+      while (NULL != (pos = strstr (fn, "\\")))
+       *pos = '/';
+      /* remove '../' everywhere (again, well-behaved
+        peers don't do this, but don't trust that
+        we did not get something nasty) */
+      while (NULL != (pos = strstr (fn, "../")))
+       {
+         pos[0] = '_';
+         pos[1] = '_';
+         pos[2] = '_';
+       }
+      filename = fn;
+    }
+  if (dc->filename == NULL)
+    {
+      full_name = NULL;
+    }
+  else
+    {
+      dn = GNUNET_strdup (dc->filename);
+      GNUNET_break ( (strlen (dn) >= strlen (GNUNET_FS_DIRECTORY_EXT)) &&
+                    (NULL !=
+                     strstr (dn + strlen(dn) - strlen(GNUNET_FS_DIRECTORY_EXT),
+                             GNUNET_FS_DIRECTORY_EXT)) );
+      if ( (strlen (dn) >= strlen (GNUNET_FS_DIRECTORY_EXT)) &&
+          (NULL !=
+           strstr (dn + strlen(dn) - strlen(GNUNET_FS_DIRECTORY_EXT),
+                   GNUNET_FS_DIRECTORY_EXT)) )      
+       dn[strlen(dn) - strlen (GNUNET_FS_DIRECTORY_EXT)] = '\0';      
+      if ( (GNUNET_YES == GNUNET_FS_meta_data_test_for_directory (meta)) &&
+          ( (strlen (filename) < strlen (GNUNET_FS_DIRECTORY_EXT)) ||
+            (NULL ==
+             strstr (filename + strlen(filename) - strlen(GNUNET_FS_DIRECTORY_EXT),
+                     GNUNET_FS_DIRECTORY_EXT)) ) )
+       {
+         GNUNET_asprintf (&full_name,
+                          "%s%s%s%s",
+                          dn,
+                          DIR_SEPARATOR_STR,
+                          filename,
+                          GNUNET_FS_DIRECTORY_EXT);
+       }
+      else
+       {
+         GNUNET_asprintf (&full_name,
+                          "%s%s%s",
+                          dn,
+                          DIR_SEPARATOR_STR,
+                          filename);
+       }
+      GNUNET_free (dn);
+    }
+  if ( (full_name != NULL) &&
+       (GNUNET_OK !=
+       GNUNET_DISK_directory_create_for_file (full_name)) )
+    {
+      GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+                 _("Failed to create directory for recursive download of `%s'\n"),
+                 full_name);
+      GNUNET_free (full_name);
+      GNUNET_free_non_null (fn);
+      return;
+    }
+
+  temp_name = NULL;
+  if ( (data != NULL) &&
+       (GNUNET_FS_uri_chk_get_file_size (uri) == length) )
+    {
+      if (full_name == NULL)
+       {
+         temp_name = GNUNET_DISK_mktemp ("gnunet-directory-download-tmp");
+         real_name = temp_name;
+       }
+      else
+       {
+         real_name = full_name;
+       }
+      /* write to disk, then trigger normal download which will instantly progress to completion */
+      fh = GNUNET_DISK_file_open (real_name,
+                                 GNUNET_DISK_OPEN_WRITE | GNUNET_DISK_OPEN_TRUNCATE | GNUNET_DISK_OPEN_CREATE,
+                                 GNUNET_DISK_PERM_USER_READ | GNUNET_DISK_PERM_USER_WRITE);
+      if (fh == NULL)
+       {
+         GNUNET_log_strerror_file (GNUNET_ERROR_TYPE_ERROR,
+                                   "open",
+                                   real_name);       
+         GNUNET_free (full_name);
+         GNUNET_free_non_null (fn);
+         return;
+       }
+      if (length != 
+         GNUNET_DISK_file_write (fh,
+                                 data,
+                                 length))
+       {
+         GNUNET_log_strerror_file (GNUNET_ERROR_TYPE_ERROR,
+                                   "write",
+                                   full_name);       
+       }
+      GNUNET_DISK_file_close (fh);
+    }
+  GNUNET_FS_download_start (dc->h,
+                           uri,
+                           meta,
+                           full_name, temp_name,
+                           0,
+                           GNUNET_FS_uri_chk_get_file_size (uri),
+                           dc->anonymity,
+                           dc->options,
+                           NULL,
+                           dc);
+  GNUNET_free_non_null (full_name);
+  GNUNET_free_non_null (temp_name);
+  GNUNET_free_non_null (fn);
 }
 
+
 /**
- * Write method.
+ * Free entries in the map.
  *
- * @param self reference to the download context
- * @param level level in the tree to write to
- * @param pos position where to  write
- * @param buf where to write to
- * @param len how many bytes to write
- * @return number of bytes written, GNUNET_SYSERR on error
+ * @param cls unused (NULL)
+ * @param key unused
+ * @param entry entry of type "struct DownloadRequest" which is freed
+ * @return GNUNET_OK
  */
 static int
-write_to_files (struct GNUNET_ECRS_DownloadContext *self,
-                unsigned int level,
-                unsigned long long pos, void *buf, unsigned int len)
+free_entry (void *cls,
+           const GNUNET_HashCode *key,
+           void *entry)
 {
-  int ret;
-
-  if (level > 0)
-    return len;                 /* lie -- no more temps */
-  if (self->handle == -1)
-    return len;
-  LSEEK (self->handle, pos, SEEK_SET);
-  ret = WRITE (self->handle, buf, len);
-  if (ret != len)
-    GNUNET_GE_LOG_STRERROR_FILE (self->ectx,
-                                 GNUNET_GE_ERROR | GNUNET_GE_BULK |
-                                 GNUNET_GE_USER, "write", self->filename);
-  return ret;
+  GNUNET_free (entry);
+  return GNUNET_OK;
 }
 
+
 /**
- * Queue a request for execution.
+ * Iterator over entries in the pending requests in the 'active' map for the
+ * reply that we just got.
  *
- * @param rm the request manager struct from createRequestManager
- * @param node the node to call once a reply is received
+ * @param cls closure (our 'struct ProcessResultClosure')
+ * @param key query for the given value / request
+ * @param value value in the hash map (a 'struct DownloadRequest')
+ * @return GNUNET_YES (we should continue to iterate); unless serious error
  */
-static void
-add_request (struct Node *node)
+static int
+process_result_with_request (void *cls,
+                            const GNUNET_HashCode * key,
+                            void *value)
 {
-  struct GNUNET_ECRS_DownloadContext *rm = node->ctx;
-
-  GNUNET_DLL_insert (rm->head, rm->tail, node);
-  GNUNET_FS_start_search (rm->sctx,
-                          rm->have_target == GNUNET_NO ? NULL : &rm->target,
-                          GNUNET_ECRS_BLOCKTYPE_DATA, 1,
-                          &node->chk.query,
-                          rm->anonymityLevel,
-                          &content_receive_callback, node);
+  struct ProcessResultClosure *prc = cls;
+  struct DownloadRequest *sm = value;
+  struct DownloadRequest *ppos;
+  struct DownloadRequest *pprev;
+  struct GNUNET_DISK_FileHandle *fh;
+  struct GNUNET_FS_DownloadContext *dc = prc->dc;
+  struct GNUNET_CRYPTO_AesSessionKey skey;
+  struct GNUNET_CRYPTO_AesInitializationVector iv;
+  char pt[prc->size];
+  struct GNUNET_FS_ProgressInfo pi;
+  uint64_t off;
+  size_t bs;
+  size_t app;
+  int i;
+  struct ContentHashKey *chk;
+
+  fh = NULL;
+  bs = GNUNET_FS_tree_calculate_block_size (GNUNET_ntohll (dc->uri->data.chk.file_length),
+                                           dc->treedepth,
+                                           sm->offset,
+                                           sm->depth);
+  if (prc->size != bs)
+    {
+#if DEBUG_DOWNLOAD
+      GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+                 "Internal error or bogus download URI (expected %u bytes, got %u)\n",
+                 bs,
+                 prc->size);
+#endif
+      dc->emsg = GNUNET_strdup ("Internal error or bogus download URI");
+      goto signal_error;
+    }
+  GNUNET_assert (GNUNET_YES ==
+                GNUNET_CONTAINER_multihashmap_remove (dc->active,
+                                                      &prc->query,
+                                                      sm));
+  /* if this request is on the pending list, remove it! */
+  pprev = NULL;
+  ppos = dc->pending;
+  while (ppos != NULL)
+    {
+      if (ppos == sm)
+       {
+         if (pprev == NULL)
+           dc->pending = ppos->next;
+         else
+           pprev->next = ppos->next;
+         break;
+       }
+      pprev = ppos;
+      ppos = ppos->next;
+    }
+  GNUNET_CRYPTO_hash_to_aes_key (&sm->chk.key, &skey, &iv);
+  if (-1 == GNUNET_CRYPTO_aes_decrypt (prc->data,
+                                      prc->size,
+                                      &skey,
+                                      &iv,
+                                      pt))
+    {
+      GNUNET_break (0);
+      dc->emsg = GNUNET_strdup ("internal error decrypting content");
+      goto signal_error;
+    }
+  off = compute_disk_offset (GNUNET_ntohll (dc->uri->data.chk.file_length),
+                            sm->offset,
+                            sm->depth,
+                            dc->treedepth);
+  /* save to disk */
+  if ( ( GNUNET_YES == prc->do_store) &&
+       ( (dc->filename != NULL) ||
+        (is_recursive_download (dc)) ) &&
+       ( (sm->depth == dc->treedepth) ||
+        (0 == (dc->options & GNUNET_FS_DOWNLOAD_NO_TEMPORARIES)) ) )
+    {
+      fh = GNUNET_DISK_file_open (dc->filename != NULL 
+                                 ? dc->filename 
+                                 : dc->temp_filename, 
+                                 GNUNET_DISK_OPEN_READWRITE | 
+                                 GNUNET_DISK_OPEN_CREATE,
+                                 GNUNET_DISK_PERM_USER_READ |
+                                 GNUNET_DISK_PERM_USER_WRITE |
+                                 GNUNET_DISK_PERM_GROUP_READ |
+                                 GNUNET_DISK_PERM_OTHER_READ);
+    }
+  if ( (NULL == fh) &&
+       (GNUNET_YES == prc->do_store) &&
+       ( (dc->filename != NULL) ||
+        (is_recursive_download (dc)) ) &&
+       ( (sm->depth == dc->treedepth) ||
+        (0 == (dc->options & GNUNET_FS_DOWNLOAD_NO_TEMPORARIES)) ) )
+    {
+      GNUNET_asprintf (&dc->emsg,
+                      _("Download failed: could not open file `%s': %s\n"),
+                      dc->filename,
+                      STRERROR (errno));
+      goto signal_error;
+    }
+  if (fh != NULL)
+    {
+#if DEBUG_DOWNLOAD
+      GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+                 "Saving decrypted block to disk at offset %llu\n",
+                 (unsigned long long) off);
+#endif
+      if ( (off  != 
+           GNUNET_DISK_file_seek (fh,
+                                  off,
+                                  GNUNET_DISK_SEEK_SET) ) )
+       {
+         GNUNET_asprintf (&dc->emsg,
+                          _("Failed to seek to offset %llu in file `%s': %s\n"),
+                          (unsigned long long) off,
+                          dc->filename,
+                          STRERROR (errno));
+         goto signal_error;
+       }
+      if (prc->size !=
+         GNUNET_DISK_file_write (fh,
+                                 pt,
+                                 prc->size))
+       {
+         GNUNET_asprintf (&dc->emsg,
+                          _("Failed to write block of %u bytes at offset %llu in file `%s': %s\n"),
+                          (unsigned int) prc->size,
+                          (unsigned long long) off,
+                          dc->filename,
+                          STRERROR (errno));
+         goto signal_error;
+       }
+      GNUNET_break (GNUNET_OK == GNUNET_DISK_file_close (fh));
+      fh = NULL;
+    }
+  if (sm->depth == dc->treedepth) 
+    {
+      app = prc->size;
+      if (sm->offset < dc->offset)
+       {
+         /* starting offset begins in the middle of pt,
+            do not count first bytes as progress */
+         GNUNET_assert (app > (dc->offset - sm->offset));
+         app -= (dc->offset - sm->offset);       
+       }
+      if (sm->offset + prc->size > dc->offset + dc->length)
+       {
+         /* end of block is after relevant range,
+            do not count last bytes as progress */
+         GNUNET_assert (app > (sm->offset + prc->size) - (dc->offset + dc->length));
+         app -= (sm->offset + prc->size) - (dc->offset + dc->length);
+       }
+      dc->completed += app;
+
+      /* do recursive download if option is set and either meta data
+        says it is a directory or if no meta data is given AND filename 
+        ends in '.gnd' (top-level case) */
+      if (is_recursive_download (dc))
+       GNUNET_FS_directory_list_contents (prc->size,
+                                          pt,
+                                          off,
+                                          &trigger_recursive_download,
+                                          dc);         
+           
+    }
+  pi.status = GNUNET_FS_STATUS_DOWNLOAD_PROGRESS;
+  pi.value.download.specifics.progress.data = pt;
+  pi.value.download.specifics.progress.offset = sm->offset;
+  pi.value.download.specifics.progress.data_len = prc->size;
+  pi.value.download.specifics.progress.depth = sm->depth;
+  GNUNET_FS_download_make_status_ (&pi, dc);
+  GNUNET_assert (dc->completed <= dc->length);
+  if (dc->completed == dc->length)
+    {
+#if DEBUG_DOWNLOAD
+      GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+                 "Download completed, truncating file to desired length %llu\n",
+                 (unsigned long long) GNUNET_ntohll (dc->uri->data.chk.file_length));
+#endif
+      /* truncate file to size (since we store IBlocks at the end) */
+      if (dc->filename != NULL)
+       {
+         if (0 != truncate (dc->filename,
+                            GNUNET_ntohll (dc->uri->data.chk.file_length)))
+           GNUNET_log_strerror_file (GNUNET_ERROR_TYPE_WARNING,
+                                     "truncate",
+                                     dc->filename);
+       }
+      if (dc->job_queue != NULL)
+       {
+         GNUNET_FS_dequeue_ (dc->job_queue);
+         dc->job_queue = NULL;
+       }
+      if (is_recursive_download (dc))
+       full_recursive_download (dc);
+      if (dc->child_head == NULL)
+       {
+         /* signal completion */
+         pi.status = GNUNET_FS_STATUS_DOWNLOAD_COMPLETED;
+         GNUNET_FS_download_make_status_ (&pi, dc);
+         if (dc->parent != NULL)
+           check_completed (dc->parent);
+       }
+      GNUNET_assert (sm->depth == dc->treedepth);
+    }
+  if (sm->depth == dc->treedepth) 
+    {
+      GNUNET_FS_download_sync_ (dc);
+      GNUNET_free (sm);      
+      return GNUNET_YES;
+    }
+#if DEBUG_DOWNLOAD
+  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+             "Triggering downloads of children (this block was at depth %u and offset %llu)\n",
+             sm->depth,
+             (unsigned long long) sm->offset);
+#endif
+  GNUNET_assert (0 == (prc->size % sizeof(struct ContentHashKey)));
+  chk = (struct ContentHashKey*) pt;
+  for (i=(prc->size / sizeof(struct ContentHashKey))-1;i>=0;i--)
+    {
+      off = compute_dblock_offset (sm->offset,
+                                  sm->depth,
+                                  dc->treedepth,
+                                  i);
+      if ( (off + DBLOCK_SIZE >= dc->offset) &&
+          (off < dc->offset + dc->length) ) 
+       schedule_block_download (dc,
+                                &chk[i],
+                                off,
+                                sm->depth + 1);
+    }
+  GNUNET_free (sm);
+  GNUNET_FS_download_sync_ (dc);
+  return GNUNET_YES;
+
+ signal_error:
+  if (fh != NULL)
+    GNUNET_DISK_file_close (fh);
+  pi.status = GNUNET_FS_STATUS_DOWNLOAD_ERROR;
+  pi.value.download.specifics.error.message = dc->emsg;
+  GNUNET_FS_download_make_status_ (&pi, dc);
+  /* abort all pending requests */
+  if (NULL != dc->th)
+    {
+      GNUNET_CLIENT_notify_transmit_ready_cancel (dc->th);
+      dc->th = NULL;
+    }
+  GNUNET_CLIENT_disconnect (dc->client, GNUNET_NO);
+  GNUNET_CONTAINER_multihashmap_iterate (dc->active,
+                                        &free_entry,
+                                        NULL);
+  dc->pending = NULL;
+  dc->client = NULL;
+  GNUNET_free (sm);
+  GNUNET_FS_download_sync_ (dc);
+  return GNUNET_NO;
 }
 
+
+/**
+ * Process a download result.
+ *
+ * @param dc our download context
+ * @param type type of the result
+ * @param data the (encrypted) response
+ * @param size size of data
+ */
 static void
-signal_abort (struct GNUNET_ECRS_DownloadContext *rm, const char *msg)
+process_result (struct GNUNET_FS_DownloadContext *dc,
+               enum GNUNET_BLOCK_Type type,
+               const void *data,
+               size_t size)
 {
-  rm->abortFlag = GNUNET_SYSERR;
-  if ((rm->head != NULL) && (rm->dpcb != NULL))
-    rm->dpcb (rm->length + 1, 0, 0, 0, msg, 0, rm->dpcbClosure);
-  GNUNET_thread_stop_sleep (rm->main);
+  struct ProcessResultClosure prc;
+
+  prc.dc = dc;
+  prc.data = data;
+  prc.size = size;
+  prc.type = type;
+  prc.do_store = GNUNET_YES;
+  GNUNET_CRYPTO_hash (data, size, &prc.query);
+#if DEBUG_DOWNLOAD
+  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+             "Received result for query `%s' from `%s'-service\n",
+             GNUNET_h2s (&prc.query),
+             "FS");
+#endif
+  GNUNET_CONTAINER_multihashmap_get_multiple (dc->active,
+                                             &prc.query,
+                                             &process_result_with_request,
+                                             &prc);
 }
 
+
 /**
- * Dequeue a request.
+ * Type of a function to call when we receive a message
+ * from the service.
  *
- * @param self the request manager struct from createRequestManager
- * @param node the block for which the request is canceled
+ * @param cls closure
+ * @param msg message received, NULL on timeout or fatal error
  */
-static void
-delete_node (struct Node *node)
+static void 
+receive_results (void *cls,
+                const struct GNUNET_MessageHeader * msg)
 {
-  struct GNUNET_ECRS_DownloadContext *rm = node->ctx;
+  struct GNUNET_FS_DownloadContext *dc = cls;
+  const struct PutMessage *cm;
+  uint16_t msize;
 
-  GNUNET_DLL_remove (rm->head, rm->tail, node);
-  GNUNET_free (node);
-  if (rm->head == NULL)
-    GNUNET_thread_stop_sleep (rm->main);
+  if ( (NULL == msg) ||
+       (ntohs (msg->type) != GNUNET_MESSAGE_TYPE_FS_PUT) ||
+       (sizeof (struct PutMessage) > ntohs(msg->size)) )
+    {
+      GNUNET_break (msg == NULL);      
+      try_reconnect (dc);
+      return;
+    }
+  msize = ntohs(msg->size);
+  cm = (const struct PutMessage*) msg;
+  process_result (dc, 
+                 ntohl (cm->type),
+                 &cm[1],
+                 msize - sizeof (struct PutMessage));
+  if (dc->client == NULL)
+    return; /* fatal error */
+  /* continue receiving */
+  GNUNET_CLIENT_receive (dc->client,
+                        &receive_results,
+                        dc,
+                        GNUNET_TIME_UNIT_FOREVER_REL);
 }
 
+
+
 /**
- * Compute how many bytes of data are stored in
- * this node.
+ * We're ready to transmit a search request to the
+ * file-sharing service.  Do it.  If there is 
+ * more than one request pending, try to send 
+ * multiple or request another transmission.
+ *
+ * @param cls closure
+ * @param size number of bytes available in buf
+ * @param buf where the callee should write the message
+ * @return number of bytes written to buf
  */
-static unsigned int
-get_node_size (const struct Node *node)
+static size_t
+transmit_download_request (void *cls,
+                          size_t size, 
+                          void *buf)
 {
-  unsigned int i;
-  unsigned int ret;
-  unsigned long long rsize;
-  unsigned long long spos;
-  unsigned long long epos;
+  struct GNUNET_FS_DownloadContext *dc = cls;
+  size_t msize;
+  struct SearchMessage *sm;
 
-  GNUNET_GE_ASSERT (node->ctx->ectx, node->offset < node->ctx->total);
-  if (node->level == 0)
+  dc->th = NULL;
+  if (NULL == buf)
     {
-      ret = GNUNET_ECRS_DBLOCK_SIZE;
-      if (node->offset + (unsigned long long) ret > node->ctx->total)
-        ret = (unsigned int) (node->ctx->total - node->offset);
 #if DEBUG_DOWNLOAD
-      GNUNET_GE_LOG (node->ctx->rm->ectx,
-                     GNUNET_GE_DEBUG | GNUNET_GE_REQUEST | GNUNET_GE_USER,
-                     "Node at offset %llu and level %d has size %u\n",
-                     node->offset, node->level, ret);
+      GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+                 "Transmitting download request failed, trying to reconnect\n");
 #endif
-      return ret;
-    }
-  rsize = GNUNET_ECRS_DBLOCK_SIZE;
-  for (i = 0; i < node->level - 1; i++)
-    rsize *= GNUNET_ECRS_CHK_PER_INODE;
-  spos = rsize * (node->offset / sizeof (GNUNET_EC_ContentHashKey));
-  epos = spos + rsize * GNUNET_ECRS_CHK_PER_INODE;
-  if (epos > node->ctx->total)
-    epos = node->ctx->total;
-  ret = (epos - spos) / rsize;
-  if (ret * rsize < epos - spos)
-    ret++;                      /* need to round up! */
+      try_reconnect (dc);
+      return 0;
+    }
+  GNUNET_assert (size >= sizeof (struct SearchMessage));
+  msize = 0;
+  sm = buf;
+  while ( (dc->pending != NULL) &&
+         (size >= msize + sizeof (struct SearchMessage)) )
+    {
 #if DEBUG_DOWNLOAD
-  GNUNET_GE_LOG (node->ctx->rm->ectx,
-                 GNUNET_GE_DEBUG | GNUNET_GE_REQUEST | GNUNET_GE_USER,
-                 "Node at offset %llu and level %d has size %u\n",
-                 node->offset, node->level,
-                 ret * sizeof (GNUNET_EC_ContentHashKey));
+      GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+                 "Transmitting download request for `%s' to `%s'-service\n",
+                 GNUNET_h2s (&dc->pending->chk.query),
+                 "FS");
 #endif
-  return ret * sizeof (GNUNET_EC_ContentHashKey);
+      memset (sm, 0, sizeof (struct SearchMessage));
+      sm->header.size = htons (sizeof (struct SearchMessage));
+      sm->header.type = htons (GNUNET_MESSAGE_TYPE_FS_START_SEARCH);
+      if (0 != (dc->options & GNUNET_FS_DOWNLOAD_OPTION_LOOPBACK_ONLY))
+       sm->options = htonl (1);
+      else
+       sm->options = htonl (0);      
+      if (dc->pending->depth == dc->treedepth)
+       sm->type = htonl (GNUNET_BLOCK_TYPE_DBLOCK);
+      else
+       sm->type = htonl (GNUNET_BLOCK_TYPE_IBLOCK);
+      sm->anonymity_level = htonl (dc->anonymity);
+      sm->target = dc->target.hashPubKey;
+      sm->query = dc->pending->chk.query;
+      dc->pending->is_pending = GNUNET_NO;
+      dc->pending = dc->pending->next;
+      msize += sizeof (struct SearchMessage);
+      sm++;
+    }
+  if (dc->pending != NULL)
+    dc->th = GNUNET_CLIENT_notify_transmit_ready (dc->client,
+                                                 sizeof (struct SearchMessage),
+                                                 GNUNET_CONSTANTS_SERVICE_TIMEOUT,
+                                                 GNUNET_NO,
+                                                 &transmit_download_request,
+                                                 dc); 
+  return msize;
 }
 
+
 /**
- * Notify client about progress.
+ * Reconnect to the FS service and transmit our queries NOW.
+ *
+ * @param cls our download context
+ * @param tc unused
  */
 static void
-notify_client_about_progress (const struct Node *node,
-                              const char *data, unsigned int size)
+do_reconnect (void *cls,
+             const struct GNUNET_SCHEDULER_TaskContext *tc)
 {
-  struct GNUNET_ECRS_DownloadContext *rm = node->ctx;
-  GNUNET_CronTime eta;
-
-  if ((rm->abortFlag != GNUNET_NO) || (node->level != 0))
-    return;
-  rm->completed += size;
-  eta = GNUNET_get_time ();
-  if (rm->completed > 0)
-    eta = (GNUNET_CronTime) (rm->startTime +
-                             (((double) (eta - rm->startTime) /
-                               (double) rm->completed)) *
-                             (double) rm->length);
-  if (rm->dpcb != NULL)
-    rm->dpcb (rm->length,
-              rm->completed, eta, node->offset, data, size, rm->dpcbClosure);
+  struct GNUNET_FS_DownloadContext *dc = cls;
+  struct GNUNET_CLIENT_Connection *client;
+  
+  dc->task = GNUNET_SCHEDULER_NO_TASK;
+  client = GNUNET_CLIENT_connect (dc->h->sched,
+                                 "fs",
+                                 dc->h->cfg);
+  if (NULL == client)
+    {
+      GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
+                 "Connecting to `%s'-service failed, will try again.\n",
+                 "FS");
+      try_reconnect (dc);
+      return;
+    }
+  dc->client = client;
+  dc->th = GNUNET_CLIENT_notify_transmit_ready (client,
+                                               sizeof (struct SearchMessage),
+                                               GNUNET_CONSTANTS_SERVICE_TIMEOUT,
+                                               GNUNET_NO,
+                                               &transmit_download_request,
+                                               dc);  
+  GNUNET_CLIENT_receive (client,
+                        &receive_results,
+                        dc,
+                        GNUNET_TIME_UNIT_FOREVER_REL);
 }
 
 
 /**
- * DOWNLOAD children of this GNUNET_EC_IBlock.
- *
- * @param node the node for which the children should be downloaded
- * @param data data for the node
- * @param size size of data
- */
-static void iblock_download_children (const struct Node *node,
-                                      const char *data, unsigned int size);
-
-/**
- * Check if self block is already present on the drive.  If the block
- * is a dblock and present, the ProgressModel is notified. If the
- * block is present and it is an iblock, downloading the children is
- * triggered.
- *
- * Also checks if the block is within the range of blocks
- * that we are supposed to download.  If not, the method
- * returns as if the block is present but does NOT signal
- * progress.
+ * Add entries that are not yet pending back to the pending list.
  *
- * @param node that is checked for presence
- * @return GNUNET_YES if present, GNUNET_NO if not.
+ * @param cls our download context
+ * @param key unused
+ * @param entry entry of type "struct DownloadRequest"
+ * @return GNUNET_OK
  */
 static int
-check_node_present (const struct Node *node)
+retry_entry (void *cls,
+            const GNUNET_HashCode *key,
+            void *entry)
 {
-  int res;
-  int ret;
-  char *data;
-  unsigned int size;
-  GNUNET_HashCode hc;
-
-  size = get_node_size (node);
-  /* first check if node is within range.
-     For now, keeping it simple, we only do
-     this for level-0 nodes */
-  if ((node->level == 0) &&
-      ((node->offset + size < node->ctx->offset) ||
-       (node->offset >= node->ctx->offset + node->ctx->length)))
-    return GNUNET_YES;
-  data = GNUNET_malloc (size);
-  ret = GNUNET_NO;
-  res = read_from_files (node->ctx, node->level, node->offset, data, size);
-  if (res == size)
-    {
-      GNUNET_hash (data, size, &hc);
-      if (0 == memcmp (&hc, &node->chk.key, sizeof (GNUNET_HashCode)))
-        {
-          notify_client_about_progress (node, data, size);
-          if (node->level > 0)
-            iblock_download_children (node, data, size);
-          ret = GNUNET_YES;
-        }
-    }
-  GNUNET_free (data);
-  return ret;
+  struct GNUNET_FS_DownloadContext *dc = cls;
+  struct DownloadRequest *dr = entry;
+
+  if (! dr->is_pending)
+    {
+      dr->next = dc->pending;
+      dr->is_pending = GNUNET_YES;
+      dc->pending = entry;
+    }
+  return GNUNET_OK;
 }
 
+
 /**
- * DOWNLOAD children of this GNUNET_EC_IBlock.
+ * We've lost our connection with the FS service.
+ * Re-establish it and re-transmit all of our
+ * pending requests.
  *
- * @param node the node that should be downloaded
+ * @param dc download context that is having trouble
  */
 static void
-iblock_download_children (const struct Node *node,
-                          const char *data, unsigned int size)
+try_reconnect (struct GNUNET_FS_DownloadContext *dc)
 {
-  struct GNUNET_GE_Context *ectx = node->ctx->ectx;
-  int i;
-  struct Node *child;
-  unsigned int childcount;
-  const GNUNET_EC_ContentHashKey *chks;
-  unsigned int levelSize;
-  unsigned long long baseOffset;
-
-  GNUNET_GE_ASSERT (ectx, node->level > 0);
-  childcount = size / sizeof (GNUNET_EC_ContentHashKey);
-  if (size != childcount * sizeof (GNUNET_EC_ContentHashKey))
-    {
-      GNUNET_GE_BREAK (ectx, 0);
-      return;
-    }
-  if (node->level == 1)
-    {
-      levelSize = GNUNET_ECRS_DBLOCK_SIZE;
-      baseOffset =
-        node->offset / sizeof (GNUNET_EC_ContentHashKey) *
-        GNUNET_ECRS_DBLOCK_SIZE;
-    }
-  else
+  
+  if (NULL != dc->client)
     {
-      levelSize =
-        sizeof (GNUNET_EC_ContentHashKey) * GNUNET_ECRS_CHK_PER_INODE;
-      baseOffset = node->offset * GNUNET_ECRS_CHK_PER_INODE;
-    }
-  chks = (const GNUNET_EC_ContentHashKey *) data;
-  for (i = 0; i < childcount; i++)
-    {
-      child = GNUNET_malloc (sizeof (struct Node));
-      child->ctx = node->ctx;
-      child->chk = chks[i];
-      child->offset = baseOffset + i * levelSize;
-      GNUNET_GE_ASSERT (ectx, child->offset < node->ctx->total);
-      child->level = node->level - 1;
-      GNUNET_GE_ASSERT (ectx, (child->level != 0) ||
-                        ((child->offset % GNUNET_ECRS_DBLOCK_SIZE) == 0));
-      if (GNUNET_NO == check_node_present (child))
-        add_request (child);
-      else
-        GNUNET_free (child);    /* done already! */
+#if DEBUG_DOWNLOAD
+      GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+                 "Moving all requests back to pending list\n");
+#endif
+      if (NULL != dc->th)
+       {
+         GNUNET_CLIENT_notify_transmit_ready_cancel (dc->th);
+         dc->th = NULL;
+       }
+      GNUNET_CONTAINER_multihashmap_iterate (dc->active,
+                                            &retry_entry,
+                                            dc);
+      GNUNET_CLIENT_disconnect (dc->client, GNUNET_NO);
+      dc->client = NULL;
     }
+#if DEBUG_DOWNLOAD
+  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+             "Will try to reconnect in 1s\n");
+#endif
+  dc->task
+    = GNUNET_SCHEDULER_add_delayed (dc->h->sched,
+                                   GNUNET_TIME_UNIT_SECONDS,
+                                   &do_reconnect,
+                                   dc);
 }
 
 
+
 /**
- * Decrypts a given data block
+ * We're allowed to ask the FS service for our blocks.  Start the download.
  *
- * @param data represents the data block
- * @param hashcode represents the key concatenated with the initial
- *        value used in the alg
- * @param result where to store the result (encrypted block)
- * @returns GNUNET_OK on success, GNUNET_SYSERR on error
+ * @param cls the 'struct GNUNET_FS_DownloadContext'
+ * @param client handle to use for communcation with FS (we must destroy it!)
  */
-static int
-decrypt_content (const char *data,
-                 unsigned int size, const GNUNET_HashCode * hashcode,
-                 char *result)
+static void
+activate_fs_download (void *cls,
+                     struct GNUNET_CLIENT_Connection *client)
 {
-  GNUNET_AES_InitializationVector iv;
-  GNUNET_AES_SessionKey skey;
+  struct GNUNET_FS_DownloadContext *dc = cls;
+  struct GNUNET_FS_ProgressInfo pi;
 
-  /* get key and init value from the GNUNET_HashCode */
-  GNUNET_hash_to_AES_key (hashcode, &skey, &iv);
-  return GNUNET_AES_decrypt (&skey, data, size, &iv, result);
+#if DEBUG_DOWNLOAD
+  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+             "Download activated\n");
+#endif
+  GNUNET_assert (NULL != client);
+  GNUNET_assert (dc->client == NULL);
+  GNUNET_assert (dc->th == NULL);
+  dc->client = client;
+  GNUNET_CLIENT_receive (client,
+                        &receive_results,
+                        dc,
+                        GNUNET_TIME_UNIT_FOREVER_REL);
+  pi.status = GNUNET_FS_STATUS_DOWNLOAD_ACTIVE;
+  GNUNET_FS_download_make_status_ (&pi, dc);
+  GNUNET_CONTAINER_multihashmap_iterate (dc->active,
+                                        &retry_entry,
+                                        dc);
+#if DEBUG_DOWNLOAD
+  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+             "Asking for transmission to FS service\n");
+#endif
+  dc->th = GNUNET_CLIENT_notify_transmit_ready (dc->client,
+                                               sizeof (struct SearchMessage),
+                                               GNUNET_CONSTANTS_SERVICE_TIMEOUT,
+                                               GNUNET_NO,
+                                               &transmit_download_request,
+                                               dc);    
+  GNUNET_assert (dc->th != NULL);
 }
 
+
 /**
- * We received a GNUNET_EC_ContentHashKey reply for a block. Decrypt.  Note
- * that the caller (fslib) has already aquired the
- * RM lock (we sometimes aquire it again in callees,
- * mostly because our callees could be also be theoretically
- * called from elsewhere).
+ * We must stop to ask the FS service for our blocks.  Pause the download.
  *
- * @param cls the node for which the reply is given, freed in
- *        the function!
- * @param query the query for which reply is the answer
- * @param reply the reply
- * @return GNUNET_OK if the reply was valid, GNUNET_SYSERR on error
+ * @param cls the 'struct GNUNET_FS_DownloadContext'
  */
-static int
-content_receive_callback (const GNUNET_HashCode * query,
-                          const GNUNET_DatastoreValue * reply, void *cls,
-                          unsigned long long uid)
+static void
+deactivate_fs_download (void *cls)
 {
-  struct Node *node = cls;
-  struct GNUNET_ECRS_DownloadContext *rm = node->ctx;
-  struct GNUNET_GE_Context *ectx = rm->ectx;
-  GNUNET_HashCode hc;
-  unsigned int size;
-  char *data;
-
-  if (rm->abortFlag != GNUNET_NO)
-    return GNUNET_SYSERR;
-  GNUNET_GE_ASSERT (ectx,
-                    0 == memcmp (query, &node->chk.query,
-                                 sizeof (GNUNET_HashCode)));
-  size = ntohl (reply->size) - sizeof (GNUNET_DatastoreValue);
-  if ((size <= sizeof (GNUNET_EC_DBlock)) ||
-      (size - sizeof (GNUNET_EC_DBlock) != get_node_size (node)))
-    {
-      GNUNET_GE_BREAK (ectx, 0);
-      return GNUNET_SYSERR;     /* invalid size! */
-    }
-  size -= sizeof (GNUNET_EC_DBlock);
-  data = GNUNET_malloc (size);
-  if (GNUNET_SYSERR ==
-      decrypt_content ((const char *)
-                       &((const GNUNET_EC_DBlock *) &reply[1])[1], size,
-                       &node->chk.key, data))
-    GNUNET_GE_ASSERT (ectx, 0);
-  GNUNET_hash (data, size, &hc);
-  if (0 != memcmp (&hc, &node->chk.key, sizeof (GNUNET_HashCode)))
-    {
-      GNUNET_free (data);
-      GNUNET_GE_BREAK (ectx, 0);
-      signal_abort (rm,
-                    _("Decrypted content does not match key. "
-                      "This is either a bug or a maliciously inserted "
-                      "file. Download aborted.\n"));
-      return GNUNET_SYSERR;
+  struct GNUNET_FS_DownloadContext *dc = cls;
+  struct GNUNET_FS_ProgressInfo pi;
+
+#if DEBUG_DOWNLOAD
+  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+             "Download deactivated\n");
+#endif  
+  if (NULL != dc->th)
+    {
+      GNUNET_CLIENT_notify_transmit_ready_cancel (dc->th);
+      dc->th = NULL;
     }
-  if (size != write_to_files (rm, node->level, node->offset, data, size))
+  if (NULL != dc->client)
     {
-      GNUNET_GE_LOG_STRERROR (ectx,
-                              GNUNET_GE_ERROR | GNUNET_GE_ADMIN |
-                              GNUNET_GE_USER | GNUNET_GE_BULK, "WRITE");
-      signal_abort (rm, _("IO error."));
-      return GNUNET_SYSERR;
+      GNUNET_CLIENT_disconnect (dc->client, GNUNET_NO);
+      dc->client = NULL;
     }
-  notify_client_about_progress (node, data, size);
-  if (node->level > 0)
-    iblock_download_children (node, data, size);
-  GNUNET_free (data);
-  /* request satisfied, stop requesting! */
-  delete_node (node);
-  return GNUNET_OK;
+  pi.status = GNUNET_FS_STATUS_DOWNLOAD_INACTIVE;
+  GNUNET_FS_download_make_status_ (&pi, dc);
 }
 
 
 /**
- * Helper function to sanitize filename
- * and create necessary directories.
+ * Create SUSPEND event for the given download operation
+ * and then clean up our state (without stop signal).
+ *
+ * @param cls the 'struct GNUNET_FS_DownloadContext' to signal for
  */
-static char *
-get_real_download_filename (struct GNUNET_GE_Context *ectx,
-                            const char *filename)
+void
+GNUNET_FS_download_signal_suspend_ (void *cls)
 {
-  struct stat buf;
-  char *realFN;
-  char *path;
-  char *pos;
-
-  if ((filename[strlen (filename) - 1] == '/') ||
-      (filename[strlen (filename) - 1] == '\\'))
+  struct GNUNET_FS_DownloadContext *dc = cls;
+  struct GNUNET_FS_ProgressInfo pi;
+  
+  if (dc->top != NULL)
+    GNUNET_FS_end_top (dc->h, dc->top);
+  while (NULL != dc->child_head)
+    GNUNET_FS_download_signal_suspend_ (dc->child_head);  
+  if (dc->search != NULL)
     {
-      realFN =
-        GNUNET_malloc (strlen (filename) + strlen (GNUNET_DIRECTORY_EXT));
-      strcpy (realFN, filename);
-      realFN[strlen (filename) - 1] = '\0';
-      strcat (realFN, GNUNET_DIRECTORY_EXT);
+      dc->search->download = NULL;
+      dc->search = NULL;
     }
-  else
+  if (dc->job_queue != NULL)
     {
-      realFN = GNUNET_strdup (filename);
-    }
-  path = GNUNET_malloc (strlen (realFN) * strlen (GNUNET_DIRECTORY_EXT) + 1);
-  strcpy (path, realFN);
-  pos = path;
-  while (*pos != '\0')
-    {
-      if (*pos == DIR_SEPARATOR)
-        {
-          *pos = '\0';
-          if ((0 == STAT (path, &buf)) && (!S_ISDIR (buf.st_mode)))
-            {
-              *pos = DIR_SEPARATOR;
-              memmove (pos + strlen (GNUNET_DIRECTORY_EXT),
-                       pos, strlen (pos));
-              memcpy (pos,
-                      GNUNET_DIRECTORY_EXT, strlen (GNUNET_DIRECTORY_EXT));
-              pos += strlen (GNUNET_DIRECTORY_EXT);
-            }
-          else
-            {
-              *pos = DIR_SEPARATOR;
-            }
-        }
-      pos++;
-    }
-  GNUNET_free (realFN);
-  return path;
+      GNUNET_FS_dequeue_ (dc->job_queue);
+      dc->job_queue = NULL;
+    }
+  if (dc->parent != NULL)
+    GNUNET_CONTAINER_DLL_remove (dc->parent->child_head,
+                                dc->parent->child_tail,
+                                dc);  
+  pi.status = GNUNET_FS_STATUS_DOWNLOAD_SUSPEND;
+  GNUNET_FS_download_make_status_ (&pi, dc);
+  if (GNUNET_SCHEDULER_NO_TASK != dc->task)
+    GNUNET_SCHEDULER_cancel (dc->h->sched,
+                            dc->task);
+  GNUNET_CONTAINER_multihashmap_iterate (dc->active,
+                                        &free_entry,
+                                        NULL);
+  GNUNET_CONTAINER_multihashmap_destroy (dc->active);
+  GNUNET_free_non_null (dc->filename);
+  GNUNET_CONTAINER_meta_data_destroy (dc->meta);
+  GNUNET_FS_uri_destroy (dc->uri);
+  GNUNET_free_non_null (dc->temp_filename);
+  GNUNET_free_non_null (dc->serialization);
+  GNUNET_free (dc);
 }
 
-/* ***************** main method **************** */
-
 
 /**
  * Download parts of a file.  Note that this will store
- * the blocks at the respective offset in the given file.
- * Also, the download is still using the blocking of the
- * underlying ECRS encoding.  As a result, the download
- * may *write* outside of the given boundaries (if offset
- * and length do not match the 32k ECRS block boundaries).
- * <p>
+ * the blocks at the respective offset in the given file.  Also, the
+ * download is still using the blocking of the underlying FS
+ * encoding.  As a result, the download may *write* outside of the
+ * given boundaries (if offset and length do not match the 32k FS
+ * block boundaries). <p>
  *
  * This function should be used to focus a download towards a
  * particular portion of the file (optimization), not to strictly
  * limit the download to exactly those bytes.
  *
- * @param uri the URI of the file (determines what to download)
- * @param filename where to store the file
- * @param no_temporaries set to GNUNET_YES to disallow generation of temporary files
- * @param start starting offset
- * @param length length of the download (starting at offset)
- */
-struct GNUNET_ECRS_DownloadContext *
-GNUNET_ECRS_file_download_partial_start (struct GNUNET_GE_Context *ectx,
-                                         struct GNUNET_GC_Configuration *cfg,
-                                         struct GNUNET_FS_SearchContext *sc,
-                                         const struct GNUNET_ECRS_URI *uri,
-                                         const char *filename,
-                                         unsigned long long offset,
-                                         unsigned long long length,
-                                         unsigned int anonymityLevel,
-                                         int no_temporaries,
-                                         GNUNET_ECRS_DownloadProgressCallback
-                                         dpcb, void *dpcbClosure)
+ * @param h handle to the file sharing subsystem
+ * @param uri the URI of the file (determines what to download); CHK or LOC URI
+ * @param meta known metadata for the file (can be NULL)
+ * @param filename where to store the file, maybe NULL (then no file is
+ *        created on disk and data must be grabbed from the callbacks)
+ * @param tempname where to store temporary file data, not used if filename is non-NULL;
+ *        can be NULL (in which case we will pick a name if needed); the temporary file
+ *        may already exist, in which case we will try to use the data that is there and
+ *        if it is not what is desired, will overwrite it
+ * @param offset at what offset should we start the download (typically 0)
+ * @param length how many bytes should be downloaded starting at offset
+ * @param anonymity anonymity level to use for the download
+ * @param options various options
+ * @param cctx initial value for the client context for this download
+ * @param parent parent download to associate this download with (use NULL
+ *        for top-level downloads; useful for manually-triggered recursive downloads)
+ * @return context that can be used to control this download
+ */
+struct GNUNET_FS_DownloadContext *
+GNUNET_FS_download_start (struct GNUNET_FS_Handle *h,
+                         const struct GNUNET_FS_Uri *uri,
+                         const struct GNUNET_CONTAINER_MetaData *meta,
+                         const char *filename,
+                         const char *tempname,
+                         uint64_t offset,
+                         uint64_t length,
+                         uint32_t anonymity,
+                         enum GNUNET_FS_DownloadOptions options,
+                         void *cctx,
+                         struct GNUNET_FS_DownloadContext *parent)
 {
-  struct GNUNET_ECRS_DownloadContext *rm;
-  struct stat buf;
-  struct Node *top;
-  int ret;
-
-  if ((!GNUNET_ECRS_uri_test_chk (uri)) && (!GNUNET_ECRS_uri_test_loc (uri)))
-    {
-      GNUNET_GE_BREAK (ectx, 0);
+  struct GNUNET_FS_ProgressInfo pi;
+  struct GNUNET_FS_DownloadContext *dc;
+
+  GNUNET_assert (GNUNET_FS_uri_test_chk (uri));
+  if ( (offset + length < offset) ||
+       (offset + length > uri->data.chk.file_length) )
+    {      
+      GNUNET_break (0);
       return NULL;
     }
-  rm = GNUNET_malloc (sizeof (struct GNUNET_ECRS_DownloadContext));
-  memset (rm, 0, sizeof (struct GNUNET_ECRS_DownloadContext));
-  if (sc == NULL)
+#if DEBUG_DOWNLOAD
+  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+             "Starting download `%s' of %llu bytes\n",
+             filename,
+             (unsigned long long) length);
+#endif
+  dc = GNUNET_malloc (sizeof(struct GNUNET_FS_DownloadContext));
+  dc->h = h;
+  dc->parent = parent;
+  if (parent != NULL)
     {
-      rm->sctx = GNUNET_FS_create_search_context (ectx, cfg);
-      if (rm->sctx == NULL)
-        {
-          GNUNET_free (rm);
-          return NULL;
-        }
-      rm->my_sctx = GNUNET_YES;
+      GNUNET_CONTAINER_DLL_insert (parent->child_head,
+                                  parent->child_tail,
+                                  dc);
     }
-  else
+  dc->uri = GNUNET_FS_uri_dup (uri);
+  dc->meta = GNUNET_CONTAINER_meta_data_duplicate (meta);
+  dc->client_info = cctx;
+  dc->start_time = GNUNET_TIME_absolute_get ();
+  if (NULL != filename)
     {
-      rm->sctx = sc;
-      rm->my_sctx = GNUNET_NO;
-    }
-  rm->ectx = ectx;
-  rm->cfg = cfg;
-  rm->startTime = GNUNET_get_time ();
-  rm->anonymityLevel = anonymityLevel;
-  rm->offset = offset;
-  rm->length = length;
-  rm->dpcb = dpcb;
-  rm->dpcbClosure = dpcbClosure;
-  rm->main = GNUNET_thread_get_self ();
-  rm->total = GNUNET_ntohll (uri->data.fi.file_length);
-  rm->filename =
-    filename != NULL ? get_real_download_filename (ectx, filename) : NULL;
-
-  if ((rm->filename != NULL) &&
-      (GNUNET_SYSERR ==
-       GNUNET_disk_directory_create_for_file (ectx, rm->filename)))
-    {
-      free_request_manager (rm);
-      return NULL;
+      dc->filename = GNUNET_strdup (filename);
+      if (GNUNET_YES == GNUNET_DISK_file_test (filename))
+       GNUNET_DISK_file_size (filename,
+                              &dc->old_file_size,
+                              GNUNET_YES);
     }
-  if (0 == rm->total)
-    {
-      if (rm->filename != NULL)
-        {
-          ret = GNUNET_disk_file_open (ectx,
-                                       rm->filename,
-                                       O_CREAT | O_WRONLY | O_TRUNC,
-                                       S_IRUSR | S_IWUSR);
-          if (ret == -1)
-            {
-              free_request_manager (rm);
-              return NULL;
-            }
-          CLOSE (ret);
-        }
-      dpcb (0, 0, rm->startTime, 0, NULL, 0, dpcbClosure);
-      free_request_manager (rm);
-      return NULL;
+  if (GNUNET_FS_uri_test_loc (dc->uri))
+    GNUNET_assert (GNUNET_OK ==
+                  GNUNET_FS_uri_loc_get_peer_identity (dc->uri,
+                                                       &dc->target));
+  dc->offset = offset;
+  dc->length = length;
+  dc->anonymity = anonymity;
+  dc->options = options;
+  dc->active = GNUNET_CONTAINER_multihashmap_create (1 + 2 * (length / DBLOCK_SIZE));
+  dc->treedepth = GNUNET_FS_compute_depth (GNUNET_ntohll(dc->uri->data.chk.file_length));
+  if ( (filename == NULL) &&
+       (is_recursive_download (dc) ) )
+    {
+      if (tempname != NULL)
+       dc->temp_filename = GNUNET_strdup (tempname);
+      else
+       dc->temp_filename = GNUNET_DISK_mktemp ("gnunet-directory-download-tmp");    
     }
-  rm->treedepth = GNUNET_ECRS_compute_depth (rm->total);
-  if ((NULL != rm->filename) &&
-      ((0 == STAT (rm->filename, &buf))
-       && ((size_t) buf.st_size > rm->total)))
-    {
-      /* if exists and oversized, truncate */
-      if (truncate (rm->filename, rm->total) != 0)
-        {
-          GNUNET_GE_LOG_STRERROR_FILE (ectx,
-                                       GNUNET_GE_ERROR | GNUNET_GE_ADMIN |
-                                       GNUNET_GE_BULK, "truncate",
-                                       rm->filename);
-          free_request_manager (rm);
-          return NULL;
-        }
-    }
-  if (rm->filename != NULL)
-    {
-      rm->handle = GNUNET_disk_file_open (ectx,
-                                          rm->filename,
-                                          O_CREAT | O_RDWR,
-                                          S_IRUSR | S_IWUSR);
-      if (rm->handle < 0)
-        {
-          free_request_manager (rm);
-          return NULL;
-        }
+
+#if DEBUG_DOWNLOAD
+  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+             "Download tree has depth %u\n",
+             dc->treedepth);
+#endif
+  if (parent == NULL)
+    {
+      dc->top = GNUNET_FS_make_top (dc->h,
+                                   &GNUNET_FS_download_signal_suspend_,
+                                   dc);
     }
-  else
-    rm->handle = -1;
-  if (GNUNET_ECRS_uri_test_loc (uri))
-    {
-      GNUNET_hash (&uri->data.loc.peer, sizeof (GNUNET_RSA_PublicKey),
-                   &rm->target.hashPubKey);
-      rm->have_target = GNUNET_YES;
-    }
-  top = GNUNET_malloc (sizeof (struct Node));
-  memset (top, 0, sizeof (struct Node));
-  top->ctx = rm;
-  top->chk = uri->data.fi.chk;
-  top->offset = 0;
-  top->level = rm->treedepth;
-  if (GNUNET_NO == check_node_present (top))
-    add_request (top);
-  else
-    GNUNET_free (top);
-  return rm;
+  pi.status = GNUNET_FS_STATUS_DOWNLOAD_START;
+  pi.value.download.specifics.start.meta = meta;
+  GNUNET_FS_download_make_status_ (&pi, dc);
+  schedule_block_download (dc, 
+                          &dc->uri->data.chk.chk,
+                          0, 
+                          1 /* 0 == CHK, 1 == top */); 
+  GNUNET_FS_download_sync_ (dc);
+  GNUNET_FS_download_start_downloading_ (dc);
+  return dc;
 }
 
-int
-GNUNET_ECRS_file_download_partial_stop (struct GNUNET_ECRS_DownloadContext
-                                        *rm)
-{
-  int ret;
-
-  ret = rm->abortFlag;
-  free_request_manager (rm);
-  if (ret == GNUNET_NO)
-    ret = GNUNET_OK;            /* normal termination */
-  return ret;
-}
 
 /**
- * Download parts of a file.  Note that this will store
- * the blocks at the respective offset in the given file.
- * Also, the download is still using the blocking of the
- * underlying ECRS encoding.  As a result, the download
- * may *write* outside of the given boundaries (if offset
- * and length do not match the 32k ECRS block boundaries).
- * <p>
+ * Download parts of a file based on a search result.  The download
+ * will be associated with the search result (and the association
+ * will be preserved when serializing/deserializing the state).
+ * If the search is stopped, the download will not be aborted but
+ * be 'promoted' to a stand-alone download.
  *
- * This function should be used to focus a download towards a
+ * As with the other download function, this will store
+ * the blocks at the respective offset in the given file.  Also, the
+ * download is still using the blocking of the underlying FS
+ * encoding.  As a result, the download may *write* outside of the
+ * given boundaries (if offset and length do not match the 32k FS
+ * block boundaries). <p>
+ *
+ * The given range can be used to focus a download towards a
  * particular portion of the file (optimization), not to strictly
  * limit the download to exactly those bytes.
  *
- * @param uri the URI of the file (determines what to download)
- * @param filename where to store the file
- * @param no_temporaries set to GNUNET_YES to disallow generation of temporary files
- * @param start starting offset
- * @param length length of the download (starting at offset)
- */
-int
-GNUNET_ECRS_file_download_partial (struct GNUNET_GE_Context *ectx,
-                                   struct GNUNET_GC_Configuration *cfg,
-                                   const struct GNUNET_ECRS_URI *uri,
-                                   const char *filename,
-                                   unsigned long long offset,
-                                   unsigned long long length,
-                                   unsigned int anonymityLevel,
-                                   int no_temporaries,
-                                   GNUNET_ECRS_DownloadProgressCallback dpcb,
-                                   void *dpcbClosure,
-                                   GNUNET_ECRS_TestTerminate tt,
-                                   void *ttClosure)
+ * @param h handle to the file sharing subsystem
+ * @param sr the search result to use for the download (determines uri and
+ *        meta data and associations)
+ * @param filename where to store the file, maybe NULL (then no file is
+ *        created on disk and data must be grabbed from the callbacks)
+ * @param tempname where to store temporary file data, not used if filename is non-NULL;
+ *        can be NULL (in which case we will pick a name if needed); the temporary file
+ *        may already exist, in which case we will try to use the data that is there and
+ *        if it is not what is desired, will overwrite it
+ * @param offset at what offset should we start the download (typically 0)
+ * @param length how many bytes should be downloaded starting at offset
+ * @param anonymity anonymity level to use for the download
+ * @param options various download options
+ * @param cctx initial value for the client context for this download
+ * @return context that can be used to control this download
+ */
+struct GNUNET_FS_DownloadContext *
+GNUNET_FS_download_start_from_search (struct GNUNET_FS_Handle *h,
+                                     struct GNUNET_FS_SearchResult *sr,
+                                     const char *filename,
+                                     const char *tempname,
+                                     uint64_t offset,
+                                     uint64_t length,
+                                     uint32_t anonymity,
+                                     enum GNUNET_FS_DownloadOptions options,
+                                     void *cctx)
 {
-  struct GNUNET_ECRS_DownloadContext *rm;
-  int ret;
-
-  if (length == 0)
-    return GNUNET_OK;
-  rm = GNUNET_ECRS_file_download_partial_start (ectx,
-                                                cfg,
-                                                NULL,
-                                                uri,
-                                                filename,
-                                                offset,
-                                                length,
-                                                anonymityLevel,
-                                                no_temporaries,
-                                                dpcb, dpcbClosure);
-  if (rm == NULL)
-    return GNUNET_SYSERR;
-  while ((GNUNET_OK == tt (ttClosure)) &&
-         (GNUNET_YES != GNUNET_shutdown_test ()) &&
-         (rm->abortFlag == GNUNET_NO) && (rm->head != NULL))
-    GNUNET_thread_sleep (5 * GNUNET_CRON_SECONDS);
-  ret = GNUNET_ECRS_file_download_partial_stop (rm);
-  return ret;
+  struct GNUNET_FS_ProgressInfo pi;
+  struct GNUNET_FS_DownloadContext *dc;
+
+  if ( (sr == NULL) ||
+       (sr->download != NULL) )
+    {
+      GNUNET_break (0);
+      return NULL;
+    }
+  GNUNET_assert (GNUNET_FS_uri_test_chk (sr->uri));
+  if ( (offset + length < offset) ||
+       (offset + length > sr->uri->data.chk.file_length) )
+    {      
+      GNUNET_break (0);
+      return NULL;
+    }
+#if DEBUG_DOWNLOAD
+  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+             "Starting download `%s' of %llu bytes\n",
+             filename,
+             (unsigned long long) length);
+#endif
+  dc = GNUNET_malloc (sizeof(struct GNUNET_FS_DownloadContext));
+  dc->h = h;
+  dc->search = sr;
+  sr->download = dc;
+  if (sr->probe_ctx != NULL)
+    {
+      GNUNET_FS_download_stop (sr->probe_ctx, GNUNET_YES);
+      sr->probe_ctx = NULL;      
+    }
+  dc->uri = GNUNET_FS_uri_dup (sr->uri);
+  dc->meta = GNUNET_CONTAINER_meta_data_duplicate (sr->meta);
+  dc->client_info = cctx;
+  dc->start_time = GNUNET_TIME_absolute_get ();
+  if (NULL != filename)
+    {
+      dc->filename = GNUNET_strdup (filename);
+      if (GNUNET_YES == GNUNET_DISK_file_test (filename))
+       GNUNET_DISK_file_size (filename,
+                              &dc->old_file_size,
+                              GNUNET_YES);
+    }
+  if (GNUNET_FS_uri_test_loc (dc->uri))
+    GNUNET_assert (GNUNET_OK ==
+                  GNUNET_FS_uri_loc_get_peer_identity (dc->uri,
+                                                       &dc->target));
+  dc->offset = offset;
+  dc->length = length;
+  dc->anonymity = anonymity;
+  dc->options = options;
+  dc->active = GNUNET_CONTAINER_multihashmap_create (1 + 2 * (length / DBLOCK_SIZE));
+  dc->treedepth = GNUNET_FS_compute_depth (GNUNET_ntohll(dc->uri->data.chk.file_length));
+  if ( (filename == NULL) &&
+       (is_recursive_download (dc) ) )
+    {
+      if (tempname != NULL)
+       dc->temp_filename = GNUNET_strdup (tempname);
+      else
+       dc->temp_filename = GNUNET_DISK_mktemp ("gnunet-directory-download-tmp");    
+    }
+
+#if DEBUG_DOWNLOAD
+  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+             "Download tree has depth %u\n",
+             dc->treedepth);
+#endif
+  pi.status = GNUNET_FS_STATUS_DOWNLOAD_START;
+  pi.value.download.specifics.start.meta = dc->meta;
+  GNUNET_FS_download_make_status_ (&pi, dc);
+  schedule_block_download (dc, 
+                          &dc->uri->data.chk.chk,
+                          0, 
+                          1 /* 0 == CHK, 1 == top */); 
+  GNUNET_FS_download_sync_ (dc);
+  GNUNET_FS_download_start_downloading_ (dc);
+  return dc;  
 }
 
+
 /**
- * Download a file (simplified API).
+ * Start the downloading process (by entering the queue).
  *
- * @param uri the URI of the file (determines what to download)
- * @param filename where to store the file
- */
-int
-GNUNET_ECRS_file_download (struct GNUNET_GE_Context *ectx,
-                           struct GNUNET_GC_Configuration *cfg,
-                           const struct GNUNET_ECRS_URI *uri,
-                           const char *filename,
-                           unsigned int anonymityLevel,
-                           GNUNET_ECRS_DownloadProgressCallback dpcb,
-                           void *dpcbClosure, GNUNET_ECRS_TestTerminate tt,
-                           void *ttClosure)
+ * @param dc our download context
+ */
+void
+GNUNET_FS_download_start_downloading_ (struct GNUNET_FS_DownloadContext *dc)
 {
-  return GNUNET_ECRS_file_download_partial (ectx,
-                                            cfg,
-                                            uri,
-                                            filename,
-                                            0,
-                                            GNUNET_ECRS_uri_get_file_size
-                                            (uri), anonymityLevel, GNUNET_NO,
-                                            dpcb, dpcbClosure, tt, ttClosure);
+  GNUNET_assert (dc->job_queue == NULL);
+  dc->job_queue = GNUNET_FS_queue_ (dc->h, 
+                                   &activate_fs_download,
+                                   &deactivate_fs_download,
+                                   dc,
+                                   (dc->length + DBLOCK_SIZE-1) / DBLOCK_SIZE);
 }
 
-#endif
+
+/**
+ * Stop a download (aborts if download is incomplete).
+ *
+ * @param dc handle for the download
+ * @param do_delete delete files of incomplete downloads
+ */
+void
+GNUNET_FS_download_stop (struct GNUNET_FS_DownloadContext *dc,
+                        int do_delete)
+{
+  struct GNUNET_FS_ProgressInfo pi;
+  int have_children;
+
+  if (dc->top != NULL)
+    GNUNET_FS_end_top (dc->h, dc->top);
+  if (dc->search != NULL)
+    {
+      dc->search->download = NULL;
+      dc->search = NULL;
+    }
+  if (dc->job_queue != NULL)
+    {
+      GNUNET_FS_dequeue_ (dc->job_queue);
+      dc->job_queue = NULL;
+    }
+  have_children = (NULL != dc->child_head) ? GNUNET_YES : GNUNET_NO;
+  while (NULL != dc->child_head)
+    GNUNET_FS_download_stop (dc->child_head, 
+                            do_delete);
+  if (dc->parent != NULL)
+    GNUNET_CONTAINER_DLL_remove (dc->parent->child_head,
+                                dc->parent->child_tail,
+                                dc);  
+  if (dc->serialization != NULL)
+    GNUNET_FS_remove_sync_file_ (dc->h,
+                                ( (dc->parent != NULL)  || (dc->search != NULL) )
+                                ? GNUNET_FS_SYNC_PATH_CHILD_DOWNLOAD 
+                                : GNUNET_FS_SYNC_PATH_MASTER_DOWNLOAD , 
+                                dc->serialization);
+  if ( (GNUNET_YES == have_children) &&
+       (dc->parent == NULL) )
+    GNUNET_FS_remove_sync_dir_ (dc->h, 
+                               (dc->search != NULL) 
+                               ? GNUNET_FS_SYNC_PATH_CHILD_DOWNLOAD 
+                               : GNUNET_FS_SYNC_PATH_MASTER_DOWNLOAD,
+                               dc->serialization);  
+  pi.status = GNUNET_FS_STATUS_DOWNLOAD_STOPPED;
+  GNUNET_FS_download_make_status_ (&pi, dc);
+  if (GNUNET_SCHEDULER_NO_TASK != dc->task)
+    GNUNET_SCHEDULER_cancel (dc->h->sched,
+                            dc->task);
+  GNUNET_CONTAINER_multihashmap_iterate (dc->active,
+                                        &free_entry,
+                                        NULL);
+  GNUNET_CONTAINER_multihashmap_destroy (dc->active);
+  if (dc->filename != NULL)
+    {
+      if ( (dc->completed != dc->length) &&
+          (GNUNET_YES == do_delete) )
+       {
+         if (0 != UNLINK (dc->filename))
+           GNUNET_log_strerror_file (GNUNET_ERROR_TYPE_WARNING,
+                                     "unlink",
+                                     dc->filename);
+       }
+      GNUNET_free (dc->filename);
+    }
+  GNUNET_CONTAINER_meta_data_destroy (dc->meta);
+  GNUNET_FS_uri_destroy (dc->uri);
+  if (NULL != dc->temp_filename)
+    {
+      if (0 != UNLINK (dc->temp_filename))
+       GNUNET_log_strerror_file (GNUNET_ERROR_TYPE_ERROR,
+                                 "unlink",
+                                 dc->temp_filename);
+      GNUNET_free (dc->temp_filename);
+    }
+  GNUNET_free_non_null (dc->serialization);
+  GNUNET_free (dc);
+}
 
 /* end of fs_download.c */