syn

5 files changed, 74 insertions, 14 deletions

diff --git a/src/include/gnunet_constants.h b/src/include/gnunet_constants.h
index 2c917cc59..bb122eb64 100644
--- a/src/include/gnunet_constants.h
+++ b/src/include/gnunet_constants.h
@@ -55,6 +55,13 @@ extern "C"
  */
 #define GNUNET_CONSTANTS_EXEC_WAIT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_MILLISECONDS, 100)
 
+/**
+ * After how long do we consider a service irresponsive
+ * even if we assume that the service commonly does not
+ * respond instantly (DNS, Database, etc.).
+ */
+#define GNUNET_CONSTANTS_SERVICE_TIMEOUT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_MINUTES, 10)
+
 
 #if 0                           /* keep Emacsens' auto-indent happy */
 {
diff --git a/src/include/gnunet_container_lib.h b/src/include/gnunet_container_lib.h
index 291b99fa2..e2a0787c8 100644
--- a/src/include/gnunet_container_lib.h
+++ b/src/include/gnunet_container_lib.h
@@ -305,8 +305,8 @@ int GNUNET_CONTAINER_meta_data_extract_from_file (struct
 
 enum GNUNET_CONTAINER_MetaDataSerializationOptions
 {
-  GNUNET_CONTAINER_META_DATA_SERIALIZE_FULL = GNUNET_NO,
-  GNUNET_CONTAINER_META_DATA_SERIALIZE_PART = GNUNET_YES,
+  GNUNET_CONTAINER_META_DATA_SERIALIZE_FULL = 0,
+  GNUNET_CONTAINER_META_DATA_SERIALIZE_PART = 1,
   GNUNET_CONTAINER_META_DATA_SERIALIZE_NO_COMPRESS = 2
 };
 
@@ -323,10 +323,11 @@ enum GNUNET_CONTAINER_MetaDataSerializationOptions
  *         GNUNET_SYSERR on error (typically: not enough
  *         space)
  */
-int GNUNET_CONTAINER_meta_data_serialize (const struct
-                                          GNUNET_CONTAINER_MetaData *md,
-                                          char *target, unsigned int size,
-                                          enum
+ssize_t GNUNET_CONTAINER_meta_data_serialize (const struct
+                                              GNUNET_CONTAINER_MetaData *md,
+                                              char *target, 
+                                              size_t size,
+                                              enum
                                           GNUNET_CONTAINER_MetaDataSerializationOptions
                                           opt);
 
@@ -337,12 +338,12 @@ int GNUNET_CONTAINER_meta_data_serialize (const struct
  *        meta-data to match the size constraint,
  *        possibly discarding some data?
  */
-unsigned int GNUNET_CONTAINER_meta_data_get_serialized_size (const struct
-                                                             GNUNET_CONTAINER_MetaData
-                                                             *md,
-                                                             enum
-                                                             GNUNET_CONTAINER_MetaDataSerializationOptions
-                                                             opt);
+ssize_t GNUNET_CONTAINER_meta_data_get_serialized_size (const struct
+                                                        GNUNET_CONTAINER_MetaData
+                                                        *md,
+                                                        enum
+                                                        GNUNET_CONTAINER_MetaDataSerializationOptions
+                                                        opt);
 
 /**
  * Deserialize meta-data.  Initializes md.
@@ -352,7 +353,7 @@ unsigned int GNUNET_CONTAINER_meta_data_get_serialized_size (const struct
  */
 struct GNUNET_CONTAINER_MetaData
   *GNUNET_CONTAINER_meta_data_deserialize (const char *input,
-                                           unsigned int size);
+                                           size_t size);
 
 /**
  * Does the meta-data claim that this is a directory?
diff --git a/src/include/gnunet_crypto_lib.h b/src/include/gnunet_crypto_lib.h
index 361d244e2..168c79b2a 100644
--- a/src/include/gnunet_crypto_lib.h
+++ b/src/include/gnunet_crypto_lib.h
@@ -394,7 +394,7 @@ void GNUNET_CRYPTO_hash_xor (const GNUNET_HashCode * a,
 /**
  * Convert a hashcode into a key.
  */
-void GNUNET_CRYPTO_hash_to_AES_key (const GNUNET_HashCode * hc,
+void GNUNET_CRYPTO_hash_to_aes_key (const GNUNET_HashCode * hc,
                                     struct GNUNET_CRYPTO_AesSessionKey *skey,
                                     struct
                                     GNUNET_CRYPTO_AesInitializationVector
diff --git a/src/include/gnunet_datastore_service.h b/src/include/gnunet_datastore_service.h
index 28419126f..3805dea97 100644
--- a/src/include/gnunet_datastore_service.h
+++ b/src/include/gnunet_datastore_service.h
@@ -41,6 +41,12 @@ extern "C"
 #endif
 #endif
 
+#define GNUNET_DATASTORE_BLOCKTYPE_ANY 0
+#define GNUNET_DATASTORE_BLOCKTYPE_DBLOCK 1
+#define GNUNET_DATASTORE_BLOCKTYPE_IBLOCK 2
+#define GNUNET_DATASTORE_BLOCKTYPE_KBLOCK 3
+#define GNUNET_DATASTORE_BLOCKTYPE_SBLOCK 4
+#define GNUNET_DATASTORE_BLOCKTYPE_SKBLOCK 5
 
 /**
  * Handle to the datastore service.
diff --git a/src/include/gnunet_fs_service.h b/src/include/gnunet_fs_service.h
index 4664c4cee..3c71d40e7 100644
--- a/src/include/gnunet_fs_service.h
+++ b/src/include/gnunet_fs_service.h
@@ -2169,6 +2169,52 @@ GNUNET_FS_directory_list_contents (size_t size,
                                    void *dep_cls);
 
 
+/**
+ * Opaque handle to a directory builder.
+ */
+struct GNUNET_FS_DirectoryBuilder;
+
+/**
+ * Create a directory builder.
+ * 
+ * @param mdir metadata for the directory
+ */
+struct GNUNET_FS_DirectoryBuilder *
+GNUNET_FS_directory_builder_create (const struct GNUNET_CONTAINER_MetaData *mdir);
+
+
+/**
+ * Add an entry to a directory.
+ * 
+ * @param bld directory to extend
+ * @param uri uri of the entry (must not be a KSK)
+ * @param md metadata of the entry
+ * @param data raw data of the entry, can be NULL, otherwise
+ *        data must point to exactly the number of bytes specified
+ *        by the uri
+ */
+void
+GNUNET_FS_directory_builder_add (struct GNUNET_FS_DirectoryBuilder *bld,
+                                 const struct GNUNET_FS_Uri *uri,
+                                 const struct GNUNET_CONTAINER_MetaData *md,
+                                 const void *data);
+                 
+
+/**
+ * Finish building the directory.  Frees the
+ * builder context and returns the directory
+ * in-memory.
+ *
+ * @param bld directory to finish
+ * @param size set to the number of bytes needed
+ * @param data set to the encoded directory
+ */
+void
+GNUNET_FS_directory_builder_finish (struct GNUNET_FS_DirectoryBuilder *bld,
+                                    size_t *size,
+                                    void **data);
+
+
 #if 0                           /* keep Emacsens' auto-indent happy */
 {
 #endif