/*
This file is part of GNUnet.
- (C) 2009 Christian Grothoff (and other contributing authors)
+ Copyright (C) 2009 GNUnet e.V.
GNUnet is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published
You should have received a copy of the GNU General Public License
along with GNUnet; see the file COPYING. If not, write to the
- Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- Boston, MA 02111-1307, USA.
+ Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ Boston, MA 02110-1301, USA.
*/
/**
#ifndef GNUNET_FS_TREE_H
#define GNUNET_FS_TREE_H
-#include "fs.h"
+#include "fs_api.h"
/**
- * Compute the depth of the CHK tree.
+ * Compute the depth of the CHK tree.
*
* @param flen file length for which to compute the depth
* @return depth of the tree, always > 0. A depth of 1 means only a DBLOCK.
* @param cls closure for reader, proc, progress and cont
* @param reader function to call to read plaintext data
* @param proc function to call on each encrypted block
- * @param progress function to call with progress information
+ * @param progress function to call with progress information
* @param cont function to call when done
* @return tree encoder context
*/
void *cls, GNUNET_FS_DataReader reader,
GNUNET_FS_TreeBlockProcessor proc,
GNUNET_FS_TreeProgressCallback progress,
- GNUNET_SCHEDULER_Task cont);
+ GNUNET_SCHEDULER_TaskCallback cont);
/**
- * Encrypt the next block of the file (and
- * call proc and progress accordingly; or
+ * Encrypt the next block of the file (and
+ * call proc and progress accordingly; or
* of course "cont" if we have already completed
* encoding of the entire file).
*
GNUNET_FS_tree_encoder_next (struct GNUNET_FS_TreeEncoder *te);
+/**
+ * Get the resulting URI from the encoding.
+ *
+ * @param te the tree encoder to clean up
+ * @return uri set to the resulting URI (if encoding finished), NULL otherwise
+ */
+struct GNUNET_FS_Uri *
+GNUNET_FS_tree_encoder_get_uri (struct GNUNET_FS_TreeEncoder *te);
+
+
/**
* Clean up a tree encoder and return information
- * about the resulting URI or an error message.
- *
+ * about possible errors.
+ *
* @param te the tree encoder to clean up
- * @param uri set to the resulting URI (if encoding finished)
* @param emsg set to an error message (if an error occured
* within the tree encoder; if this function is called
* prior to completion and prior to an internal error,
- * both "*uri" and "*emsg" will be set to NULL).
+ * both "*emsg" will be set to NULL).
*/
void
GNUNET_FS_tree_encoder_finish (struct GNUNET_FS_TreeEncoder *te,
- struct GNUNET_FS_Uri **uri, char **emsg);
+ char **emsg);
#if 0
/**
* Get data that would be needed to resume
* the encoding later.
- *
+ *
* @param te encoding to resume
* @param data set to the resume data
* @param size set to the size of the resume data
/**
* Reset tree encoder to point previously
* obtained for resuming.
- *
+ *
* @param te encoding to resume
* @param data the resume data
* @param size the size of the resume data
void
GNUNET_FS_tree_encoder_resume (struct GNUNET_FS_TreeEncoder *te,
const void *data, size_t size);
+
#endif
#endif