[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r6818 - in GNUnet: . src/applications/fs/ecrs src/applicati
|
From: |
gnunet |
|
Subject: |
[GNUnet-SVN] r6818 - in GNUnet: . src/applications/fs/ecrs src/applications/fs/namespace src/applications/fs/tools src/include |
|
Date: |
Tue, 13 May 2008 21:33:09 -0600 (MDT) |
Author: grothoff
Date: 2008-05-13 21:33:08 -0600 (Tue, 13 May 2008)
New Revision: 6818
Modified:
GNUnet/src/applications/fs/ecrs/namespace.c
GNUnet/src/applications/fs/ecrs/uri.c
GNUnet/src/applications/fs/namespace/Makefile.am
GNUnet/src/applications/fs/namespace/namespace_info.c
GNUnet/src/applications/fs/namespace/namespace_infotest.c
GNUnet/src/applications/fs/tools/Makefile.am
GNUnet/src/applications/fs/tools/gnunet-insert.c
GNUnet/src/applications/fs/tools/gnunet-pseudonym.c
GNUnet/src/include/gnunet_ecrs_lib.h
GNUnet/src/include/gnunet_namespace_lib.h
GNUnet/todo
Log:
improving naming of namespaces -- finally
Modified: GNUnet/src/applications/fs/ecrs/namespace.c
===================================================================
--- GNUnet/src/applications/fs/ecrs/namespace.c 2008-05-14 03:03:45 UTC (rev
6817)
+++ GNUnet/src/applications/fs/ecrs/namespace.c 2008-05-14 03:33:08 UTC (rev
6818)
@@ -32,7 +32,7 @@
#include "ecrs_core.h"
#include "ecrs.h"
-#define PSEUDODIR "data/pseudonyms/"
+#define PSEUDODIR "data/namespace/keys/"
#define INITVALUE "GNUnet!!"
#define MAX_NBLOCK_SIZE 32000
#define MAX_SBLOCK_SIZE 32000
Modified: GNUnet/src/applications/fs/ecrs/uri.c
===================================================================
--- GNUnet/src/applications/fs/ecrs/uri.c 2008-05-14 03:03:45 UTC (rev
6817)
+++ GNUnet/src/applications/fs/ecrs/uri.c 2008-05-14 03:33:08 UTC (rev
6818)
@@ -275,6 +275,53 @@
}
/**
+ * Convert keyword URI to a human readable format
+ * (i.e. the search query that was used in the first place)
+ */
+char *
+GNUNET_ECRS_ksk_uri_to_human_readable_string (const struct GNUNET_ECRS_URI
*uri)
+{
+ size_t n;
+ char *ret;
+ unsigned int i;
+ const char *keyword;
+ char **keywords;
+ unsigned int keywordCount;
+
+ if ( (uri == NULL) ||
+ (uri->type != ksk) )
+ {
+ GNUNET_GE_BREAK (NULL, 0);
+ return NULL;
+ }
+ keywords = uri->data.ksk.keywords;
+ keywordCount = uri->data.ksk.keywordCount;
+ n = keywordCount + 1;
+ for (i = 0; i < keywordCount; i++)
+ {
+ keyword = keywords[i];
+ n += strlen(keyword);
+ if (NULL != strstr(keyword, " "))
+ n += 2;
+ }
+ ret = GNUNET_malloc (n);
+ strcpy (ret, "");
+ for (i = 0; i < keywordCount; i++)
+ {
+ keyword = keywords[i];
+ if (NULL != strstr(keyword, " "))
+ {
+ strcat(ret, "\"");
+ strcat(ret, keyword);
+ strcat(ret, "\"");
+ }
+ else
+ strcat(ret, keyword);
+ }
+ return ret;
+}
+
+/**
* Given a keyword with %-encoding (and possibly quotes to protect
* spaces), return a copy of the keyword without %-encoding and
* without double-quotes (%22). Also, add a space at the beginning
@@ -686,22 +733,6 @@
}
/**
- * Get the (globally unique) name for the given namespace.
- *
- * @return the name (GNUNET_hash) of the namespace, caller
- * must free it.
- */
-char *
-GNUNET_ECRS_get_namespace_name (const GNUNET_HashCode * id)
-{
- char *ret;
-
- ret = GNUNET_malloc (sizeof (GNUNET_EncName));
- GNUNET_hash_to_enc (id, (GNUNET_EncName *) ret);
- return ret;
-}
-
-/**
* Get the (globally unique) ID of the namespace
* from the given namespace URI.
*
Modified: GNUnet/src/applications/fs/namespace/Makefile.am
===================================================================
--- GNUnet/src/applications/fs/namespace/Makefile.am 2008-05-14 03:03:45 UTC
(rev 6817)
+++ GNUnet/src/applications/fs/namespace/Makefile.am 2008-05-14 03:33:08 UTC
(rev 6818)
@@ -4,7 +4,13 @@
libgnunetnamespace.la
libgnunetnamespace_la_SOURCES = \
- namespace_info.c
+ common.c common.h \
+ names.c \
+ namespace_info.c namespace_info.h \
+ namespace_notification.c namespace_notification.h \
+ root_info.c \
+ update_info.c \
+ uri.c
libgnunetnamespace_la_LIBADD = \
$(top_builddir)/src/applications/fs/ecrs/libgnunetecrs.la \
$(top_builddir)/src/util/libgnunetutil.la
Modified: GNUnet/src/applications/fs/namespace/namespace_info.c
===================================================================
--- GNUnet/src/applications/fs/namespace/namespace_info.c 2008-05-14
03:03:45 UTC (rev 6817)
+++ GNUnet/src/applications/fs/namespace/namespace_info.c 2008-05-14
03:33:08 UTC (rev 6818)
@@ -1,6 +1,6 @@
/*
This file is part of GNUnet
- (C) 2003, 2004, 2005, 2006, 2007 Christian Grothoff (and other
contributing authors)
+ (C) 2003, 2004, 2005, 2006, 2007, 2008 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
@@ -20,10 +20,7 @@
/**
* @file applications/fs/namespace/namespace_info.c
- * @brief keeping track of namespaces. This module
- * is supposed to keep track of other namespaces (and
- * their advertisments), as well as of our own namespaces
- * and the updateable content stored therein.
+ * @brief keeping track of namespaces and metadata about them
* @author Christian Grothoff
*/
@@ -31,118 +28,91 @@
#include "gnunet_directories.h"
#include "gnunet_namespace_lib.h"
#include "gnunet_util.h"
+#include "namespace_info.h"
+#include "namespace_notification.h"
+#include "common.h"
-#define NS_DIR "data" DIR_SEPARATOR_STR "namespaces" DIR_SEPARATOR_STR
-#define NS_UPDATE_DIR "data" DIR_SEPARATOR_STR "namespace-updates"
DIR_SEPARATOR_STR
-#define NS_ROOTS "data" DIR_SEPARATOR_STR "namespace-root" DIR_SEPARATOR_STR
-struct DiscoveryCallback
-{
- struct DiscoveryCallback *next;
- GNUNET_NS_NamespaceIterator callback;
- void *closure;
-};
-
-static struct DiscoveryCallback *head;
-
-static struct GNUNET_Mutex *lock;
-
-/**
- * Internal notification about new tracked URI.
- */
static void
-internal_notify (const char *name,
- const GNUNET_HashCode * id,
- const struct GNUNET_ECRS_MetaData *md, int rating)
+write_namespace_info (struct GNUNET_GE_Context *ectx,
+ struct GNUNET_GC_Configuration *cfg,
+ const GNUNET_HashCode * nsid,
+ const struct GNUNET_ECRS_MetaData *meta,
+ int ranking,
+ const char * ns_name)
{
- struct DiscoveryCallback *pos;
-
- GNUNET_mutex_lock (lock);
- pos = head;
- while (pos != NULL)
- {
- pos->callback (pos->closure, name, id, md, rating);
- pos = pos->next;
- }
- GNUNET_mutex_unlock (lock);
-}
-
-static void
-writeNamespaceInfo (struct GNUNET_GE_Context *ectx,
- struct GNUNET_GC_Configuration *cfg,
- const char *namespaceName,
- const struct GNUNET_ECRS_MetaData *meta, int ranking)
-{
unsigned int size;
unsigned int tag;
+ unsigned int off;
char *buf;
char *fn;
- char *fnBase;
-
- GNUNET_GC_get_configuration_value_filename (cfg,
- "GNUNET",
- "GNUNET_HOME",
- GNUNET_DEFAULT_HOME_DIRECTORY,
- &fnBase);
- fn =
- GNUNET_malloc (strlen (fnBase) + strlen (NS_DIR) +
- strlen (namespaceName) + 6);
- strcpy (fn, fnBase);
- strcat (fn, DIR_SEPARATOR_STR);
- strcat (fn, NS_DIR);
- GNUNET_disk_directory_create (ectx, fn);
- strcat (fn, DIR_SEPARATOR_STR);
- strcat (fn, namespaceName);
- GNUNET_free (fnBase);
-
+ fn = GNUNET_NS_internal_get_data_filename_(ectx,
+ cfg,
+ NS_METADATA_DIR,
+ nsid,
+ NULL);
size =
GNUNET_ECRS_meta_data_get_serialized_size (meta,
GNUNET_ECRS_SERIALIZE_FULL);
- tag = size + sizeof (int);
+ tag = size + sizeof (int) + 1;
+ off = 0;
+ if (ns_name != NULL)
+ {
+ off = strlen(ns_name);
+ tag += off;
+ }
buf = GNUNET_malloc (tag);
((int *) buf)[0] = htonl (ranking); /* ranking */
+ if (ns_name != NULL)
+ {
+ memcpy(&buf[sizeof(int)],
+ ns_name,
+ off + 1);
+ }
+ else
+ {
+ buf[sizeof(int)] = '\0';
+ }
GNUNET_GE_ASSERT (ectx,
size == GNUNET_ECRS_meta_data_serialize (ectx,
meta,
&buf[sizeof
- (int)],
+ (int) + off
+ 1],
size,
GNUNET_ECRS_SERIALIZE_FULL));
GNUNET_disk_file_write (ectx, fn, buf, tag, "660");
GNUNET_free (fn);
GNUNET_free (buf);
+ /* create entry for namespace name in names */
+ GNUNET_free_non_null (GNUNET_NS_nsid_to_name(ectx,
+ cfg,
+ nsid));
}
-static int
-readNamespaceInfo (struct GNUNET_GE_Context *ectx,
- struct GNUNET_GC_Configuration *cfg,
- const char *namespaceName,
- struct GNUNET_ECRS_MetaData **meta, int *ranking)
+int
+GNUNET_NS_internal_read_namespace_info_ (struct GNUNET_GE_Context *ectx,
+ struct GNUNET_GC_Configuration *cfg,
+ const GNUNET_HashCode * nsid,
+ struct GNUNET_ECRS_MetaData **meta,
+ int *ranking,
+ char ** ns_name)
{
unsigned long long len;
unsigned int size;
+ unsigned int zend;
char *buf;
char *fn;
- char *fnBase;
-
- *meta = NULL;
- GNUNET_GC_get_configuration_value_filename (cfg,
- "GNUNET",
- "GNUNET_HOME",
- GNUNET_DEFAULT_HOME_DIRECTORY,
- &fnBase);
- fn =
- GNUNET_malloc (strlen (fnBase) + strlen (NS_DIR) +
- strlen (namespaceName) + 6);
- strcpy (fn, fnBase);
- strcat (fn, DIR_SEPARATOR_STR);
- strcat (fn, NS_DIR);
- GNUNET_disk_directory_create (ectx, fn);
- strcat (fn, DIR_SEPARATOR_STR);
- strcat (fn, namespaceName);
- GNUNET_free (fnBase);
-
+
+ if (meta != NULL)
+ *meta = NULL;
+ if (ns_name != NULL)
+ *ns_name = NULL;
+ fn = GNUNET_NS_internal_get_data_filename_(ectx,
+ cfg,
+ NS_METADATA_DIR,
+ nsid,
+ NULL);
if ((GNUNET_OK != GNUNET_disk_file_test (ectx,
fn) ||
(GNUNET_OK != GNUNET_disk_file_size (ectx, fn, &len, GNUNET_YES))))
@@ -150,7 +120,7 @@
GNUNET_free (fn);
return GNUNET_SYSERR;
}
- if (len <= sizeof (int))
+ if (len <= sizeof (int) + 1)
{
GNUNET_free (fn);
return GNUNET_SYSERR;
@@ -170,26 +140,101 @@
GNUNET_free (fn);
return GNUNET_SYSERR;
}
-
- size = len - sizeof (int);
- *ranking = ntohl (((int *) buf)[0]);
- *meta = GNUNET_ECRS_meta_data_deserialize (ectx, &buf[sizeof (int)], size);
- if ((*meta) == NULL)
+ if (ranking != NULL)
+ *ranking = ntohl (((int *) buf)[0]);
+ zend = sizeof(int);
+ while ( (zend < len) &&
+ (buf[zend] != '\0') )
+ zend++;
+ if (zend == len)
{
- /* invalid data! remove! */
- GNUNET_GE_BREAK (ectx, 0);
- UNLINK (fn);
GNUNET_free (buf);
GNUNET_free (fn);
return GNUNET_SYSERR;
}
+ if (ns_name != NULL)
+ {
+ if (zend != sizeof(int))
+ *ns_name = GNUNET_strdup(&buf[sizeof(int)]);
+ else
+ *ns_name = NULL;
+ }
+ zend++;
+ size = len - zend;
+ if (meta != NULL)
+ {
+ *meta = GNUNET_ECRS_meta_data_deserialize (ectx, &buf[zend], size);
+ if ((*meta) == NULL)
+ {
+ /* invalid data! remove! */
+ GNUNET_GE_BREAK (ectx, 0);
+ UNLINK (fn);
+ GNUNET_free (buf);
+ GNUNET_free (fn);
+ return GNUNET_SYSERR;
+ }
+ }
GNUNET_free (fn);
GNUNET_free (buf);
return GNUNET_OK;
}
+struct ListNamespaceClosure
+{
+ GNUNET_NS_NamespaceIterator iterator;
+ void *closure;
+ struct GNUNET_GE_Context *ectx;
+ struct GNUNET_GC_Configuration *cfg;
+};
+static int
+list_namespace_helper (const char *fn, const char *dirName, void *cls)
+{
+ struct ListNamespaceClosure *c = cls;
+ int ret;
+ GNUNET_HashCode id;
+ char * name;
+ int rating;
+ struct GNUNET_ECRS_MetaData *meta;
+
+ ret = GNUNET_OK;
+ if (GNUNET_OK != GNUNET_enc_to_hash (fn, &id))
+ return GNUNET_OK; /* invalid name */
+ if (GNUNET_OK != GNUNET_NS_internal_read_namespace_info_ (c->ectx, c->cfg,
&id, &meta, &rating, NULL))
+ return GNUNET_OK; /* ignore entry */
+ name = GNUNET_NS_nsid_to_name(c->ectx, c->cfg, &id);
+ if (c->iterator != NULL)
+ ret = c->iterator (c->closure, name, &id, meta, rating);
+ GNUNET_free_non_null(name);
+ GNUNET_ECRS_meta_data_destroy (meta);
+ return ret;
+}
+
/**
+ * List all available namespaces.
+ */
+int
+GNUNET_NS_namespace_list_all (struct GNUNET_GE_Context *ectx,
+ struct GNUNET_GC_Configuration *cfg,
+ GNUNET_NS_NamespaceIterator iterator,
+ void *closure)
+{
+ struct ListNamespaceClosure cls;
+ char *fn;
+ int ret;
+
+ cls.iterator = iterator;
+ cls.closure = closure;
+ cls.ectx = ectx;
+ cls.cfg = cfg;
+ fn = GNUNET_NS_internal_get_data_filename_(ectx, cfg, NS_METADATA_DIR, NULL,
NULL);
+ GNUNET_disk_directory_create (ectx, fn);
+ ret = GNUNET_disk_directory_scan (ectx, fn, &list_namespace_helper, &cls);
+ GNUNET_free (fn);
+ return ret;
+}
+
+/**
* Create a new namespace (and publish an advertismement).
* This function is synchronous, but may block the system
* for a while since it must create a public-private key pair!
@@ -209,6 +254,7 @@
const GNUNET_HashCode * rootEntry)
{
struct GNUNET_ECRS_URI *ret;
+ GNUNET_HashCode id;
ret = GNUNET_ECRS_namespace_create (ectx,
cfg,
@@ -218,23 +264,16 @@
insertPriority,
insertExpiration, advertisementURI,
rootEntry);
- /* store binding of namespaceName to 'meta' in state DB! */
if (ret != NULL)
{
- GNUNET_HashCode id;
- char *name;
-
GNUNET_NS_namespace_set_root (ectx, cfg, ret);
GNUNET_ECRS_uri_get_namespace_from_sks (ret, &id);
- name = GNUNET_ECRS_get_namespace_name (&id);
- writeNamespaceInfo (ectx, cfg, name, meta, 0);
- internal_notify (namespaceName, &id, meta, 0);
- GNUNET_free (name);
+ write_namespace_info (ectx, cfg, &id, meta, 0, namespaceName);
+ GNUNET_NS_internal_notify_ (namespaceName, &id, meta, 0);
}
return ret;
}
-
/**
* Delete a local namespace.
*
@@ -243,654 +282,71 @@
int
GNUNET_NS_namespace_delete (struct GNUNET_GE_Context *ectx,
struct GNUNET_GC_Configuration *cfg,
- const char *namespaceName)
+ const GNUNET_HashCode * nsid)
{
int ret;
- char *tmp;
+ char *ns_name;
char *fn;
- ret = GNUNET_ECRS_namespace_delete (ectx, cfg, namespaceName);
- GNUNET_GC_get_configuration_value_filename (cfg,
- "GNUNET",
- "GNUNET_HOME",
- GNUNET_DEFAULT_HOME_DIRECTORY,
- &tmp);
- fn =
- GNUNET_malloc (strlen (tmp) + strlen (NS_UPDATE_DIR) +
- strlen (namespaceName) + 20);
- strcpy (fn, tmp);
- GNUNET_free (tmp);
- strcat (fn, DIR_SEPARATOR_STR);
- strcat (fn, NS_UPDATE_DIR);
- strcat (fn, namespaceName);
- strcat (fn, DIR_SEPARATOR_STR);
+ if (GNUNET_OK != GNUNET_NS_internal_read_namespace_info_(ectx,
+ cfg,
+ nsid,
+ NULL,
+ NULL,
+ &ns_name))
+ return GNUNET_SYSERR;
+ if (ns_name == NULL)
+ return GNUNET_SYSERR;
+ ret = GNUNET_ECRS_namespace_delete (ectx, cfg, ns_name);
+ GNUNET_free(ns_name);
+ fn = GNUNET_NS_internal_get_data_filename_(ectx,
+ cfg,
+ NS_UPDATE_DIR,
+ nsid,
+ NULL);
GNUNET_disk_directory_remove (ectx, fn);
GNUNET_free (fn);
return ret;
}
-
-
/**
- * Change the ranking of a (non-local) namespace.
+ * Change the ranking of a namespace.
*
- * @param ns the name of the namespace, as obtained
- * from GNUNET_ECRS_get_namespace_name
+ * @param nsid id of the namespace
* @param delta by how much should the rating be
* changed?
* @return new rating of the namespace
*/
int
GNUNET_NS_namespace_rank (struct GNUNET_GE_Context *ectx,
- struct GNUNET_GC_Configuration *cfg, const char *ns,
+ struct GNUNET_GC_Configuration *cfg,
+ const GNUNET_HashCode *nsid,
int delta)
{
struct GNUNET_ECRS_MetaData *meta;
int ret;
int ranking;
+ char * name;
- ret = readNamespaceInfo (ectx, cfg, ns, &meta, &ranking);
+ ret = GNUNET_NS_internal_read_namespace_info_ (ectx, cfg, nsid, &meta,
&ranking, &name);
if (ret == GNUNET_SYSERR)
{
ranking = 0;
meta = GNUNET_ECRS_meta_data_create ();
}
ranking += delta;
- writeNamespaceInfo (ectx, cfg, ns, meta, ranking);
+ write_namespace_info (ectx, cfg, nsid, meta, ranking, name);
GNUNET_ECRS_meta_data_destroy (meta);
+ GNUNET_free(name);
return ranking;
}
-typedef struct
-{
- GNUNET_NS_NamespaceIterator iterator;
- void *closure;
- struct GNUNET_GE_Context *ectx;
- struct GNUNET_GC_Configuration *cfg;
-} LNClosure;
-
-static int
-localListNamespaceHelper (const GNUNET_HashCode * nsid,
- const char *name, void *cls)
-{
- LNClosure *c = cls;
- int ret;
- struct GNUNET_ECRS_MetaData *meta;
- int rating;
-
- meta = NULL;
- rating = 0;
- readNamespaceInfo (c->ectx, c->cfg, name, &meta, &rating);
- if (meta == NULL)
- meta = GNUNET_ECRS_meta_data_create ();
- if (c->iterator != NULL)
- {
- ret = c->iterator (c->closure, name, nsid, meta, rating);
- }
- else
- ret = GNUNET_OK;
- GNUNET_ECRS_meta_data_destroy (meta);
- return ret;
-}
-
-static int
-listNamespaceHelper (const char *fn, const char *dirName, void *cls)
-{
- LNClosure *c = cls;
- int ret;
- struct GNUNET_ECRS_MetaData *meta;
- int rating;
- GNUNET_HashCode id;
-
- if (GNUNET_OK != GNUNET_enc_to_hash (fn, &id))
- return GNUNET_OK; /* invalid name */
- if (GNUNET_OK != readNamespaceInfo (c->ectx, c->cfg, fn, &meta, &rating))
- return GNUNET_OK; /* ignore entry */
- if (c->iterator != NULL)
- {
- ret = c->iterator (c->closure, fn, &id, meta, rating);
- }
- else
- ret = GNUNET_OK;
- GNUNET_ECRS_meta_data_destroy (meta);
- return GNUNET_OK;
-}
-
/**
- * List all available (local and non-local) namespaces.
- *
+ * Insert metadata into existing MD record (passed as cls).
*/
-int
-GNUNET_NS_namespace_list_all (struct GNUNET_GE_Context *ectx,
- struct GNUNET_GC_Configuration *cfg,
- GNUNET_NS_NamespaceIterator iterator,
- void *closure)
-{
- LNClosure cls;
- char *fn;
- char *fnBase;
- int ret1;
- int ret2;
-
- cls.iterator = iterator;
- cls.closure = closure;
- cls.ectx = ectx;
- cls.cfg = cfg;
- ret1 =
- GNUNET_ECRS_get_namespaces (ectx, cfg, &localListNamespaceHelper, &cls);
- if (ret1 == -1)
- return ret1;
- GNUNET_GC_get_configuration_value_filename (cfg,
- "GNUNET",
- "GNUNET_HOME",
- GNUNET_DEFAULT_HOME_DIRECTORY,
- &fnBase);
- fn = GNUNET_malloc (strlen (fnBase) + strlen (NS_DIR) + 4);
- strcpy (fn, fnBase);
- GNUNET_free (fnBase);
- strcat (fn, DIR_SEPARATOR_STR);
- strcat (fn, NS_DIR);
- GNUNET_disk_directory_create (ectx, fn);
- ret2 = GNUNET_disk_directory_scan (ectx, fn, &listNamespaceHelper, &cls);
- GNUNET_free (fn);
- if (ret2 == -1)
- return ret2;
- return ret1 + ret2;
-}
-
-/**
- * Get the filename (or directory name) for the given
- * namespace and content identifier.
- * @param lastId maybe NULL
- */
-static char *
-getUpdateDataFilename (struct GNUNET_GE_Context *ectx,
- struct GNUNET_GC_Configuration *cfg,
- const char *nsname, const GNUNET_HashCode * lastId)
-{
- char *tmp;
- char *ret;
-
- GNUNET_GC_get_configuration_value_filename (cfg,
- "GNUNET",
- "GNUNET_HOME",
- GNUNET_DEFAULT_HOME_DIRECTORY,
- &tmp);
- ret =
- GNUNET_malloc (strlen (tmp) + strlen (NS_UPDATE_DIR) + strlen (nsname) +
- sizeof (GNUNET_EncName) + 20);
- strcpy (ret, tmp);
- GNUNET_free (tmp);
- strcat (ret, DIR_SEPARATOR_STR);
- strcat (ret, NS_UPDATE_DIR);
- strcat (ret, nsname);
- strcat (ret, DIR_SEPARATOR_STR);
- GNUNET_disk_directory_create (ectx, ret);
- if (lastId != NULL)
- {
- GNUNET_EncName enc;
-
- GNUNET_hash_to_enc (lastId, &enc);
- strcat (ret, (char *) &enc);
- }
- return ret;
-}
-
-struct UpdateData
-{
- GNUNET_Int32Time updateInterval;
- GNUNET_Int32Time lastPubTime;
- GNUNET_HashCode nextId;
- GNUNET_HashCode thisId;
-};
-
-/**
- * Read content update information about content
- * published in the given namespace under 'lastId'.
- *
- * @param fi maybe NULL
- * @return GNUNET_OK if update data was found, GNUNET_SYSERR if not.
- */
static int
-readUpdateData (struct GNUNET_GE_Context *ectx,
- struct GNUNET_GC_Configuration *cfg,
- const char *nsname,
- const GNUNET_HashCode * lastId,
- GNUNET_HashCode * nextId,
- GNUNET_ECRS_FileInfo * fi,
- GNUNET_Int32Time * updateInterval,
- GNUNET_Int32Time * lastPubTime)
+merge_meta_helper (EXTRACTOR_KeywordType type, const char *data, void *cls)
{
- char *fn;
- struct UpdateData *buf;
- char *uri;
- unsigned long long size;
- size_t pos;
-
- fn = getUpdateDataFilename (ectx, cfg, nsname, lastId);
- if (GNUNET_OK != GNUNET_disk_file_size (ectx, fn, &size, GNUNET_YES))
- {
- GNUNET_free (fn);
- return GNUNET_SYSERR;
- }
- if ((size == 0) ||
- (size <= sizeof (struct UpdateData)) || (size > 1024 * 1024 * 16))
- {
- GNUNET_free (fn);
- return GNUNET_SYSERR;
- }
-
- buf = GNUNET_malloc (size);
- if (size != GNUNET_disk_file_read (ectx, fn, size, buf))
- {
- GNUNET_free (buf);
- GNUNET_free (fn);
- return GNUNET_SYSERR;
- }
- GNUNET_free (fn);
- if (0 != memcmp (lastId, &buf->thisId, sizeof (GNUNET_HashCode)))
- {
- GNUNET_free (buf);
- return GNUNET_SYSERR;
- }
- uri = (char *) &buf[1];
- size -= sizeof (struct UpdateData);
- pos = 0;
- while ((pos < size) && (uri[pos] != '\0'))
- pos++;
- pos++;
- size -= pos;
- if (size == 0)
- {
- GNUNET_free (buf);
- GNUNET_GE_BREAK (ectx, 0);
- return GNUNET_SYSERR;
- }
- if (fi != NULL)
- {
- fi->meta = GNUNET_ECRS_meta_data_deserialize (ectx, &uri[pos], size);
- if (fi->meta == NULL)
- {
- GNUNET_free (buf);
- GNUNET_GE_BREAK (ectx, 0);
- return GNUNET_SYSERR;
- }
- fi->uri = GNUNET_ECRS_string_to_uri (ectx, uri);
- if (fi->uri == NULL)
- {
- GNUNET_ECRS_meta_data_destroy (fi->meta);
- fi->meta = NULL;
- GNUNET_free (buf);
- GNUNET_GE_BREAK (ectx, 0);
- return GNUNET_SYSERR;
- }
- }
- if (updateInterval != NULL)
- *updateInterval = ntohl (buf->updateInterval);
- if (lastPubTime != NULL)
- *lastPubTime = ntohl (buf->lastPubTime);
- if (nextId != NULL)
- *nextId = buf->nextId;
- GNUNET_free (buf);
- return GNUNET_OK;
-}
-
-/**
- * Write content update information.
- */
-static int
-writeUpdateData (struct GNUNET_GE_Context *ectx,
- struct GNUNET_GC_Configuration *cfg,
- const char *nsname,
- const GNUNET_HashCode * thisId,
- const GNUNET_HashCode * nextId,
- const GNUNET_ECRS_FileInfo * fi,
- const GNUNET_Int32Time updateInterval,
- const GNUNET_Int32Time lastPubTime)
-{
- char *fn;
- char *uri;
- size_t metaSize;
- size_t size;
- struct UpdateData *buf;
-
- uri = GNUNET_ECRS_uri_to_string (fi->uri);
- metaSize =
- GNUNET_ECRS_meta_data_get_serialized_size (fi->meta,
- GNUNET_ECRS_SERIALIZE_FULL);
- size = sizeof (struct UpdateData) + metaSize + strlen (uri) + 1;
- buf = GNUNET_malloc (size);
- buf->nextId = *nextId;
- buf->thisId = *thisId;
- buf->updateInterval = htonl (updateInterval);
- buf->lastPubTime = htonl (lastPubTime);
- memcpy (&buf[1], uri, strlen (uri) + 1);
- GNUNET_GE_ASSERT (ectx,
- metaSize ==
- GNUNET_ECRS_meta_data_serialize (ectx,
- fi->meta,
- &((char *)
- &buf[1])[strlen (uri) +
- 1], metaSize,
-
GNUNET_ECRS_SERIALIZE_FULL));
- GNUNET_free (uri);
- fn = getUpdateDataFilename (ectx, cfg, nsname, thisId);
- GNUNET_disk_file_write (ectx, fn, buf, size, "400"); /* no editing, just
deletion */
- GNUNET_free (fn);
- GNUNET_free (buf);
- return GNUNET_OK;
-}
-
-
-/**
- * Compute the next ID for peridodically updated content.
- * @param updateInterval MUST be a peridic interval (not NONE or SPORADIC)
- * @param thisId MUST be known to NAMESPACE
- * @return GNUNET_OK on success, GNUNET_SYSERR on error
- */
-int
-GNUNET_NS_compute_next_identifier (struct GNUNET_GE_Context *ectx,
- struct GNUNET_GC_Configuration *cfg,
- const char *name,
- const GNUNET_HashCode * lastId,
- const GNUNET_HashCode * thisId,
- GNUNET_Int32Time updateInterval,
- GNUNET_HashCode * nextId)
-{
- GNUNET_HashCode delta;
- GNUNET_CronTime now;
- GNUNET_Int32Time tnow;
- GNUNET_Int32Time lastTime;
- GNUNET_Int32Time ui;
-
- if ((updateInterval == GNUNET_ECRS_SBLOCK_UPDATE_SPORADIC) ||
- (updateInterval == GNUNET_ECRS_SBLOCK_UPDATE_NONE))
- return GNUNET_SYSERR;
-
- if (GNUNET_OK != readUpdateData (ectx,
- cfg, name, lastId, NULL, NULL, &ui,
- &lastTime))
- return GNUNET_SYSERR;
- GNUNET_hash_difference (lastId, thisId, &delta);
- now = GNUNET_get_time ();
- GNUNET_get_time_int32 (&tnow);
- *nextId = *thisId;
- while (lastTime < tnow + updateInterval / 2)
- {
- lastTime += updateInterval;
- GNUNET_hash_sum (nextId, &delta, nextId);
- }
- return GNUNET_OK;
-}
-
-
-/**
- * Add an entry into a namespace (also for publishing
- * updates).
- *
- * @param name in which namespace to publish
- * @param updateInterval the desired frequency for updates
- * @param lastId the ID of the last value (maybe NULL)
- * @param thisId the ID of the update (maybe NULL)
- * @param nextId the ID of the next update (maybe NULL)
- * @param dst to which URI should the namespace entry refer?
- * @param md what meta-data should be associated with the
- * entry?
- * @param uri set to the resulting URI
- */
-struct GNUNET_ECRS_URI *
-GNUNET_NS_add_to_namespace (struct GNUNET_GE_Context *ectx,
- struct GNUNET_GC_Configuration *cfg,
- unsigned int anonymityLevel,
- unsigned int insertPriority,
- GNUNET_CronTime insertExpiration,
- const char *name,
- GNUNET_Int32Time updateInterval,
- const GNUNET_HashCode * lastId,
- const GNUNET_HashCode * thisId,
- const GNUNET_HashCode * nextId,
- const struct GNUNET_ECRS_URI *dst,
- const struct GNUNET_ECRS_MetaData *md)
-{
- GNUNET_Int32Time creationTime;
- GNUNET_HashCode nid;
- GNUNET_HashCode tid;
- GNUNET_Int32Time now;
- GNUNET_Int32Time lastTime;
- GNUNET_Int32Time lastInterval;
- GNUNET_ECRS_FileInfo fi;
- char *old;
- struct GNUNET_ECRS_URI *uri;
-
- /* computation of IDs of update(s). Not as terrible as
- it looks, just enumerating all of the possible cases
- of periodic/sporadic updates and how IDs are computed. */
- creationTime = GNUNET_get_time_int32 (&now);
- if (updateInterval != GNUNET_ECRS_SBLOCK_UPDATE_NONE)
- {
- if ((lastId != NULL) &&
- (GNUNET_OK == readUpdateData (ectx,
- cfg,
- name,
- lastId,
- &tid, NULL, &lastInterval,
- &lastTime)))
- {
- if (lastInterval != updateInterval)
- {
- GNUNET_GE_LOG (ectx,
- GNUNET_GE_WARNING | GNUNET_GE_BULK |
- GNUNET_GE_USER,
- _
- ("Publication interval for periodic publication
changed."));
- }
- /* try to compute tid and/or
- nid based on information read from lastId */
-
- if (updateInterval != GNUNET_ECRS_SBLOCK_UPDATE_SPORADIC)
- {
- GNUNET_HashCode delta;
-
- GNUNET_hash_difference (lastId, &tid, &delta);
-
- creationTime = lastTime + updateInterval;
- while (creationTime < now - updateInterval)
- {
- creationTime += updateInterval;
- GNUNET_hash_sum (&tid, &delta, &tid);
- }
- if (creationTime > GNUNET_get_time () + 7 * GNUNET_CRON_DAYS)
- {
- GNUNET_GE_LOG (ectx,
- GNUNET_GE_WARNING | GNUNET_GE_BULK |
- GNUNET_GE_USER,
- _
- ("Publishing update for periodically updated "
- "content more than a week ahead of
schedule.\n"));
- }
- if (thisId != NULL)
- tid = *thisId; /* allow override! */
- GNUNET_hash_sum (&tid, &delta, &nid);
- if (nextId != NULL)
- nid = *nextId; /* again, allow override */
- }
- else
- {
- /* sporadic ones are unpredictable,
- tid has been obtained from IO, pick random nid if
- not specified */
- if (thisId != NULL)
- tid = *thisId; /* allow user override */
- if (nextId == NULL)
- {
- GNUNET_create_random_hash (&nid);
- }
- else
- {
- nid = *nextId;
- }
- }
- }
- else
- { /* no previous ID found or given */
- if (nextId == NULL)
- {
- /* no previous block found and nextId not specified;
- pick random nid */
- GNUNET_create_random_hash (&nid);
- }
- else
- {
- nid = *nextId;
- }
- if (thisId != NULL)
- {
- tid = *thisId;
- }
- else
- {
- GNUNET_create_random_hash (&tid);
- }
- }
- }
- else
- {
- if (thisId != NULL)
- {
- nid = tid = *thisId;
- }
- else
- {
- GNUNET_create_random_hash (&tid);
- nid = tid;
- }
- }
- uri = GNUNET_ECRS_namespace_add_content (ectx,
- cfg,
- name,
- anonymityLevel,
- insertPriority,
- insertExpiration,
- creationTime,
- updateInterval, &tid, &nid, dst,
- md);
- if ((uri != NULL) && (dst != NULL))
- {
- fi.uri = GNUNET_ECRS_uri_duplicate (dst);
- fi.meta = (struct GNUNET_ECRS_MetaData *) md;
- writeUpdateData (ectx,
- cfg,
- name, &tid, &nid, &fi, updateInterval, creationTime);
- GNUNET_ECRS_uri_destroy (fi.uri);
- if (lastId != NULL)
- {
- old = getUpdateDataFilename (ectx, cfg, name, lastId);
- UNLINK (old);
- GNUNET_free (old);
- }
- }
- return uri;
-}
-
-struct lNCC
-{
- const char *name;
- GNUNET_NS_UpdateIterator it;
- void *closure;
- int cnt;
- struct GNUNET_GE_Context *ectx;
- struct GNUNET_GC_Configuration *cfg;
-};
-
-static int
-lNCHelper (const char *fil, const char *dir, void *ptr)
-{
- struct lNCC *cls = ptr;
- GNUNET_ECRS_FileInfo fi;
- GNUNET_HashCode lastId;
- GNUNET_HashCode nextId;
- GNUNET_Int32Time pubFreq;
- GNUNET_Int32Time lastTime;
- GNUNET_Int32Time nextTime;
- GNUNET_Int32Time now;
-
- if (GNUNET_OK != GNUNET_enc_to_hash (fil, &lastId))
- {
- GNUNET_GE_BREAK (cls->ectx, 0);
- return GNUNET_OK;
- }
- fi.uri = NULL;
- fi.meta = NULL;
- if (GNUNET_OK != readUpdateData (cls->ectx,
- cls->cfg,
- cls->name,
- &lastId, &nextId, &fi, &pubFreq,
- &lastTime))
- {
- GNUNET_GE_BREAK (cls->ectx, 0);
- return GNUNET_OK;
- }
- cls->cnt++;
- if (pubFreq == GNUNET_ECRS_SBLOCK_UPDATE_SPORADIC)
- {
- nextTime = 0;
- }
- else
- {
- GNUNET_get_time_int32 (&now);
- nextTime = lastTime;
- if ((nextTime + pubFreq < now) && (nextTime + pubFreq > nextTime))
- nextTime += pubFreq * ((now - nextTime) / pubFreq);
- }
- if (cls->it != NULL)
- {
- if (GNUNET_OK != cls->it (cls->closure,
- &fi, &lastId, &nextId, pubFreq, nextTime))
- {
- GNUNET_ECRS_uri_destroy (fi.uri);
- GNUNET_ECRS_meta_data_destroy (fi.meta);
- return GNUNET_SYSERR;
- }
- }
- GNUNET_ECRS_uri_destroy (fi.uri);
- GNUNET_ECRS_meta_data_destroy (fi.meta);
- return GNUNET_OK;
-}
-
-/**
- * List all updateable content in a given namespace.
- */
-int
-GNUNET_NS_namespace_list_contents (struct GNUNET_GE_Context *ectx,
- struct GNUNET_GC_Configuration *cfg,
- const char *name,
- GNUNET_NS_UpdateIterator iterator,
- void *closure)
-{
- struct lNCC cls;
- char *dirName;
-
- cls.name = name;
- cls.it = iterator;
- cls.closure = closure;
- cls.cnt = 0;
- cls.ectx = ectx;
- cls.cfg = cfg;
- dirName = getUpdateDataFilename (ectx, cfg, name, NULL);
- GNUNET_disk_directory_create (ectx, dirName);
- if (GNUNET_SYSERR ==
- GNUNET_disk_directory_scan (ectx, dirName, &lNCHelper, &cls))
- {
- GNUNET_free (dirName);
- return GNUNET_SYSERR;
- }
- GNUNET_free (dirName);
- return cls.cnt;
-}
-
-static int
-mergeMeta (EXTRACTOR_KeywordType type, const char *data, void *cls)
-{
struct GNUNET_ECRS_MetaData *meta = cls;
GNUNET_ECRS_meta_data_insert (meta, type, data);
return GNUNET_OK;
@@ -899,7 +355,7 @@
/**
* Add a namespace to the set of known namespaces.
* For all namespace advertisements that we discover
- * NAMESPACE should automatically call this function.
+ * FSUI should automatically call this function.
*
* @param ns the namespace identifier
*/
@@ -920,168 +376,20 @@
return;
}
GNUNET_ECRS_uri_get_namespace_from_sks (uri, &id);
- name = GNUNET_ECRS_get_namespace_name (&id);
- if (name == NULL)
- {
- GNUNET_GE_BREAK (ectx, 0);
- return;
- }
ranking = 0;
- if (GNUNET_OK == readNamespaceInfo (ectx, cfg, name, &old, &ranking))
+ if (GNUNET_OK == GNUNET_NS_internal_read_namespace_info_ (ectx, cfg, &id,
&old, &ranking, &name))
{
- GNUNET_ECRS_meta_data_get_contents (meta, &mergeMeta, old);
- writeNamespaceInfo (ectx, cfg, name, old, ranking);
+ GNUNET_ECRS_meta_data_get_contents (meta, &merge_meta_helper, old);
+ write_namespace_info (ectx, cfg, &id, old, ranking, name);
GNUNET_ECRS_meta_data_destroy (old);
}
else
{
- writeNamespaceInfo (ectx, cfg, name, meta, ranking);
+ write_namespace_info (ectx, cfg, &id, meta, ranking, NULL);
}
- internal_notify (name, &id, meta, ranking);
- GNUNET_free (name);
+ GNUNET_NS_internal_notify_ (name, &id, meta, ranking);
+ GNUNET_free_non_null (name);
}
-/**
- * Get the root of the namespace (if we have one).
- * @return GNUNET_SYSERR on error, GNUNET_OK on success
- */
-int
-GNUNET_NS_namespace_get_root (struct GNUNET_GE_Context *ectx,
- struct GNUNET_GC_Configuration *cfg,
- const char *ns, GNUNET_HashCode * root)
-{
- char *fn;
- char *fnBase;
- int ret;
-
- GNUNET_GC_get_configuration_value_filename (cfg,
- "GNUNET",
- "GNUNET_HOME",
- GNUNET_DEFAULT_HOME_DIRECTORY,
- &fnBase);
- fn = GNUNET_malloc (strlen (fnBase) + strlen (NS_ROOTS) + strlen (ns) + 6);
- strcpy (fn, fnBase);
- strcat (fn, DIR_SEPARATOR_STR);
- strcat (fn, NS_ROOTS);
- GNUNET_disk_directory_create (ectx, fn);
- strcat (fn, DIR_SEPARATOR_STR);
- strcat (fn, ns);
- GNUNET_free (fnBase);
- if (sizeof (GNUNET_HashCode)
- == GNUNET_disk_file_read (ectx, fn, sizeof (GNUNET_HashCode), root))
- ret = GNUNET_OK;
- else
- ret = GNUNET_SYSERR;
- GNUNET_free (fn);
- return ret;
-}
-
-void
-GNUNET_NS_namespace_set_root (struct GNUNET_GE_Context *ectx,
- struct GNUNET_GC_Configuration *cfg,
- const struct GNUNET_ECRS_URI *uri)
-{
- char *fn;
- char *fnBase;
- GNUNET_HashCode ns;
- char *name;
-
- if (GNUNET_OK != GNUNET_ECRS_uri_get_namespace_from_sks (uri, &ns))
- {
- GNUNET_GE_BREAK (ectx, 0);
- return;
- }
- name = GNUNET_ECRS_get_namespace_name (&ns);
- GNUNET_GC_get_configuration_value_filename (cfg,
- "GNUNET",
- "GNUNET_HOME",
- GNUNET_DEFAULT_HOME_DIRECTORY,
- &fnBase);
- fn =
- GNUNET_malloc (strlen (fnBase) + strlen (NS_ROOTS) + strlen (name) + 6);
- strcpy (fn, fnBase);
- strcat (fn, DIR_SEPARATOR_STR);
- strcat (fn, NS_ROOTS);
- GNUNET_disk_directory_create (ectx, fn);
- strcat (fn, DIR_SEPARATOR_STR);
- strcat (fn, name);
- GNUNET_free (name);
- GNUNET_free (fnBase);
- if (GNUNET_OK == GNUNET_ECRS_uri_get_content_hash_from_sks (uri, &ns))
- {
- GNUNET_disk_file_write (ectx, fn, &ns, sizeof (GNUNET_HashCode), "644");
- }
- GNUNET_free (fn);
-}
-
-/**
- * Register callback to be invoked whenever we discover
- * a new namespace.
- */
-int
-GNUNET_NS_register_discovery_callback (struct GNUNET_GE_Context *ectx,
- struct GNUNET_GC_Configuration *cfg,
- GNUNET_NS_NamespaceIterator iterator,
- void *closure)
-{
- struct DiscoveryCallback *list;
-
- list = GNUNET_malloc (sizeof (struct DiscoveryCallback));
- list->callback = iterator;
- list->closure = closure;
- GNUNET_mutex_lock (lock);
- list->next = head;
- head = list;
- GNUNET_NS_namespace_list_all (ectx, cfg, iterator, closure);
- GNUNET_mutex_unlock (lock);
- return GNUNET_OK;
-}
-
-/**
- * Unregister namespace discovery callback.
- */
-int
-GNUNET_NS_unregister_discovery_callback (GNUNET_NS_NamespaceIterator iterator,
- void *closure)
-{
- struct DiscoveryCallback *prev;
- struct DiscoveryCallback *pos;
-
- prev = NULL;
- GNUNET_mutex_lock (lock);
- pos = head;
- while ((pos != NULL) &&
- ((pos->callback != iterator) || (pos->closure != closure)))
- {
- prev = pos;
- pos = pos->next;
- }
- if (pos == NULL)
- {
- GNUNET_mutex_unlock (lock);
- return GNUNET_SYSERR;
- }
- if (prev == NULL)
- head = pos->next;
- else
- prev->next = pos->next;
- GNUNET_free (pos);
- GNUNET_mutex_unlock (lock);
- return GNUNET_OK;
-}
-
-
-void __attribute__ ((constructor)) GNUNET_NS_ltdl_init ()
-{
- lock = GNUNET_mutex_create (GNUNET_NO);
-}
-
-void __attribute__ ((destructor)) GNUNET_NS_ltdl_fini ()
-{
- GNUNET_mutex_destroy (lock);
- lock = NULL;
-}
-
-
/* end of namespace_info.c */
Modified: GNUnet/src/applications/fs/namespace/namespace_infotest.c
===================================================================
--- GNUnet/src/applications/fs/namespace/namespace_infotest.c 2008-05-14
03:03:45 UTC (rev 6817)
+++ GNUnet/src/applications/fs/namespace/namespace_infotest.c 2008-05-14
03:33:08 UTC (rev 6818)
@@ -43,6 +43,7 @@
struct GNUNET_ECRS_URI *euri = NULL;
struct GNUNET_ECRS_MetaData *meta = NULL;
GNUNET_HashCode root;
+ GNUNET_HashCode nsid;
int old;
int newVal;
struct GNUNET_GC_Configuration *cfg;
@@ -60,7 +61,6 @@
GNUNET_wait_for_daemon_running (NULL, cfg,
30 * GNUNET_CRON_SECONDS));
ok = GNUNET_YES;
- GNUNET_NS_namespace_delete (ectx, cfg, "test");
GNUNET_thread_sleep (5 * GNUNET_CRON_SECONDS); /* give apps time to
start */
/* ACTUAL TEST CODE */
@@ -77,20 +77,21 @@
10 * GNUNET_CRON_MINUTES, "test", meta,
NULL, &root);
CHECK (uri != NULL);
+ GNUNET_ECRS_uri_get_namespace_from_sks(uri, &nsid);
newVal = GNUNET_NS_namespace_list_all (ectx, cfg, NULL, NULL);
CHECK (old < newVal);
- old = GNUNET_NS_namespace_list_contents (ectx, cfg, "test", NULL, NULL);
+ old = GNUNET_NS_namespace_list_contents (ectx, cfg, &nsid, NULL, NULL);
euri = GNUNET_NS_add_to_namespace (ectx,
cfg,
1,
1,
GNUNET_get_time () +
- 10 * GNUNET_CRON_MINUTES, "test", 42,
+ 10 * GNUNET_CRON_MINUTES, &nsid, 42,
NULL, &root, NULL, uri, meta);
CHECK (euri != NULL);
- newVal = GNUNET_NS_namespace_list_contents (ectx, cfg, "test", NULL, NULL);
+ newVal = GNUNET_NS_namespace_list_contents (ectx, cfg, &nsid, NULL, NULL);
CHECK (old < newVal);
- CHECK (GNUNET_OK == GNUNET_NS_namespace_delete (ectx, cfg, "test"));
+ CHECK (GNUNET_OK == GNUNET_NS_namespace_delete (ectx, cfg, &nsid));
/* END OF TEST CODE */
FAILURE:
if (uri != NULL)
Modified: GNUnet/src/applications/fs/tools/Makefile.am
===================================================================
--- GNUnet/src/applications/fs/tools/Makefile.am 2008-05-14 03:03:45 UTC
(rev 6817)
+++ GNUnet/src/applications/fs/tools/Makefile.am 2008-05-14 03:33:08 UTC
(rev 6818)
@@ -23,6 +23,14 @@
gnunet_insert_SOURCES = \
gnunet-insert.c
+gnunet_insert_LDADD = \
+ $(top_builddir)/src/applications/fs/namespace/libgnunetnamespace.la \
+ $(top_builddir)/src/applications/fs/uritrack/libgnuneturitrack.la \
+ $(top_builddir)/src/applications/fs/fsui/libgnunetfsui.la \
+ $(top_builddir)/src/applications/fs/ecrs/libgnunetecrs.la \
+ $(top_builddir)/src/util/libgnunetutil.la
+
+
gnunet_unindex_SOURCES = \
gnunet-unindex.c
Modified: GNUnet/src/applications/fs/tools/gnunet-insert.c
===================================================================
--- GNUnet/src/applications/fs/tools/gnunet-insert.c 2008-05-14 03:03:45 UTC
(rev 6817)
+++ GNUnet/src/applications/fs/tools/gnunet-insert.c 2008-05-14 03:33:08 UTC
(rev 6818)
@@ -110,6 +110,7 @@
GNUNET_HashCode prevId;
GNUNET_HashCode thisId;
GNUNET_HashCode nextId;
+ GNUNET_HashCode nsid;
struct GNUNET_ECRS_URI *nsuri;
char *us;
@@ -118,12 +119,18 @@
convertId (next_id, &nextId);
convertId (this_id, &thisId);
convertId (prev_id, &prevId);
+ if (GNUNET_OK !=
+ GNUNET_NS_name_to_nsid(ectx, cfg, pseudonym, &nsid))
+ {
+ printf (_("\tUnknown namespace `%s'\n"), pseudonym);
+ return;
+ }
nsuri = GNUNET_NS_add_to_namespace (ectx,
cfg,
anonymity,
priority,
GNUNET_get_time () +
- 2 * GNUNET_CRON_YEARS, pseudonym,
+ 2 * GNUNET_CRON_YEARS, &nsid,
(GNUNET_Int32Time) interval,
prev_id == NULL ? NULL : &prevId,
this_id == NULL ? NULL : &thisId,
Modified: GNUnet/src/applications/fs/tools/gnunet-pseudonym.c
===================================================================
--- GNUnet/src/applications/fs/tools/gnunet-pseudonym.c 2008-05-14 03:03:45 UTC
(rev 6817)
+++ GNUnet/src/applications/fs/tools/gnunet-pseudonym.c 2008-05-14 03:33:08 UTC
(rev 6818)
@@ -132,6 +132,7 @@
const struct GNUNET_ECRS_MetaData *md, int rating)
{
GNUNET_EncName enc;
+ GNUNET_HashCode nsid;
int cpos;
GNUNET_hash_to_enc (id, &enc);
@@ -166,8 +167,16 @@
if (delta != 0)
{
- rating = GNUNET_NS_namespace_rank (ectx, cfg, namespaceName, delta);
- printf (_("\tRating (after update): %d\n"), rating);
+ if (GNUNET_OK ==
+ GNUNET_NS_name_to_nsid(ectx, cfg, namespaceName, &nsid))
+ {
+ rating = GNUNET_NS_namespace_rank (ectx, cfg, &nsid, delta);
+ printf (_("\tRating (after update): %d\n"), rating);
+ }
+ else
+ {
+ printf (_("\tUnknown namespace `%s'\n"), namespaceName);
+ }
}
}
printf ("\n");
@@ -181,6 +190,7 @@
int success;
int i;
GNUNET_HashCode hc;
+ GNUNET_HashCode nsid;
meta = GNUNET_ECRS_meta_data_create ();
i = GNUNET_init (argc,
@@ -208,16 +218,24 @@
/* delete pseudonyms */
if (delete_name != NULL)
{
- if (GNUNET_OK == GNUNET_NS_namespace_delete (ectx, cfg, delete_name))
- {
- printf (_("Pseudonym `%s' deleted.\n"), delete_name);
- }
+ if (GNUNET_OK ==
+ GNUNET_NS_name_to_nsid(ectx, cfg, delete_name, &nsid))
+ {
+ if (GNUNET_OK == GNUNET_NS_namespace_delete (ectx, cfg, &nsid))
+ {
+ printf (_("Pseudonym `%s' deleted.\n"), delete_name);
+ }
+ else
+ {
+ success += 2;
+ printf (_("Error deleting pseudonym `%s' (does not exist?).\n"),
+ delete_name);
+ }
+ }
else
- {
- success += 2;
- printf (_("Error deleting pseudonym `%s' (does not exist?).\n"),
- delete_name);
- }
+ {
+ printf (_("\tUnknown namespace `%s'\n"), delete_name);
+ }
GNUNET_free (delete_name);
}
Modified: GNUnet/src/include/gnunet_ecrs_lib.h
===================================================================
--- GNUnet/src/include/gnunet_ecrs_lib.h 2008-05-14 03:03:45 UTC (rev
6817)
+++ GNUnet/src/include/gnunet_ecrs_lib.h 2008-05-14 03:33:08 UTC (rev
6818)
@@ -278,6 +278,12 @@
char *GNUNET_ECRS_uri_to_string (const struct GNUNET_ECRS_URI *uri);
/**
+ * Convert keyword URI to a human readable format
+ * (i.e. the search query that was used in the first place)
+ */
+char *GNUNET_ECRS_ksk_uri_to_human_readable_string (const struct
GNUNET_ECRS_URI *uri);
+
+/**
* Convert a UTF-8 String to a URI.
*/
struct GNUNET_ECRS_URI *GNUNET_ECRS_string_to_uri (struct GNUNET_GE_Context
@@ -430,15 +436,6 @@
int GNUNET_ECRS_uri_test_sks (const struct GNUNET_ECRS_URI *uri);
/**
- * Get the (globally unique) name for the given
- * namespace.
- *
- * @return the name (GNUNET_hash) of the namespace, caller
- * must free it.
- */
-char *GNUNET_ECRS_get_namespace_name (const GNUNET_HashCode * nsid);
-
-/**
* Get the ID of a namespace from the given
* namespace URI.
*/
Modified: GNUnet/src/include/gnunet_namespace_lib.h
===================================================================
--- GNUnet/src/include/gnunet_namespace_lib.h 2008-05-14 03:03:45 UTC (rev
6817)
+++ GNUnet/src/include/gnunet_namespace_lib.h 2008-05-14 03:33:08 UTC (rev
6818)
@@ -1,6 +1,6 @@
/*
This file is part of GNUnet
- (C) 2004, 2005, 2006 Christian Grothoff (and other contributing authors)
+ (C) 2004, 2005, 2006, 2008 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
@@ -45,8 +45,7 @@
*/
typedef int (*GNUNET_NS_NamespaceIterator) (void *cls,
const char *namespaceName,
- const GNUNET_HashCode *
- namespaceId,
+ const GNUNET_HashCode *
namespaceId,
const struct GNUNET_ECRS_MetaData
* md, int rating);
@@ -78,7 +77,16 @@
* @param meta meta-data about the namespace (maybe NULL)
* @return URI on success, NULL on error (namespace already exists)
*/
-struct GNUNET_ECRS_URI *GNUNET_NS_namespace_create (struct GNUNET_GE_Context
*ectx, struct GNUNET_GC_Configuration *cfg, unsigned int anonymityLevel,
unsigned int insertPriority, GNUNET_CronTime insertExpiration, const char
*namespaceName, const struct GNUNET_ECRS_MetaData *meta, const struct
GNUNET_ECRS_URI *advertisementURI, const GNUNET_HashCode * rootEntry); /*
namespace_info.c */
+struct GNUNET_ECRS_URI *
+GNUNET_NS_namespace_create (struct GNUNET_GE_Context *ectx,
+ struct GNUNET_GC_Configuration *cfg,
+ unsigned int anonymityLevel,
+ unsigned int insertPriority,
+ GNUNET_CronTime insertExpiration,
+ const char *namespaceName,
+ const struct GNUNET_ECRS_MetaData *meta,
+ const struct GNUNET_ECRS_URI *advertisementURI,
+ const GNUNET_HashCode * rootEntry); /*
namespace_info.c */
/**
* Delete a local namespace. Only prevents future insertions into the
@@ -86,18 +94,21 @@
*
* @return GNUNET_OK on success, GNUNET_SYSERR on error
*/
-int GNUNET_NS_namespace_delete (struct GNUNET_GE_Context *ectx, struct
GNUNET_GC_Configuration *cfg, const char *namespaceName); /* namespace.c
*/
+int GNUNET_NS_namespace_delete (struct GNUNET_GE_Context *ectx,
+ struct GNUNET_GC_Configuration *cfg,
+ const GNUNET_HashCode *nsid); /*
namespace.c */
/**
* Change the ranking of a (non-local) namespace.
*
- * @param ns the name of the namespace, as obtained
- * from GNUNET_ECRS_get_namespace_name
+ * @param nsid id of the namespace
* @param delta by how much should the rating be
* changed?
* @return new rating of the namespace
*/
-int GNUNET_NS_namespace_rank (struct GNUNET_GE_Context *ectx, struct
GNUNET_GC_Configuration *cfg, const char *ns, int delta); /* namespace_info.c
*/
+int GNUNET_NS_namespace_rank (struct GNUNET_GE_Context *ectx,
+ struct GNUNET_GC_Configuration *cfg,
+ const GNUNET_HashCode * nsid, int delta); /*
namespace_info.c */
/**
* Add a namespace to the set of known namespaces. For all namespace
@@ -119,7 +130,8 @@
*/
int GNUNET_NS_namespace_get_root (struct GNUNET_GE_Context *ectx,
struct GNUNET_GC_Configuration *cfg,
- const char *ns, GNUNET_HashCode * root);
+ const GNUNET_HashCode *nsid,
+ GNUNET_HashCode * root);
void GNUNET_NS_namespace_set_root (struct GNUNET_GE_Context *ectx,
struct GNUNET_GC_Configuration *cfg,
@@ -128,7 +140,10 @@
/**
* List all available (local or non-local) namespaces.
*/
-int GNUNET_NS_namespace_list_all (struct GNUNET_GE_Context *ectx, struct
GNUNET_GC_Configuration *cfg, GNUNET_NS_NamespaceIterator iterator, void
*closure); /* namespace_info.c */
+int GNUNET_NS_namespace_list_all (struct GNUNET_GE_Context *ectx,
+ struct GNUNET_GC_Configuration *cfg,
+ GNUNET_NS_NamespaceIterator iterator,
+ void *closure); /* namespace_info.c */
/**
* Register callback to be invoked whenever we discover
@@ -172,7 +187,7 @@
* </ul>
* And yes, reading the ECRS paper maybe a good idea.
*
- * @param name in which namespace to publish
+ * @param nsid in which namespace to publish
* @param updateInterval the desired frequency for updates
* @param lastId the ID of the last value (maybe NULL)
* set if this is an update to an existing entry
@@ -187,7 +202,19 @@
* entry?
* @return the resulting URI, NULL on error
*/
-struct GNUNET_ECRS_URI *GNUNET_NS_add_to_namespace (struct GNUNET_GE_Context
*ectx, struct GNUNET_GC_Configuration *cfg, unsigned int anonymityLevel,
unsigned int insertPriority, GNUNET_CronTime insertExpiration, const char
*name, GNUNET_Int32Time updateInterval, const GNUNET_HashCode * lastId, const
GNUNET_HashCode * thisId, const GNUNET_HashCode * nextId, const struct
GNUNET_ECRS_URI *dst, const struct GNUNET_ECRS_MetaData *md); /*
namespace_info.c */
+struct GNUNET_ECRS_URI *
+GNUNET_NS_add_to_namespace (struct GNUNET_GE_Context *ectx,
+ struct GNUNET_GC_Configuration *cfg,
+ unsigned int anonymityLevel,
+ unsigned int insertPriority,
+ GNUNET_CronTime insertExpiration,
+ const GNUNET_HashCode *nsid,
+ GNUNET_Int32Time updateInterval,
+ const GNUNET_HashCode * lastId,
+ const GNUNET_HashCode * thisId,
+ const GNUNET_HashCode * nextId,
+ const struct GNUNET_ECRS_URI *dst,
+ const struct GNUNET_ECRS_MetaData *md); /*
update_info.c */
/**
* Compute the next ID for peridodically updated content.
@@ -197,7 +224,7 @@
*/
int GNUNET_NS_compute_next_identifier (struct GNUNET_GE_Context *ectx,
struct GNUNET_GC_Configuration *cfg,
- const char *name,
+ const GNUNET_HashCode * nsid,
const GNUNET_HashCode * lastId,
const GNUNET_HashCode * thisId,
GNUNET_Int32Time updateInterval,
@@ -206,11 +233,42 @@
/**
* List all updateable content in a given namespace.
*/
-int GNUNET_NS_namespace_list_contents (struct GNUNET_GE_Context *ectx, struct
GNUNET_GC_Configuration *cfg, const char *name, GNUNET_NS_UpdateIterator
iterator, void *closure); /* namespace_info.c */
+int GNUNET_NS_namespace_list_contents (struct GNUNET_GE_Context *ectx,
+ struct GNUNET_GC_Configuration *cfg,
+ const GNUNET_HashCode * nsid,
+ GNUNET_NS_UpdateIterator iterator,
+ void *closure); /*
namespace_info.c */
+/**
+ * Return the unique, human readable name for the given namespace.
+ *
+ * @return NULL on failure (should never happen)
+ */
+char * GNUNET_NS_nsid_to_name(struct GNUNET_GE_Context *ectx,
+ struct GNUNET_GC_Configuration *cfg,
+ const GNUNET_HashCode * nsid);
+/**
+ * Get the namespace ID belonging to the given namespace name.
+ *
+ * @return GNUNET_OK on success
+ */
+int GNUNET_NS_name_to_nsid(struct GNUNET_GE_Context *ectx,
+ struct GNUNET_GC_Configuration *cfg,
+ const char * ns_uname,
+ GNUNET_HashCode * nsid);
+/**
+ * Convert namespace URI to a human readable format
+ * (using the namespace description, if available).
+ */
+char * GNUNET_NS_sks_uri_to_human_readable_string (struct GNUNET_GE_Context
*ectx,
+ struct
GNUNET_GC_Configuration *cfg,
+ const struct GNUNET_ECRS_URI
*uri);
+
+
+
#if 0 /* keep Emacsens' auto-indent happy */
{
#endif
Modified: GNUnet/todo
===================================================================
--- GNUnet/todo 2008-05-14 03:03:45 UTC (rev 6817)
+++ GNUnet/todo 2008-05-14 03:33:08 UTC (rev 6818)
@@ -4,6 +4,8 @@
RC == Release Critical
0.8.0 [5'08] (aka "new protocol"):
+- FS-APIs:
+ => improve gnunet-gtk to use new namespace APIs!
- test new asynchronous ECRS API (and resulting FSUI changes):
* make sure error handling & reporting are nice [RC]
(see also: #1338!)
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r6818 - in GNUnet: . src/applications/fs/ecrs src/applications/fs/namespace src/applications/fs/tools src/include,
gnunet <=