#include <extractor.h>
#include "gnunet_fs_service.h"
#include "fs.h"
-
-
-/**
- * Create a temporary file on disk to store the current
- * state of "fi" in.
- */
-void
-GNUNET_FS_file_information_sync (struct GNUNET_FS_FileInformation * fi)
-{
- if (NULL == fi->serialization)
- {
- fi->serialization = NULL; // FIXME -- need cfg!
- }
- // FIXME...
-}
-
-
-/**
- * Load file information from the file to which
- * it was sync'ed.
- *
- * @param filename name of the file to use
- * @return NULL on error
- */
-struct GNUNET_FS_FileInformation *
-GNUNET_FS_file_information_recover (const char *name)
-{
- struct GNUNET_FS_FileInformation *ret;
- // FIXME!
- return NULL;
-}
+#include "fs_tree.h"
/**
}
-/**
- * Closure for "data_reader_file".
- */
-struct FileInfo
-{
- /**
- * Name of the file to read.
- */
- char *filename;
-
- /**
- * File descriptor, NULL if it has not yet been opened.
- */
- struct GNUNET_DISK_FileHandle *fd;
-};
-
-
-/**
- * Function that provides data by reading from a file.
- *
- * @param cls closure (points to the file information)
- * @param offset offset to read from; it is possible
- * that the caller might need to go backwards
- * a bit at times
- * @param max maximum number of bytes that should be
- * copied to buf; readers are not allowed
- * to provide less data unless there is an error;
- * a value of "0" will be used at the end to allow
- * the reader to clean up its internal state
- * @param buf where the reader should write the data
- * @param emsg location for the reader to store an error message
- * @return number of bytes written, usually "max", 0 on error
- */
-static size_t
-data_reader_file(void *cls,
- uint64_t offset,
- size_t max,
- void *buf,
- char **emsg)
-{
- struct FileInfo *fi = cls;
- ssize_t ret;
-
- if (max == 0)
- {
- if (fi->fd != NULL)
- GNUNET_DISK_file_close (fi->fd);
- GNUNET_free (fi->filename);
- GNUNET_free (fi);
- return 0;
- }
- if (fi->fd == NULL)
- {
- fi->fd = GNUNET_DISK_file_open (fi->filename,
- GNUNET_DISK_OPEN_READ);
- if (fi->fd == NULL)
- {
- GNUNET_asprintf (emsg,
- _("Could not open file `%s': %s"),
- fi->filename,
- STRERROR (errno));
- return 0;
- }
- }
- GNUNET_DISK_file_seek (fi->fd, offset, GNUNET_DISK_SEEK_SET);
- ret = GNUNET_DISK_file_read (fi->fd, buf, max);
- if (ret == -1)
- {
- GNUNET_asprintf (emsg,
- _("Could not read file `%s': %s"),
- fi->filename,
- STRERROR (errno));
- return 0;
- }
- if (ret != max)
- {
- GNUNET_asprintf (emsg,
- _("Short read reading from file `%s'!"),
- fi->filename);
- return 0;
- }
- return max;
-}
-
-
/**
* Create an entry for a file in a publish-structure.
*
+ * @param h handle to the file sharing subsystem
+ * @param client_info initial value for the client-info value for this entry
* @param filename name of the file or directory to publish
* @param keywords under which keywords should this file be available
* directly; can be NULL
* @return publish structure entry for the file
*/
struct GNUNET_FS_FileInformation *
-GNUNET_FS_file_information_create_from_file (void *client_info,
+GNUNET_FS_file_information_create_from_file (struct GNUNET_FS_Handle *h,
+ void *client_info,
const char *filename,
const struct GNUNET_FS_Uri *keywords,
const struct GNUNET_CONTAINER_MetaData *meta,
int do_index,
- unsigned int anonymity,
- unsigned int priority,
+ uint32_t anonymity,
+ uint32_t priority,
struct GNUNET_TIME_Absolute expirationTime)
{
struct FileInfo *fi;
struct stat sbuf;
+ struct GNUNET_FS_FileInformation *ret;
+ const char *fn;
+ const char *ss;
if (0 != STAT (filename, &sbuf))
{
filename);
return NULL;
}
- fi = GNUNET_malloc (sizeof(struct FileInfo));
- fi->filename = GNUNET_strdup (filename);
- return GNUNET_FS_file_information_create_from_reader (client_info,
- sbuf.st_size,
- &data_reader_file,
- fi,
- keywords,
- meta,
- do_index,
- anonymity,
- priority,
- expirationTime);
-}
-
-
-/**
- * Function that provides data by copying from a buffer.
- *
- * @param cls closure (points to the buffer)
- * @param offset offset to read from; it is possible
- * that the caller might need to go backwards
- * a bit at times
- * @param max maximum number of bytes that should be
- * copied to buf; readers are not allowed
- * to provide less data unless there is an error;
- * a value of "0" will be used at the end to allow
- * the reader to clean up its internal state
- * @param buf where the reader should write the data
- * @param emsg location for the reader to store an error message
- * @return number of bytes written, usually "max", 0 on error
- */
-static size_t
-data_reader_copy(void *cls,
- uint64_t offset,
- size_t max,
- void *buf,
- char **emsg)
-{
- char *data = cls;
- if (max == 0)
+ fi = GNUNET_FS_make_file_reader_context_ (filename);
+ if (fi == NULL)
{
- GNUNET_free (data);
- return 0;
- }
- memcpy (buf, &data[offset], max);
- return max;
+ GNUNET_break (0);
+ return NULL;
+ }
+ ret = GNUNET_FS_file_information_create_from_reader (h,
+ client_info,
+ sbuf.st_size,
+ &GNUNET_FS_data_reader_file_,
+ fi,
+ keywords,
+ meta,
+ do_index,
+ anonymity,
+ priority,
+ expirationTime);
+ ret->h = h;
+ ret->filename = GNUNET_strdup (filename);
+ fn = filename;
+ while (NULL != (ss = strstr (fn,
+ DIR_SEPARATOR_STR)))
+ fn = ss + 1;
+ GNUNET_CONTAINER_meta_data_insert (ret->meta,
+ "<gnunet>",
+ EXTRACTOR_METATYPE_FILENAME,
+ EXTRACTOR_METAFORMAT_C_STRING,
+ "text/plain",
+ fn,
+ strlen (fn) + 1);
+ return ret;
}
/**
* Create an entry for a file in a publish-structure.
*
+ * @param h handle to the file sharing subsystem
+ * @param client_info initial value for the client-info value for this entry
* @param length length of the file
* @param data data for the file (should not be used afterwards by
- * the caller; caller will "free")
+ * the caller; callee will "free")
* @param keywords under which keywords should this file be available
* directly; can be NULL
* @param meta metadata for the file
* @return publish structure entry for the file
*/
struct GNUNET_FS_FileInformation *
-GNUNET_FS_file_information_create_from_data (void *client_info,
+GNUNET_FS_file_information_create_from_data (struct GNUNET_FS_Handle *h,
+ 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,
- unsigned int priority,
+ uint32_t anonymity,
+ uint32_t priority,
struct GNUNET_TIME_Absolute expirationTime)
{
- return GNUNET_FS_file_information_create_from_reader (client_info,
+ if (GNUNET_YES == do_index)
+ {
+ GNUNET_break (0);
+ return NULL;
+ }
+ return GNUNET_FS_file_information_create_from_reader (h,
+ client_info,
length,
- &data_reader_copy,
+ &GNUNET_FS_data_reader_copy_,
data,
keywords,
meta,
/**
* Create an entry for a file in a publish-structure.
*
+ * @param h handle to the file sharing subsystem
+ * @param client_info initial value for the client-info value for this entry
* @param length length of the file
* @param reader function that can be used to obtain the data for the file
* @param reader_cls closure for "reader"
* @return publish structure entry for the file
*/
struct GNUNET_FS_FileInformation *
-GNUNET_FS_file_information_create_from_reader (void *client_info,
+GNUNET_FS_file_information_create_from_reader (struct GNUNET_FS_Handle *h,
+ void *client_info,
uint64_t length,
GNUNET_FS_DataReader reader,
void *reader_cls,
const struct GNUNET_FS_Uri *keywords,
const struct GNUNET_CONTAINER_MetaData *meta,
int do_index,
- unsigned int anonymity,
- unsigned int priority,
+ uint32_t anonymity,
+ uint32_t priority,
struct GNUNET_TIME_Absolute expirationTime)
{
struct GNUNET_FS_FileInformation *ret;
+ if ( (GNUNET_YES == do_index) &&
+ (reader != &GNUNET_FS_data_reader_file_) )
+ {
+ GNUNET_break (0);
+ return NULL;
+ }
ret = GNUNET_malloc (sizeof (struct GNUNET_FS_FileInformation));
- ret->client_info = client_info;
+ ret->h = h;
+ ret->client_info = client_info;
ret->meta = GNUNET_CONTAINER_meta_data_duplicate (meta);
+ if (ret->meta == NULL)
+ ret->meta = GNUNET_CONTAINER_meta_data_create ();
ret->keywords = (keywords == NULL) ? NULL : GNUNET_FS_uri_dup (keywords);
ret->expirationTime = expirationTime;
ret->data.file.reader = reader;
ret->data.file.reader_cls = reader_cls;
ret->data.file.do_index = do_index;
+ ret->data.file.file_size = length;
ret->anonymity = anonymity;
ret->priority = priority;
- GNUNET_FS_file_information_sync (ret);
return ret;
}
/**
* Metadata extractors to use.
*/
- struct EXTRACTOR_Extractor *extractors;
+ struct EXTRACTOR_PluginList *extractors;
+
+ /**
+ * Master context.
+ */
+ struct GNUNET_FS_Handle *h;
/**
* Function to call on each directory entry.
/**
* Desired anonymity level.
*/
- unsigned int anonymity;
+ uint32_t anonymity;
/**
* Desired publishing priority.
*/
- unsigned int priority;
+ uint32_t priority;
/**
* Expiration time for publication.
}
if (S_ISDIR (sbuf.st_mode))
{
- fi = GNUNET_FS_file_information_create_from_directory (NULL,
+ fi = GNUNET_FS_file_information_create_from_directory (dsc->h,
+ NULL,
filename,
dsc->scanner,
dsc->scanner_cls,
// FIXME: remove path from filename in metadata!
keywords = GNUNET_FS_uri_ksk_create_from_meta_data (meta);
ksk_uri = GNUNET_FS_uri_ksk_canonicalize (keywords);
- fi = GNUNET_FS_file_information_create_from_file (NULL,
+ fi = GNUNET_FS_file_information_create_from_file (dsc->h,
+ NULL,
filename,
ksk_uri,
meta,
* convenience function.
*
* @param cls must be of type "struct EXTRACTOR_Extractor*"
+ * @param h handle to the file sharing subsystem
* @param dirname name of the directory to scan
* @param do_index should files be indexed or inserted
* @param anonymity desired anonymity level
*/
int
GNUNET_FS_directory_scanner_default (void *cls,
+ struct GNUNET_FS_Handle *h,
const char *dirname,
int do_index,
- unsigned int anonymity,
- unsigned int priority,
+ uint32_t anonymity,
+ uint32_t priority,
struct GNUNET_TIME_Absolute expirationTime,
GNUNET_FS_FileProcessor proc,
void *proc_cls,
char **emsg)
{
- struct EXTRACTOR_Extractor *ex = cls;
+ struct EXTRACTOR_PluginList *ex = cls;
struct DirScanCls dsc;
+ dsc.h = h;
dsc.extractors = ex;
dsc.proc = proc;
dsc.proc_cls = proc_cls;
* passed (GNUNET_FS_directory_scanner_default). This is strictly a
* convenience function.
*
+ * @param h handle to the file sharing subsystem
+ * @param client_info initial value for the client-info value for this entry
* @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
* @return publish structure entry for the directory, NULL on error
*/
struct GNUNET_FS_FileInformation *
-GNUNET_FS_file_information_create_from_directory (void *client_info,
+GNUNET_FS_file_information_create_from_directory (struct GNUNET_FS_Handle *h,
+ void *client_info,
const char *filename,
GNUNET_FS_DirectoryScanner scanner,
void *scanner_cls,
int do_index,
- unsigned int anonymity,
- unsigned int priority,
+ uint32_t anonymity,
+ uint32_t priority,
struct GNUNET_TIME_Absolute expirationTime,
char **emsg)
{
struct EntryProcCls dc;
struct GNUNET_FS_Uri *ksk;
struct GNUNET_CONTAINER_MetaData *meta;
+ const char *fn;
+ const char *ss;
dc.entries = NULL;
meta = GNUNET_CONTAINER_meta_data_create ();
GNUNET_FS_meta_data_make_directory (meta);
-
scanner (scanner_cls,
+ h,
filename,
do_index,
anonymity,
emsg);
ksk = NULL; // FIXME...
// FIXME: create meta!
- ret = GNUNET_FS_file_information_create_empty_directory (client_info,
- meta,
+ ret = GNUNET_FS_file_information_create_empty_directory (h,
+ client_info,
ksk,
+ meta,
anonymity,
priority,
expirationTime);
+ GNUNET_CONTAINER_meta_data_destroy (meta);
ret->data.dir.entries = dc.entries;
while (dc.entries != NULL)
{
dc.entries->dir = ret;
- GNUNET_FS_file_information_sync (dc.entries);
dc.entries = dc.entries->next;
}
- GNUNET_FS_file_information_sync (ret);
+ fn = filename;
+ while (NULL != (ss = strstr (fn,
+ DIR_SEPARATOR_STR)))
+ fn = ss + 1;
+ GNUNET_CONTAINER_meta_data_insert (ret->meta,
+ "<gnunet>",
+ EXTRACTOR_METATYPE_FILENAME,
+ EXTRACTOR_METAFORMAT_C_STRING,
+ "text/plain",
+ fn,
+ strlen (fn) + 1);
+ ret->filename = GNUNET_strdup (filename);
return ret;
}
* use of "GNUNET_FS_file_information_create_from_directory"
* is not appropriate.
*
+ * @param h handle to the file sharing subsystem
+ * @param client_info initial value for the client-info value for this entry
* @param meta metadata for the directory
* @param keywords under which keywords should this directory be available
* directly; can be NULL
* @return publish structure entry for the directory , NULL on error
*/
struct GNUNET_FS_FileInformation *
-GNUNET_FS_file_information_create_empty_directory (void *client_info,
- const struct GNUNET_CONTAINER_MetaData *meta,
+GNUNET_FS_file_information_create_empty_directory (struct GNUNET_FS_Handle *h,
+ void *client_info,
const struct GNUNET_FS_Uri *keywords,
- unsigned int anonymity,
- unsigned int priority,
+ const struct GNUNET_CONTAINER_MetaData *meta,
+ uint32_t anonymity,
+ uint32_t priority,
struct GNUNET_TIME_Absolute expirationTime)
{
struct GNUNET_FS_FileInformation *ret;
ret = GNUNET_malloc (sizeof (struct GNUNET_FS_FileInformation));
+ ret->h = h;
ret->client_info = client_info;
ret->meta = GNUNET_CONTAINER_meta_data_duplicate (meta);
ret->keywords = GNUNET_FS_uri_dup (keywords);
ret->is_directory = GNUNET_YES;
ret->anonymity = anonymity;
ret->priority = priority;
- GNUNET_FS_file_information_sync (ret);
return ret;
}
ent->next = dir->data.dir.entries;
dir->data.dir.entries = ent;
dir->data.dir.dir_size = 0;
- dir->publish_offset = 0;
- GNUNET_FS_file_information_sync (ent);
- GNUNET_FS_file_information_sync (dir);
return GNUNET_OK;
}
{
struct GNUNET_FS_FileInformation *pos;
- if (dir->is_directory)
- {
+ if (GNUNET_OK !=
proc (proc_cls,
dir,
- dir->data.dir.dir_size,
+ (dir->is_directory) ? dir->data.dir.dir_size : dir->data.file.file_size,
dir->meta,
&dir->keywords,
&dir->anonymity,
&dir->priority,
&dir->expirationTime,
- &dir->client_info);
- pos = dir->data.dir.entries;
- while (pos != NULL)
- {
+ &dir->client_info))
+ return;
+ if (! dir->is_directory)
+ return;
+ pos = dir->data.dir.entries;
+ while (pos != NULL)
+ {
+ if (GNUNET_OK !=
proc (proc_cls,
pos,
- pos->data.dir.dir_size,
+ (pos->is_directory) ? pos->data.dir.dir_size : pos->data.file.file_size,
pos->meta,
&pos->keywords,
&pos->anonymity,
&pos->priority,
&pos->expirationTime,
- &pos->client_info);
- pos = pos->next;
- }
- }
- else
- {
- proc (proc_cls,
- dir,
- dir->data.file.file_size,
- dir->meta,
- &dir->keywords,
- &dir->anonymity,
- &dir->priority,
- &dir->expirationTime,
- &dir->client_info);
+ &pos->client_info))
+ break;
+ pos = pos->next;
}
}
GNUNET_FS_file_information_destroy (pos, cleaner, cleaner_cls);
}
/* clean up client-info */
- cleaner (cleaner_cls,
- fi,
- fi->data.dir.dir_size,
- fi->meta,
- &fi->keywords,
- &fi->anonymity,
- &fi->priority,
- &fi->expirationTime,
- &fi->client_info);
- GNUNET_free (fi->data.dir.dirname);
+ if (NULL != cleaner)
+ cleaner (cleaner_cls,
+ fi,
+ fi->data.dir.dir_size,
+ fi->meta,
+ &fi->keywords,
+ &fi->anonymity,
+ &fi->priority,
+ &fi->expirationTime,
+ &fi->client_info);
+ GNUNET_free_non_null (fi->data.dir.dir_data);
}
else
{
/* call clean-up function of the reader */
- fi->data.file.reader (fi->data.file.reader_cls, 0, 0, NULL, NULL);
+ if (fi->data.file.reader != NULL)
+ fi->data.file.reader (fi->data.file.reader_cls, 0, 0,
+ NULL, NULL);
/* clean up client-info */
- cleaner (cleaner_cls,
- fi,
- fi->data.file.file_size,
- fi->meta,
- &fi->keywords,
- &fi->anonymity,
- &fi->priority,
- &fi->expirationTime,
- &fi->client_info);
+ if (NULL != cleaner)
+ cleaner (cleaner_cls,
+ fi,
+ fi->data.file.file_size,
+ fi->meta,
+ &fi->keywords,
+ &fi->anonymity,
+ &fi->priority,
+ &fi->expirationTime,
+ &fi->client_info);
}
-
+ GNUNET_free_non_null (fi->filename);
+ GNUNET_free_non_null (fi->emsg);
+ GNUNET_free_non_null (fi->chk_uri);
/* clean up serialization */
- if (0 != UNLINK (fi->serialization))
+ if ( (NULL != fi->serialization) &&
+ (0 != UNLINK (fi->serialization)) )
GNUNET_log_strerror_file (GNUNET_ERROR_TYPE_WARNING,
"unlink",
fi->serialization);
- GNUNET_FS_uri_destroy (fi->keywords);
- GNUNET_CONTAINER_meta_data_destroy (fi->meta);
- GNUNET_free (fi->serialization);
+ if (NULL != fi->keywords)
+ GNUNET_FS_uri_destroy (fi->keywords);
+ if (NULL != fi->meta)
+ GNUNET_CONTAINER_meta_data_destroy (fi->meta);
+ GNUNET_free_non_null (fi->serialization);
+ if (fi->te != NULL)
+ {
+ GNUNET_FS_tree_encoder_finish (fi->te,
+ NULL, NULL);
+ fi->te = NULL;
+ }
GNUNET_free (fi);
}