hxing

5 files changed, 321 insertions, 4 deletions

diff --git a/src/include/Makefile.am b/src/include/Makefile.am
index 69954fd30..008d6a180 100644
--- a/src/include/Makefile.am
+++ b/src/include/Makefile.am
@@ -13,6 +13,7 @@ nodist_gnunetinclude_HEADERS = \
 
 gnunetinclude_HEADERS = \
   gnunet_arm_service.h \
+  gnunet_bio_lib.h \
   gnunet_client_lib.h \
   gnunet_common.h \
   gnunet_constants.h \
diff --git a/src/include/gnunet_bio_lib.h b/src/include/gnunet_bio_lib.h
new file mode 100644
index 000000000..02b04570e
--- /dev/null
+++ b/src/include/gnunet_bio_lib.h
@@ -0,0 +1,281 @@
+/*
+     This file is part of GNUnet.
+     (C) 2009 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
+     option) any later version.
+
+     GNUnet is distributed in the hope that it will be useful, but
+     WITHOUT ANY WARRANTY; without even the implied warranty of
+     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+     General Public License for more details.
+
+     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.
+*/
+
+/**
+ * @file include/gnunet_bio_lib.h
+ * @brief buffered IO API
+ * @author Christian Grothoff
+ */
+
+#ifndef GNUNET_BIO_LIB_H
+#define GNUNET_BIO_LIB_H
+
+#include "gnunet_container_lib.h"
+
+#ifdef __cplusplus
+extern "C"
+{
+#if 0                           /* keep Emacsens' auto-indent happy */
+}
+#endif
+#endif
+
+/**
+ * Handle for buffered reading.
+ */
+struct GNUNET_BIO_ReadHandle;
+
+
+/**
+ * Open a file for reading.
+ *
+ * @param fn file name to be opened
+ * @return IO handle on success, NULL on error
+ */
+struct GNUNET_BIO_ReadHandle *GNUNET_BIO_read_open (const char *fn);
+
+
+/**
+ * Close an open file.  Reports if any errors reading
+ * from the file were encountered.
+ *
+ * @param h file handle
+ * @param emsg set to the error message
+ * @return GNUNET_OK on success, GNUNET_SYSERR otherwise
+ */
+int GNUNET_BIO_read_close (struct GNUNET_BIO_ReadHandle *h,
+                           char **emsg);
+
+
+/**
+ * Read the contents of a binary file into a buffer.
+ *
+ * @param h handle to an open file
+ * @param what describes what is being read (for error message creation)
+ * @param result the buffer to write the result to
+ * @param len the number of bytes to read
+ * @return len on success, GNUNET_SYSERR on failure
+ */
+ssize_t GNUNET_BIO_read (struct GNUNET_BIO_ReadHandle *h, 
+                         const char *what,
+                         void *result, 
+                         size_t len);
+
+/**
+ * Read 0-terminated string from a file.
+ *
+ * @param h handle to an open file
+ * @param what describes what is being read (for error message creation)
+ * @param result the buffer to store a pointer to the (allocated) string to
+ *        (note that *result could be set to NULL as well)
+ * @return GNUNET_OK on success, GNUNET_SYSERR on failure
+ */
+int GNUNET_BIO_read_string (struct GNUNET_BIO_ReadHandle *h, 
+                            const char *what,
+                            char **result);
+
+
+/**
+ * Read metadata container from a file.
+ *
+ * @param h handle to an open file
+ * @param what describes what is being read (for error message creation)
+ * @param result the buffer to store a pointer to the (allocated) metadata
+ * @return GNUNET_OK on success, GNUNET_SYSERR on failure
+ */
+int GNUNET_BIO_read_meta_data (struct GNUNET_BIO_ReadHandle *h, 
+                               const char *what,
+                               struct GNUNET_CONTAINER_MetaData **result);
+
+
+/**
+ * Read a float.
+ *
+ * @param h hande to open file
+ * @param f address of float to read
+ */ 
+#define GNUNET_BIO_read_float(h, f) (sizeof(float) == GNUNET_BIO_read (h, __FILE__ "##__LINE__##", f, sizeof(float)))
+
+
+
+/**
+ * Read a double.
+ *
+ * @param h hande to open file
+ * @param f address of double to read
+ */ 
+#define GNUNET_BIO_read_double(h, f) (sizeof(double) == GNUNET_BIO_read (h, __FILE__ "##__LINE__##", f, sizeof(double)))
+
+
+/**
+ * Read an (u)int32_t.
+ *
+ * @param h hande to open file
+ * @param what describes what is being read (for error message creation)
+ * @param i address of 32-bit integer to read
+ * @return GNUNET_OK on success, GNUNET_SYSERR on error
+ */ 
+int GNUNET_BIO_read_int32__ (struct GNUNET_BIO_ReadHandle *h, 
+                             const char *what,
+                             int32_t *i);
+
+
+/**
+ * Read an (u)int32_t.
+ *
+ * @param h hande to open file
+ * @param i address of 32-bit integer to read
+ */ 
+#define GNUNET_BIO_read_int32(h, i) GNUNET_BIO_read_int32__ (h, __FILE__ "##__LINE__##", (int32_t*) i)
+
+
+/**
+ * Read an (u)int64_t.
+ *
+ * @param h hande to open file
+ * @param what describes what is being read (for error message creation)
+ * @param i address of 64-bit integer to read
+ * @return GNUNET_OK on success, GNUNET_SYSERR on error
+ */ 
+int GNUNET_BIO_read_int64__ (struct GNUNET_BIO_ReadHandle *h, 
+                             const char *what,
+                             int64_t *i);
+
+
+/**
+ * Read an (u)int64_t.
+ *
+ * @param h hande to open file
+ * @param i address of 64-bit integer to read
+ */ 
+#define GNUNET_BIO_read_int64(h, i) (sizeof(int64_t) == GNUNET_BIO_read (h, __FILE__ "##__LINE__##", (int64_t*) i, sizeof(int64_t)))
+
+
+/**
+ * Handle for buffered writing.
+ */
+struct GNUNET_BIO_WriteHandle;
+/**
+ * Open a file for writing.
+ *
+ * @param fn file name to be opened
+ * @return IO handle on success, NULL on error
+ */
+struct GNUNET_BIO_WriteHandle *GNUNET_BIO_write_open (const char *fn);
+
+
+/**
+ * Close an open file for writing.
+ *
+ * @param h file handle
+ * @return GNUNET_OK on success, GNUNET_SYSERR otherwise
+ */
+int GNUNET_BIO_write_close (struct GNUNET_BIO_WriteHandle *h);
+
+
+/**
+ * Write a buffer to a file.
+ *
+ * @param h handle to open file
+ * @param buffer the data to write
+ * @param n number of bytes to write
+ * @return GNUNET_OK on success, GNUNET_SYSERR on error
+ */
+ssize_t GNUNET_BIO_write (struct GNUNET_BIO_WriteHandle *h, 
+                          const void *buffer,
+                          size_t n);
+
+
+/**
+ * Write a string to a file.
+ *
+ * @param h handle to open file
+ * @param s string to write (can be NULL)
+ * @return GNUNET_OK on success, GNUNET_SYSERR on error
+ */
+int GNUNET_BIO_write_string (struct GNUNET_BIO_WriteHandle *h, 
+                             const char *s);
+
+
+
+
+/**
+ * Write metadata container to a file.
+ *
+ * @param h handle to open file
+ * @param m metadata to write
+ * @return GNUNET_OK on success, GNUNET_SYSERR on error
+ */
+int GNUNET_BIO_write_meta_data (struct GNUNET_BIO_WriteHandle *h, 
+                                const struct GNUNET_CONTAINER_MetaData *m);
+
+
+
+/**
+ * Write a float.
+ *
+ * @param h hande to open file
+ * @param f float to write (must be a variable)
+ */ 
+#define GNUNET_BIO_write_float(h, f) (sizeof(float) == GNUNET_BIO_write (h, &f, sizeof(float)))
+
+
+
+/**
+ * Write a double.
+ *
+ * @param h hande to open file
+ * @param f double to write (must be a variable)
+ */ 
+#define GNUNET_BIO_write_float(h, f) (sizeof(double) == GNUNET_BIO_write (h, &f, sizeof(double)))
+
+
+/**
+ * Write an (u)int32_t.
+ *
+ * @param h hande to open file
+ * @param i address of 32-bit integer to write
+ * @return GNUNET_OK on success, GNUNET_SYSERR on error
+ */ 
+int GNUNET_BIO_write_int32 (struct GNUNET_BIO_ReadHandle *h, 
+                            int32_t i);
+
+
+/**
+ * Write an (u)int64_t.
+ *
+ * @param h hande to open file
+ * @param i address of 64-bit integer to write
+ * @return GNUNET_OK on success, GNUNET_SYSERR on error
+ */ 
+int GNUNET_BIO_write_int64 (struct GNUNET_BIO_ReadHandle *h, 
+                            int64_t i);
+
+
+#if 0                           /* keep Emacsens' auto-indent happy */
+{
+#endif
+#ifdef __cplusplus
+}
+#endif
+
+/* ifndef GNUNET_BIO_LIB_H */
+#endif
+/* end of gnunet_bio_lib.h */
diff --git a/src/include/gnunet_disk_lib.h b/src/include/gnunet_disk_lib.h
index a5f279f05..f4fd6f36b 100644
--- a/src/include/gnunet_disk_lib.h
+++ b/src/include/gnunet_disk_lib.h
@@ -72,7 +72,12 @@ extern "C"
 #define GNUNET_DISK_PERM_OTHER_WRITE    128
 #define GNUNET_DISK_PERM_OTHER_EXEC     256
 
-enum GNUNET_DISK_Seek {GNUNET_SEEK_SET, GNUNET_SEEK_CUR, GNUNET_SEEK_END};
+enum GNUNET_DISK_Seek 
+  {
+    GNUNET_DISK_SEEK_SET, 
+    GNUNET_DISK_SEEK_CUR, 
+    GNUNET_DISK_SEEK_END
+  };
 
 struct GNUNET_DISK_FileHandle;
 
@@ -250,7 +255,8 @@ int GNUNET_DISK_file_copy (const char *src, const char *dst);
  * @return the number of files found, -1 on error
  */
 int GNUNET_DISK_directory_scan (const char *dirName,
-                                GNUNET_FileNameCallback callback, void *data);
+                                GNUNET_FileNameCallback callback, 
+                                void *data);
 
 
 /**
diff --git a/src/include/gnunet_fs_service.h b/src/include/gnunet_fs_service.h
index 236bdd083..45cd1e77e 100644
--- a/src/include/gnunet_fs_service.h
+++ b/src/include/gnunet_fs_service.h
@@ -1418,6 +1418,8 @@ typedef int (*GNUNET_FS_FileInformationProcessor)(void *cls,
  * Create an entry for a file in a publish-structure.
  *
  * @param filename name of the file or directory to publish
+ * @param keywords under which keywords should this file be available
+ *         directly; can be NULL
  * @param meta metadata for the file
  * @param do_index GNUNET_YES for index, GNUNET_NO for insertion,
  *                GNUNET_SYSERR for simulation
@@ -1431,6 +1433,7 @@ typedef int (*GNUNET_FS_FileInformationProcessor)(void *cls,
 struct GNUNET_FS_FileInformation *
 GNUNET_FS_file_information_create_from_file (void *client_info,
                                              const char *filename,
+                                             const struct GNUNET_FS_Uri *keywords,
                                              const struct GNUNET_CONTAINER_MetaData *meta,
                                              int do_index,
                                              unsigned int anonymity,
@@ -1444,6 +1447,8 @@ GNUNET_FS_file_information_create_from_file (void *client_info,
  * @param length length of the file
  * @param data data for the file (should not be used afterwards by
  *        the caller; caller will "free")
+ * @param keywords under which keywords should this file be available
+ *         directly; can be NULL
  * @param meta metadata for the file
  * @param do_index GNUNET_YES for index, GNUNET_NO for insertion,
  *                GNUNET_SYSERR for simulation
@@ -1458,6 +1463,7 @@ struct GNUNET_FS_FileInformation *
 GNUNET_FS_file_information_create_from_data (void *client_info,
                                              uint64_t length,
                                              void *data,
+                                             const struct GNUNET_FS_Uri *keywords,
                                              const struct GNUNET_CONTAINER_MetaData *meta,
                                              int do_index,
                                              unsigned int anonymity,
@@ -1539,6 +1545,10 @@ typedef void (*GNUNET_FS_FileProcessor)(void *cls,
  * 
  * @param cls closure
  * @param dirname name of the directory to scan
+ * @param do_index should files be indexed or inserted
+ * @param anonymity desired anonymity level
+ * @param priority priority for publishing
+ * @param expirationTime expiration for publication
  * @param proc function to call on each entry
  * @param proc_cls closure for proc
  * @param emsg where to store an error message (on errors)
@@ -1546,6 +1556,10 @@ typedef void (*GNUNET_FS_FileProcessor)(void *cls,
  */
 typedef int (*GNUNET_FS_DirectoryScanner)(void *cls,
                                           const char *dirname,
+                                          int do_index,
+                                          unsigned int anonymity,
+                                          unsigned int priority,
+                                          struct GNUNET_TIME_Absolute expirationTime,
                                           GNUNET_FS_FileProcessor proc,
                                           void *proc_cls,
                                           char **emsg);
@@ -1565,6 +1579,10 @@ typedef int (*GNUNET_FS_DirectoryScanner)(void *cls,
  *
  * @param cls must be of type "struct EXTRACTOR_Extractor*"
  * @param dirname name of the directory to scan
+ * @param do_index should files be indexed or inserted
+ * @param anonymity desired anonymity level
+ * @param priority priority for publishing
+ * @param expirationTime expiration for publication
  * @param proc function called on each entry
  * @param proc_cls closure for proc
  * @param emsg where to store an error message (on errors)
@@ -1573,8 +1591,13 @@ typedef int (*GNUNET_FS_DirectoryScanner)(void *cls,
 int
 GNUNET_FS_directory_scanner_default (void *cls,
                                      const char *dirname,
+                                     int do_index,
+                                     unsigned int anonymity,
+                                     unsigned int priority,
+                                     struct GNUNET_TIME_Absolute expirationTime,
                                      GNUNET_FS_FileProcessor proc,
-                                     void *proc_cls);
+                                     void *proc_cls,
+                                     char **emsg);
 
 
 /**
@@ -1590,20 +1613,25 @@ GNUNET_FS_directory_scanner_default (void *cls,
  * @param filename name of the top-level file or directory
  * @param scanner function used to get a list of files in a directory
  * @param scanner_cls closure for scanner
+ * @param do_index should files in the hierarchy be indexed?
  * @param anonymity what is the desired anonymity level for sharing?
  * @param priority what is the priority for OUR node to
  *   keep this file available?  Use 0 for maximum anonymity and
  *   minimum reliability...
  * @param expirationTime when should this content expire?
+ * @param emsg where to store an error message
  * @return publish structure entry for the directory, NULL on error
  */
 struct GNUNET_FS_FileInformation *
 GNUNET_FS_file_information_create_from_directory (void *client_info,
+                                                  const char *filename,
                                                   GNUNET_FS_DirectoryScanner scanner,
                                                   void *scanner_cls,
+                                                  int do_index,
                                                   unsigned int anonymity,
                                                   unsigned int priority,
-                                                  struct GNUNET_TIME_Absolute expirationTime);
+                                                  struct GNUNET_TIME_Absolute expirationTime,
+                                                  char **emsg);
 
 
 /**
diff --git a/src/include/gnunet_util_lib.h b/src/include/gnunet_util_lib.h
index fe382be3f..6bb87bf4d 100644
--- a/src/include/gnunet_util_lib.h
+++ b/src/include/gnunet_util_lib.h
@@ -37,6 +37,7 @@ extern "C"
 #endif
 
 #include "gnunet_common.h"
+#include "gnunet_bio_lib.h"
 #include "gnunet_client_lib.h"
 #include "gnunet_configuration_lib.h"
 #include "gnunet_connection_lib.h"