#include "gnunet_bio_lib.h"
/**
- * the directory which stores meta data for pseudonym
+ * Name of the directory which stores meta data for pseudonym
*/
-#define PS_METADATA_DIR DIR_SEPARATOR_STR "data" DIR_SEPARATOR_STR "pseudonyms/metadata" DIR_SEPARATOR_STR
+#define PS_METADATA_DIR DIR_SEPARATOR_STR "data" DIR_SEPARATOR_STR "pseudonyms" DIR_SEPARATOR_STR "metadata" DIR_SEPARATOR_STR
/**
- * the directory which stores name for pseudonym
+ * Name of the directory which stores names for pseudonyms
*/
-#define PS_NAMES_DIR DIR_SEPARATOR_STR "data" DIR_SEPARATOR_STR "pseudonyms/names" DIR_SEPARATOR_STR
+#define PS_NAMES_DIR DIR_SEPARATOR_STR "data" DIR_SEPARATOR_STR "pseudonyms" DIR_SEPARATOR_STR "names" DIR_SEPARATOR_STR
/**
- * link list struct DiscoveryCallback
+ * Registered callbacks for discovery of pseudonyms.
*/
struct DiscoveryCallback
{
/**
- * the point which points address of the next DiscoveryCallback
+ * This is a linked list.
*/
struct DiscoveryCallback *next;
/**
- * Iterator over pseudonym
+ * Function to call each time a pseudonym is discovered.
*/
GNUNET_PSEUDONYM_Iterator callback;
/**
- * a point to closure
+ * Closure for callback.
*/
void *closure;
};
/**
- * declare a point to a static stuct DiscoveryCallback
+ * Head of the linked list of functions to call when
+ * new pseudonyms are added.
*/
static struct DiscoveryCallback *head;
* pseudonym identifier and directory prefix.
* @param cfg configuration to use
* @param prefix path components to append to the private directory name
- * @param psid hash code of pseudonym
+ * @param psid hash code of pseudonym, can be NULL
+ * @return filename of the pseudonym (if psid != NULL) or directory with the data (if psid == NULL)
*/
static char *
get_data_filename (const struct GNUNET_CONFIGURATION_Handle
(GNUNET_OK != GNUNET_BIO_write_string(fileW, ns_name)) ||
(GNUNET_OK != GNUNET_BIO_write_meta_data(fileW, meta)) )
{
- GNUNET_BIO_write_close(fileW);
+ (void) GNUNET_BIO_write_close(fileW);
GNUNET_break (GNUNET_OK == GNUNET_DISK_directory_remove (fn));
GNUNET_free (fn);
return;
}
GNUNET_free (fn);
/* create entry for pseudonym name in names */
+ /* FIXME: 90% of what this call does is not needed
+ here => refactor code to only create the entry! */
GNUNET_free_non_null (GNUNET_PSEUDONYM_id_to_name (cfg, nsid));
}
{
if ((meta != NULL) && (name == NULL))
name = GNUNET_CONTAINER_meta_data_get_first_by_types (meta,
- EXTRACTOR_TITLE,
- EXTRACTOR_FILENAME,
- EXTRACTOR_DESCRIPTION,
- EXTRACTOR_SUBJECT,
- EXTRACTOR_PUBLISHER,
- EXTRACTOR_AUTHOR,
- EXTRACTOR_COMMENT,
- EXTRACTOR_SUMMARY,
- EXTRACTOR_OWNER,
+ EXTRACTOR_METATYPE_TITLE,
+ EXTRACTOR_METATYPE_FILENAME,
+ EXTRACTOR_METATYPE_DESCRIPTION,
+ EXTRACTOR_METATYPE_SUBJECT,
+ EXTRACTOR_METATYPE_PUBLISHER,
+ EXTRACTOR_METATYPE_AUTHOR_NAME,
+ EXTRACTOR_METATYPE_COMMENT,
+ EXTRACTOR_METATYPE_SUMMARY,
-1);
if (meta != NULL)
{
GNUNET_PSEUDONYM_Iterator iterator;
/**
- * point to closure
+ * Closure for iterator.
*/
void *closure;
/**
- * cfg configuration to use
+ * Configuration to use.
*/
const struct GNUNET_CONFIGURATION_Handle *cfg;
};
return ret;
}
+
/**
* Change the ranking of a pseudonym.
*
return ranking;
}
+
/**
* Insert metadata into existing MD record (passed as cls).
*
* @param cls metadata to add to
+ * @param plugin_name name of the plugin that generated the meta data
* @param type type of entry to insert
- * @param data value of entry to insert
+ * @param format format of data
+ * @param data_mime_type mime type of data
+ * @param data value of the meta data
+ * @param data_len number of bytes in data
+ * @return always 0
*/
static int
-merge_meta_helper (void *cls, EXTRACTOR_KeywordType type, const char *data)
+merge_meta_helper (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 GNUNET_CONTAINER_MetaData *meta = cls;
- GNUNET_CONTAINER_meta_data_insert (meta, type, data);
- return GNUNET_OK;
+
+ (void) GNUNET_CONTAINER_meta_data_insert (meta, plugin_name,
+ type, format,
+ data_mime_type,
+ data, data_len);
+ return 0;
}
if ((0 == STAT (fn, &sbuf)) &&
(GNUNET_OK == read_info (cfg, id, &old, &ranking, &name)))
{
- GNUNET_CONTAINER_meta_data_get_contents (meta, &merge_meta_helper, old);
+ GNUNET_CONTAINER_meta_data_iterate (meta, &merge_meta_helper, old);
write_pseudonym_info (cfg, id, old, ranking, name);
GNUNET_CONTAINER_meta_data_destroy (old);
GNUNET_free_non_null (name);
}
-
-
-
/* end of pseudonym.c */