X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=src%2Ffs%2Ffs_namespace.c;h=5d52265b74c9c05916bb28053d9f33d9e5de0abf;hb=a7fbcf1c827ea25046c9f9e5c4e2a567eba72318;hp=7475896a876fda3800bf3bf8f2b043f0f8e9d6b9;hpb=cddbdf5b928c68ab71b40c950b9f01ea68a9fbdb;p=oweals%2Fgnunet.git

diff --git a/src/fs/fs_namespace.c b/src/fs/fs_namespace.c
index 7475896a8..5d52265b7 100644
--- a/src/fs/fs_namespace.c
+++ b/src/fs/fs_namespace.c
@@ -1,6 +1,6 @@
 /*
      This file is part of GNUnet
-     (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Christian Grothoff (and other contributing authors)
+     Copyright (C) 2003-2013 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
@@ -14,13 +14,14 @@
 
      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.
+     Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+     Boston, MA 02110-1301, USA.
 */
 
 /**
  * @file fs/fs_namespace.c
- * @brief create and destroy namespaces
+ * @brief publishing to namespaces, and tracking updateable entries
+ *        for our namespaces
  * @author Christian Grothoff
  */
 #include "platform.h"
@@ -28,70 +29,168 @@
 #include "gnunet_signatures.h"
 #include "gnunet_util_lib.h"
 #include "gnunet_fs_service.h"
-#include "fs.h"
+#include "fs_api.h"
+#include "fs_publish_ublock.h"
 
-#define DEBUG_NAMESPACE GNUNET_NO
 
 /**
- * Return the name of the directory in which we store
- * our local namespaces (or rather, their public keys).
- *
- * @param h global fs handle
- * @return NULL on error, otherwise the name of the directory
+ * Information about an (updateable) node in the
+ * namespace.
  */
-static char *
-get_namespace_directory (struct GNUNET_FS_Handle *h)
+struct NamespaceUpdateNode
 {
-  char *dn;
+  /**
+   * Identifier for this node.
+   */
+  char *id;
 
-  if (GNUNET_OK !=
-      GNUNET_CONFIGURATION_get_value_filename (h->cfg, "FS", "IDENTITY_DIR",
-                                               &dn))
-  {
-    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-                _("Configuration fails to specify `%s' in section `%s'\n"),
-                "IDENTITY_DIR", "fs");
-    return NULL;
-  }
-  return dn;
-}
+  /**
+   * Identifier of children of this node.
+   */
+  char *update;
+
+  /**
+   * Metadata for this entry.
+   */
+  struct GNUNET_CONTAINER_MetaData *md;
+
+  /**
+   * URI of this entry in the namespace.
+   */
+  struct GNUNET_FS_Uri *uri;
+
+  /**
+   * Namespace update generation ID.  Used to ensure
+   * freshness of the tree_id.
+   */
+  unsigned int nug;
+
+  /**
+   * TREE this entry belongs to (if nug is current).
+   */
+  unsigned int tree_id;
+
+};
+
+
+/**
+ * Handle to update information for a namespace.
+ */
+struct GNUNET_FS_UpdateInformationGraph
+{
+
+  /**
+   * Handle to the FS service context.
+   */
+  struct GNUNET_FS_Handle *h;
+
+  /**
+   * Array with information about nodes in the namespace.
+   */
+  struct NamespaceUpdateNode **update_nodes;
+
+  /**
+   * Private key for the namespace.
+   */
+  struct GNUNET_CRYPTO_EcdsaPrivateKey ns;
+
+  /**
+   * Hash map mapping identifiers of update nodes
+   * to the update nodes (initialized on-demand).
+   */
+  struct GNUNET_CONTAINER_MultiHashMap *update_map;
+
+  /**
+   * Size of the update nodes array.
+   */
+  unsigned int update_node_count;
+
+  /**
+   * Reference counter.
+   */
+  unsigned int rc;
+
+  /**
+   * Generator for unique nug numbers.
+   */
+  unsigned int nug_gen;
+};
 
 
 /**
  * Return the name of the directory in which we store
  * the update information graph for the given local namespace.
  *
+ * @param h file-sharing handle
  * @param ns namespace handle
  * @return NULL on error, otherwise the name of the directory
  */
 static char *
-get_update_information_directory (struct GNUNET_FS_Namespace *ns)
+get_update_information_directory (struct GNUNET_FS_Handle *h,
+				  const struct GNUNET_CRYPTO_EcdsaPrivateKey *ns)
 {
   char *dn;
   char *ret;
+  struct GNUNET_CRYPTO_EcdsaPublicKey pub;
+  struct GNUNET_HashCode hc;
+  struct GNUNET_CRYPTO_HashAsciiEncoded enc;
 
   if (GNUNET_OK !=
-      GNUNET_CONFIGURATION_get_value_filename (ns->h->cfg, "FS", "UPDATE_DIR",
+      GNUNET_CONFIGURATION_get_value_filename (h->cfg, "FS", "UPDATE_DIR",
                                                &dn))
   {
-    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-                _("Configuration fails to specify `%s' in section `%s'\n"),
-                "UPDATE_DIR", "fs");
+    GNUNET_log_config_missing (GNUNET_ERROR_TYPE_ERROR,
+			       "fs", "UPDATE_DIR");
     return NULL;
   }
-  GNUNET_asprintf (&ret, "%s%s%s", dn, DIR_SEPARATOR_STR, ns->name);
+  GNUNET_CRYPTO_ecdsa_key_get_public (ns, &pub);
+  GNUNET_CRYPTO_hash (&pub, sizeof (pub), &hc);
+  GNUNET_CRYPTO_hash_to_enc (&hc,
+			     &enc);
+  GNUNET_asprintf (&ret, "%s%s%s",
+		   dn,
+		   DIR_SEPARATOR_STR,
+		   (const char *) enc.encoding);
   GNUNET_free (dn);
   return ret;
 }
 
 
 /**
- * Write the namespace update node graph to a file.
+ * Release memory occupied by UIG datastructure.
+ *
+ * @param uig data structure to free
+ */
+static void
+free_update_information_graph (struct GNUNET_FS_UpdateInformationGraph *uig)
+{
+  unsigned int i;
+  struct NamespaceUpdateNode *nsn;
+
+  for (i = 0; i < uig->update_node_count; i++)
+  {
+    nsn = uig->update_nodes[i];
+    GNUNET_CONTAINER_meta_data_destroy (nsn->md);
+    GNUNET_FS_uri_destroy (nsn->uri);
+    GNUNET_free (nsn->id);
+    GNUNET_free (nsn->update);
+    GNUNET_free (nsn);
+  }
+  GNUNET_array_grow (uig->update_nodes, uig->update_node_count,
+		     0);
+  if (NULL != uig->update_map)
+    GNUNET_CONTAINER_multihashmap_destroy (uig->update_map);
+  GNUNET_free (uig);
+}
+
+
+/**
+ * Write a namespace's update node graph to a file.
  *
- * @param ns namespace to dump
+ * @param uig update information graph to dump
  */
 static void
-write_update_information_graph (struct GNUNET_FS_Namespace *ns)
+write_update_information_graph (struct GNUNET_FS_UpdateInformationGraph *uig)
 {
   char *fn;
   struct GNUNET_BIO_WriteHandle *wh;
@@ -99,20 +198,21 @@ write_update_information_graph (struct GNUNET_FS_Namespace *ns)
   struct NamespaceUpdateNode *n;
   char *uris;
 
-  fn = get_update_information_directory (ns);
+  fn = get_update_information_directory (uig->h,
+					 &uig->ns);
   wh = GNUNET_BIO_write_open (fn);
-  if (wh == NULL)
+  if (NULL == wh)
   {
     GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
                 _("Failed to open `%s' for writing: %s\n"), STRERROR (errno));
     GNUNET_free (fn);
     return;
   }
-  if (GNUNET_OK != GNUNET_BIO_write_int32 (wh, ns->update_node_count))
+  if (GNUNET_OK != GNUNET_BIO_write_int32 (wh, uig->update_node_count))
     goto END;
-  for (i = 0; i < ns->update_node_count; i++)
+  for (i = 0; i < uig->update_node_count; i++)
   {
-    n = ns->update_nodes[i];
+    n = uig->update_nodes[i];
     uris = GNUNET_FS_uri_to_string (n->uri);
     if ((GNUNET_OK != GNUNET_BIO_write_string (wh, n->id)) ||
         (GNUNET_OK != GNUNET_BIO_write_meta_data (wh, n->md)) ||
@@ -135,11 +235,15 @@ END:
 /**
  * Read the namespace update node graph from a file.
  *
+ * @param h FS handle to use
  * @param ns namespace to read
+ * @return update graph, never NULL
  */
-static void
-read_update_information_graph (struct GNUNET_FS_Namespace *ns)
+static struct GNUNET_FS_UpdateInformationGraph *
+read_update_information_graph (struct GNUNET_FS_Handle *h,
+			       const struct GNUNET_CRYPTO_EcdsaPrivateKey *ns)
 {
+  struct GNUNET_FS_UpdateInformationGraph *uig;
   char *fn;
   struct GNUNET_BIO_ReadHandle *rh;
   unsigned int i;
@@ -148,17 +252,20 @@ read_update_information_graph (struct GNUNET_FS_Namespace *ns)
   uint32_t count;
   char *emsg;
 
-  fn = get_update_information_directory (ns);
+  uig = GNUNET_new (struct GNUNET_FS_UpdateInformationGraph);
+  uig->h = h;
+  uig->ns = *ns;
+  fn = get_update_information_directory (h, ns);
   if (GNUNET_YES != GNUNET_DISK_file_test (fn))
   {
     GNUNET_free (fn);
-    return;
+    return uig;
   }
   rh = GNUNET_BIO_read_open (fn);
-  if (rh == NULL)
+  if (NULL == rh)
   {
     GNUNET_free (fn);
-    return;
+    return uig;
   }
   if (GNUNET_OK != GNUNET_BIO_read_int32 (rh, &count))
   {
@@ -170,18 +277,14 @@ read_update_information_graph (struct GNUNET_FS_Namespace *ns)
     GNUNET_break (0);
     goto END;
   }
-  if (count == 0)
-  {
-    GNUNET_break (GNUNET_OK == GNUNET_BIO_read_close (rh, NULL));
-    GNUNET_free (fn);
-    return;
-  }
-  ns->update_nodes =
-      GNUNET_malloc (count * sizeof (struct NamespaceUpdateNode *));
+  if (0 == count)
+    goto END;
+  uig->update_nodes =
+    GNUNET_malloc (count * sizeof (struct NamespaceUpdateNode *));
 
   for (i = 0; i < count; i++)
   {
-    n = GNUNET_malloc (sizeof (struct NamespaceUpdateNode));
+    n = GNUNET_new (struct NamespaceUpdateNode);
     if ((GNUNET_OK != GNUNET_BIO_read_string (rh, "identifier", &n->id, 1024))
         || (GNUNET_OK != GNUNET_BIO_read_meta_data (rh, "meta", &n->md)) ||
         (GNUNET_OK !=
@@ -208,441 +311,25 @@ read_update_information_graph (struct GNUNET_FS_Namespace *ns)
       GNUNET_free (n);
       break;
     }
-    ns->update_nodes[i] = n;
+    uig->update_nodes[i] = n;
   }
-  ns->update_node_count = i;
-END:
+  uig->update_node_count = i;
+ END:
   if (GNUNET_OK != GNUNET_BIO_read_close (rh, &emsg))
   {
-    GNUNET_log (GNUNET_ERROR_TYPE_ERROR, _("Failed to write `%s': %s\n"), emsg);
+    GNUNET_log (GNUNET_ERROR_TYPE_ERROR, _("Failed to read `%s': %s\n"),
+		fn, emsg);
     GNUNET_free (emsg);
   }
   GNUNET_free (fn);
+  return uig;
 }
 
 
-/**
- * Context for advertising a namespace.
- */
-struct AdvertisementContext
-{
-  /**
-   * Function to call with the result.
-   */
-  GNUNET_FS_PublishContinuation cont;
-
-  /**
-   * Closure for cont.
-   */
-  void *cont_cls;
-
-  /**
-   * Datastore handle.
-   */
-  struct GNUNET_DATASTORE_Handle *dsh;
-
-  /**
-   * Our KSK URI.
-   */
-  struct GNUNET_FS_Uri *ksk_uri;
-
-  /**
-   * Plaintext.
-   */
-  char *pt;
-
-  /**
-   * NBlock to sign and store.
-   */
-  struct NBlock *nb;
-
-  /**
-   * The namespace.
-   */
-  struct GNUNET_FS_Namespace *ns;
-
-  /**
-   * Block options.
-   */
-  struct GNUNET_FS_BlockOptions bo;
-
-  /**
-   * Number of bytes of plaintext.
-   */
-  size_t pt_size;
-
-  /**
-   * Current keyword offset.
-   */
-  unsigned int pos;
-};
-
-
-/**
- * Disconnect from the datastore.
- *
- * @param cls datastore handle
- * @param tc scheduler context
- */
-static void
-do_disconnect (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
-{
-  struct GNUNET_DATASTORE_Handle *dsh = cls;
-
-  GNUNET_DATASTORE_disconnect (dsh, GNUNET_NO);
-}
-
-
-/**
- * Continuation called to notify client about result of the
- * operation.
- *
- * @param cls closure (our struct AdvertismentContext)
- * @param success GNUNET_SYSERR on failure
- * @param msg NULL on success, otherwise an error message
- */
-static void
-advertisement_cont (void *cls, int success, const char *msg)
-{
-  struct AdvertisementContext *ac = cls;
-  const char *keyword;
-  GNUNET_HashCode key;
-  GNUNET_HashCode query;
-  struct GNUNET_CRYPTO_AesSessionKey skey;
-  struct GNUNET_CRYPTO_AesInitializationVector iv;
-  struct GNUNET_CRYPTO_RsaPrivateKey *pk;
-
-  if (GNUNET_OK != success)
-  {
-    /* error! */
-    GNUNET_SCHEDULER_add_continuation (&do_disconnect, ac->dsh,
-                                       GNUNET_SCHEDULER_REASON_PREREQ_DONE);
-    if (msg == NULL)
-    {
-      GNUNET_break (0);
-      msg = _("Unknown error");
-    }
-    if (ac->cont != NULL)
-      ac->cont (ac->cont_cls, NULL, msg);
-    GNUNET_FS_uri_destroy (ac->ksk_uri);
-    GNUNET_free (ac->pt);
-    GNUNET_free (ac->nb);
-    GNUNET_FS_namespace_delete (ac->ns, GNUNET_NO);
-    GNUNET_free (ac);
-    return;
-  }
-  if (ac->pos == ac->ksk_uri->data.ksk.keywordCount)
-  {
-    /* done! */
-    GNUNET_SCHEDULER_add_continuation (&do_disconnect, ac->dsh,
-                                       GNUNET_SCHEDULER_REASON_PREREQ_DONE);
-    if (ac->cont != NULL)
-      ac->cont (ac->cont_cls, ac->ksk_uri, NULL);
-    GNUNET_FS_uri_destroy (ac->ksk_uri);
-    GNUNET_free (ac->pt);
-    GNUNET_free (ac->nb);
-    GNUNET_FS_namespace_delete (ac->ns, GNUNET_NO);
-    GNUNET_free (ac);
-    return;
-  }
-  keyword = ac->ksk_uri->data.ksk.keywords[ac->pos++];
-  /* first character of keyword indicates if it is
-   * mandatory or not -- ignore for hashing */
-  GNUNET_CRYPTO_hash (&keyword[1], strlen (&keyword[1]), &key);
-  GNUNET_CRYPTO_hash_to_aes_key (&key, &skey, &iv);
-  GNUNET_CRYPTO_aes_encrypt (ac->pt, ac->pt_size, &skey, &iv, &ac->nb[1]);
-  GNUNET_break (GNUNET_OK ==
-                GNUNET_CRYPTO_rsa_sign (ac->ns->key, &ac->nb->ns_purpose,
-                                        &ac->nb->ns_signature));
-  pk = GNUNET_CRYPTO_rsa_key_create_from_hash (&key);
-  GNUNET_assert (pk != NULL);
-  GNUNET_CRYPTO_rsa_key_get_public (pk, &ac->nb->keyspace);
-  GNUNET_CRYPTO_hash (&ac->nb->keyspace,
-                      sizeof (struct GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded),
-                      &query);
-  GNUNET_break (GNUNET_OK ==
-                GNUNET_CRYPTO_rsa_sign (pk, &ac->nb->ksk_purpose,
-                                        &ac->nb->ksk_signature));
-  GNUNET_CRYPTO_rsa_key_free (pk);
-  GNUNET_DATASTORE_put (ac->dsh, 0 /* no reservation */ ,
-                        &query, ac->pt_size + sizeof (struct NBlock), ac->nb,
-                        GNUNET_BLOCK_TYPE_FS_NBLOCK, ac->bo.content_priority,
-                        ac->bo.anonymity_level, ac->bo.replication_level,
-                        ac->bo.expiration_time, -2, 1,
-                        GNUNET_CONSTANTS_SERVICE_TIMEOUT, &advertisement_cont,
-                        ac);
-}
-
-
-/**
- * Publish an advertismement for a namespace.
- *
- * @param h handle to the file sharing subsystem
- * @param ksk_uri keywords to use for advertisment
- * @param namespace handle for the namespace that should be advertised
- * @param meta meta-data for the namespace advertisement
- * @param bo block options
- * @param rootEntry name of the root of the namespace
- * @param cont continuation
- * @param cont_cls closure for cont
- */
-void
-GNUNET_FS_namespace_advertise (struct GNUNET_FS_Handle *h,
-                               struct GNUNET_FS_Uri *ksk_uri,
-                               struct GNUNET_FS_Namespace *namespace,
-                               const struct GNUNET_CONTAINER_MetaData *meta,
-                               const struct GNUNET_FS_BlockOptions *bo,
-                               const char *rootEntry,
-                               GNUNET_FS_PublishContinuation cont,
-                               void *cont_cls)
-{
-  size_t reslen;
-  size_t size;
-  ssize_t mdsize;
-  struct NBlock *nb;
-  char *mdst;
-  struct GNUNET_DATASTORE_Handle *dsh;
-  struct AdvertisementContext *ctx;
-  char *pt;
-
-  /* create advertisements */
-  mdsize = GNUNET_CONTAINER_meta_data_get_serialized_size (meta);
-  if (-1 == mdsize)
-  {
-    cont (cont_cls, NULL, _("Failed to serialize meta data"));
-    return;
-  }
-  reslen = strlen (rootEntry) + 1;
-  size = mdsize + sizeof (struct NBlock) + reslen;
-  if (size > MAX_NBLOCK_SIZE)
-  {
-    size = MAX_NBLOCK_SIZE;
-    mdsize = size - sizeof (struct NBlock) - reslen;
-  }
-
-  pt = GNUNET_malloc (mdsize + reslen);
-  memcpy (pt, rootEntry, reslen);
-  mdst = &pt[reslen];
-  mdsize =
-      GNUNET_CONTAINER_meta_data_serialize (meta, &mdst, mdsize,
-                                            GNUNET_CONTAINER_META_DATA_SERIALIZE_PART);
-  if (mdsize == -1)
-  {
-    GNUNET_break (0);
-    GNUNET_free (pt);
-    cont (cont_cls, NULL, _("Failed to serialize meta data"));
-    return;
-  }
-  size = mdsize + sizeof (struct NBlock) + reslen;
-  nb = GNUNET_malloc (size);
-  GNUNET_CRYPTO_rsa_key_get_public (namespace->key, &nb->subspace);
-  nb->ns_purpose.size =
-      htonl (mdsize + reslen +
-             sizeof (struct GNUNET_CRYPTO_RsaSignaturePurpose) +
-             sizeof (struct GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded));
-  nb->ns_purpose.purpose = htonl (GNUNET_SIGNATURE_PURPOSE_FS_NBLOCK);
-  nb->ksk_purpose.size =
-      htonl (size - sizeof (struct GNUNET_CRYPTO_RsaSignature));
-  nb->ksk_purpose.purpose = htonl (GNUNET_SIGNATURE_PURPOSE_FS_NBLOCK_KSIG);
-  dsh = GNUNET_DATASTORE_connect (h->cfg);
-  if (NULL == dsh)
-  {
-    GNUNET_free (nb);
-    GNUNET_free (pt);
-    cont (cont_cls, NULL, _("Failed to connect to datastore service"));
-    return;
-  }
-  ctx = GNUNET_malloc (sizeof (struct AdvertisementContext));
-  ctx->cont = cont;
-  ctx->cont_cls = cont_cls;
-  ctx->dsh = dsh;
-  ctx->ksk_uri = GNUNET_FS_uri_dup (ksk_uri);
-  ctx->nb = nb;
-  ctx->pt = pt;
-  ctx->pt_size = mdsize + reslen;
-  ctx->ns = namespace;
-  ctx->ns->rc++;
-  ctx->bo = *bo;
-  advertisement_cont (ctx, GNUNET_OK, NULL);
-}
-
-
-/**
- * Create a namespace with the given name; if one already
- * exists, return a handle to the existing namespace.
- *
- * @param h handle to the file sharing subsystem
- * @param name name to use for the namespace
- * @return handle to the namespace, NULL on error
- */
-struct GNUNET_FS_Namespace *
-GNUNET_FS_namespace_create (struct GNUNET_FS_Handle *h, const char *name)
-{
-  char *dn;
-  char *fn;
-  struct GNUNET_FS_Namespace *ret;
-
-  dn = get_namespace_directory (h);
-  GNUNET_asprintf (&fn, "%s%s%s", dn, DIR_SEPARATOR_STR, name);
-  GNUNET_free (dn);
-  ret = GNUNET_malloc (sizeof (struct GNUNET_FS_Namespace));
-  ret->h = h;
-  ret->rc = 1;
-  ret->key = GNUNET_CRYPTO_rsa_key_create_from_file (fn);
-  if (ret->key == NULL)
-  {
-    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-                _("Failed to create or read private key for namespace `%s'\n"),
-                name);
-    GNUNET_free (ret);
-    GNUNET_free (fn);
-    return NULL;
-  }
-  ret->name = GNUNET_strdup (name);
-  ret->filename = fn;
-  return ret;
-}
-
-
-/**
- * Delete a namespace handle.  Can be used for a clean shutdown (free
- * memory) or also to freeze the namespace to prevent further
- * insertions by anyone.
- *
- * @param namespace handle to the namespace that should be deleted / freed
- * @param freeze prevents future insertions; creating a namespace
- *        with the same name again will create a fresh namespace instead
- *
- * @return GNUNET_OK on success, GNUNET_SYSERR on error
- */
-int
-GNUNET_FS_namespace_delete (struct GNUNET_FS_Namespace *namespace, int freeze)
-{
-  unsigned int i;
-  struct NamespaceUpdateNode *nsn;
-
-  namespace->rc--;
-  if (freeze)
-  {
-    if (0 != UNLINK (namespace->filename))
-      GNUNET_log_strerror_file (GNUNET_ERROR_TYPE_ERROR, "unlink",
-                                namespace->filename);
-  }
-  if (0 == namespace->rc)
-  {
-    GNUNET_CRYPTO_rsa_key_free (namespace->key);
-    GNUNET_free (namespace->filename);
-    GNUNET_free (namespace->name);
-    for (i = 0; i < namespace->update_node_count; i++)
-    {
-      nsn = namespace->update_nodes[i];
-      GNUNET_CONTAINER_meta_data_destroy (nsn->md);
-      GNUNET_FS_uri_destroy (nsn->uri);
-      GNUNET_free (nsn->id);
-      GNUNET_free (nsn->update);
-      GNUNET_free (nsn);
-    }
-    GNUNET_array_grow (namespace->update_nodes, namespace->update_node_count,
-                       0);
-    if (namespace->update_map != NULL)
-      GNUNET_CONTAINER_multihashmap_destroy (namespace->update_map);
-    GNUNET_free (namespace);
-  }
-  return GNUNET_OK;
-}
-
-
-/**
- * Context for the 'process_namespace' callback.
- * Specifies a function to call on each namespace.
- */
-struct ProcessNamespaceContext
-{
-  /**
-   * Function to call.
-   */
-  GNUNET_FS_NamespaceInfoProcessor cb;
-
-  /**
-   * Closure for 'cb'.
-   */
-  void *cb_cls;
-};
-
-
-/**
- * Function called with a filename of a namespace. Reads the key and
- * calls the callback.
- *
- * @param cls closure (struct ProcessNamespaceContext)
- * @param filename complete filename (absolute path)
- * @return GNUNET_OK to continue to iterate,
- *  GNUNET_SYSERR to abort iteration with error!
- */
-static int
-process_namespace (void *cls, const char *filename)
-{
-  struct ProcessNamespaceContext *pnc = cls;
-  struct GNUNET_CRYPTO_RsaPrivateKey *key;
-  struct GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded pk;
-  GNUNET_HashCode id;
-  const char *name;
-  const char *t;
-
-  key = GNUNET_CRYPTO_rsa_key_create_from_file (filename);
-  if (key == NULL)
-  {
-    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-                _
-                ("Failed to read namespace private key file `%s', deleting it!\n"),
-                filename);
-    if (0 != UNLINK (filename))
-      GNUNET_log_strerror_file (GNUNET_ERROR_TYPE_WARNING, "unlink", filename);
-    return GNUNET_OK;
-  }
-  GNUNET_CRYPTO_rsa_key_get_public (key, &pk);
-  GNUNET_CRYPTO_rsa_key_free (key);
-  GNUNET_CRYPTO_hash (&pk, sizeof (pk), &id);
-  name = filename;
-  while (NULL != (t = strstr (name, DIR_SEPARATOR_STR)))
-    name = t + 1;
-  pnc->cb (pnc->cb_cls, name, &id);
-  return GNUNET_OK;
-}
-
-
-/**
- * Build a list of all available local (!) namespaces The returned
- * names are only the nicknames since we only iterate over the local
- * namespaces.
- *
- * @param h handle to the file sharing subsystem
- * @param cb function to call on each known namespace
- * @param cb_cls closure for cb
- */
-void
-GNUNET_FS_namespace_list (struct GNUNET_FS_Handle *h,
-                          GNUNET_FS_NamespaceInfoProcessor cb, void *cb_cls)
-{
-  char *dn;
-  struct ProcessNamespaceContext ctx;
-
-  dn = get_namespace_directory (h);
-  if (dn == NULL)
-    return;
-  ctx.cb = cb;
-  ctx.cb_cls = cb_cls;
-  GNUNET_DISK_directory_scan (dn, &process_namespace, &ctx);
-  GNUNET_free (dn);
-}
-
-
-
-
 /**
  * Context for the SKS publication.
  */
-struct PublishSksContext
+struct GNUNET_FS_PublishSksContext
 {
 
   /**
@@ -659,13 +346,18 @@ struct PublishSksContext
   /**
    * Namespace we're publishing to.
    */
-  struct GNUNET_FS_Namespace *namespace;
+  struct GNUNET_CRYPTO_EcdsaPrivateKey ns;
 
   /**
    * Handle to the datastore.
    */
   struct GNUNET_DATASTORE_Handle *dsh;
 
+  /**
+   * Handle to FS.
+   */
+  struct GNUNET_FS_Handle *h;
+
   /**
    * Function to call once we're done.
    */
@@ -676,68 +368,52 @@ struct PublishSksContext
    */
   void *cont_cls;
 
+  /**
+   * Handle for our UBlock operation request.
+   */
+  struct GNUNET_FS_PublishUblockContext *uc;
 };
 
 
 /**
- * Function called by the datastore API with
- * the result from the PUT (SBlock) request.
+ * Function called by the UBlock construction with
+ * the result from the PUT (UBlock) request.
  *
- * @param cls closure of type "struct PublishSksContext*"
- * @param success GNUNET_OK on success
+ * @param cls closure of type "struct GNUNET_FS_PublishSksContext*"
  * @param msg error message (or NULL)
  */
 static void
-sb_put_cont (void *cls, int success, const char *msg)
+sks_publish_cont (void *cls,
+		  const char *msg)
 {
-  struct PublishSksContext *psc = cls;
-  GNUNET_HashCode hc;
+  struct GNUNET_FS_PublishSksContext *psc = cls;
+  struct GNUNET_FS_UpdateInformationGraph *uig;
 
-  if (NULL != psc->dsh)
-  {
-    GNUNET_DATASTORE_disconnect (psc->dsh, GNUNET_NO);
-    psc->dsh = NULL;
-  }
-  if (GNUNET_OK != success)
+  psc->uc = NULL;
+  if (NULL != msg)
   {
-    if (psc->cont != NULL)
+    if (NULL != psc->cont)
       psc->cont (psc->cont_cls, NULL, msg);
+    GNUNET_FS_publish_sks_cancel (psc);
+    return;
   }
-  else
-  {
-    if (psc->nsn != NULL)
-    {
-      /* FIXME: this can be done much more
-       * efficiently by simply appending to the
-       * file and overwriting the 4-byte header */
-      if (psc->namespace->update_nodes == NULL)
-        read_update_information_graph (psc->namespace);
-      GNUNET_array_append (psc->namespace->update_nodes,
-                           psc->namespace->update_node_count, psc->nsn);
-      if (psc->namespace->update_map != NULL)
-      {
-        GNUNET_CRYPTO_hash (psc->nsn->id, strlen (psc->nsn->id), &hc);
-        GNUNET_CONTAINER_multihashmap_put (psc->namespace->update_map, &hc,
-                                           psc->nsn,
-                                           GNUNET_CONTAINER_MULTIHASHMAPOPTION_MULTIPLE);
-      }
-      psc->nsn = NULL;
-      write_update_information_graph (psc->namespace);
-    }
-    if (psc->cont != NULL)
-      psc->cont (psc->cont_cls, psc->uri, NULL);
-  }
-  GNUNET_FS_namespace_delete (psc->namespace, GNUNET_NO);
-  GNUNET_FS_uri_destroy (psc->uri);
-  if (psc->nsn != NULL)
-  {
-    GNUNET_CONTAINER_meta_data_destroy (psc->nsn->md);
-    GNUNET_FS_uri_destroy (psc->nsn->uri);
-    GNUNET_free (psc->nsn->id);
-    GNUNET_free (psc->nsn->update);
-    GNUNET_free (psc->nsn);
-  }
-  GNUNET_free (psc);
+  if (NULL != psc->nsn)
+  {
+    /* FIXME: this can be done much more
+     * efficiently by simply appending to the
+     * file and overwriting the 4-byte header */
+    uig = read_update_information_graph (psc->h,
+					 &psc->ns);
+    GNUNET_array_append (uig->update_nodes,
+			 uig->update_node_count,
+			 psc->nsn);
+    psc->nsn = NULL;
+    write_update_information_graph (uig);
+    free_update_information_graph (uig);
+  }
+  if (NULL != psc->cont)
+    psc->cont (psc->cont_cls, psc->uri, NULL);
+  GNUNET_FS_publish_sks_cancel (psc);
 }
 
 
@@ -745,7 +421,7 @@ sb_put_cont (void *cls, int success, const char *msg)
  * Publish an SBlock on GNUnet.
  *
  * @param h handle to the file sharing subsystem
- * @param namespace namespace to publish in
+ * @param ns namespace to publish in
  * @param identifier identifier to use
  * @param update update identifier to use
  * @param meta metadata to use
@@ -754,10 +430,11 @@ sb_put_cont (void *cls, int success, const char *msg)
  * @param options publication options
  * @param cont continuation
  * @param cont_cls closure for cont
+ * @return NULL on error ('cont' will still be called)
  */
-void
+struct GNUNET_FS_PublishSksContext *
 GNUNET_FS_publish_sks (struct GNUNET_FS_Handle *h,
-                       struct GNUNET_FS_Namespace *namespace,
+                       const struct GNUNET_CRYPTO_EcdsaPrivateKey *ns,
                        const char *identifier, const char *update,
                        const struct GNUNET_CONTAINER_MetaData *meta,
                        const struct GNUNET_FS_Uri *uri,
@@ -765,123 +442,82 @@ GNUNET_FS_publish_sks (struct GNUNET_FS_Handle *h,
                        enum GNUNET_FS_PublishOptions options,
                        GNUNET_FS_PublishContinuation cont, void *cont_cls)
 {
-  struct PublishSksContext *psc;
-  struct GNUNET_CRYPTO_AesSessionKey sk;
-  struct GNUNET_CRYPTO_AesInitializationVector iv;
+  struct GNUNET_FS_PublishSksContext *psc;
   struct GNUNET_FS_Uri *sks_uri;
-  char *uris;
-  size_t size;
-  size_t slen;
-  size_t nidlen;
-  size_t idlen;
-  ssize_t mdsize;
-  struct SBlock *sb;
-  struct SBlock *sb_enc;
-  char *dest;
-  struct GNUNET_CONTAINER_MetaData *mmeta;
-  GNUNET_HashCode key;          /* hash of thisId = key */
-  GNUNET_HashCode id;           /* hash of hc = identifier */
-  GNUNET_HashCode query;        /* id ^ nsid = DB query */
-
-  if (NULL == meta)
-    mmeta = GNUNET_CONTAINER_meta_data_create ();
-  else
-    mmeta = GNUNET_CONTAINER_meta_data_duplicate (meta);
-  uris = GNUNET_FS_uri_to_string (uri);
-  slen = strlen (uris) + 1;
-  idlen = strlen (identifier);
-  if (update != NULL)
-    nidlen = strlen (update) + 1;
-  else
-    nidlen = 1;
-  mdsize = GNUNET_CONTAINER_meta_data_get_serialized_size (mmeta);
-  size = sizeof (struct SBlock) + slen + nidlen + mdsize;
-  if (size > MAX_SBLOCK_SIZE)
-  {
-    size = MAX_SBLOCK_SIZE;
-    mdsize = size - (sizeof (struct SBlock) + slen + nidlen);
-  }
-  sb = GNUNET_malloc (sizeof (struct SBlock) + size);
-  dest = (char *) &sb[1];
-  if (update != NULL)
-    memcpy (dest, update, nidlen);
-  else
-    memset (dest, 0, 1);
-  dest += nidlen;
-  memcpy (dest, uris, slen);
-  GNUNET_free (uris);
-  dest += slen;
-  mdsize =
-      GNUNET_CONTAINER_meta_data_serialize (mmeta, &dest, mdsize,
-                                            GNUNET_CONTAINER_META_DATA_SERIALIZE_PART);
-  GNUNET_CONTAINER_meta_data_destroy (mmeta);
-  if (mdsize == -1)
-  {
-    GNUNET_break (0);
-    GNUNET_free (sb);
-    cont (cont_cls, NULL, _("Internal error."));
-    return;
-  }
-  size = sizeof (struct SBlock) + mdsize + slen + nidlen;
-  sb_enc = GNUNET_malloc (size);
-  GNUNET_CRYPTO_hash (identifier, idlen, &key);
-  GNUNET_CRYPTO_hash (&key, sizeof (GNUNET_HashCode), &id);
-  sks_uri = GNUNET_malloc (sizeof (struct GNUNET_FS_Uri));
-  sks_uri->type = sks;
-  GNUNET_CRYPTO_rsa_key_get_public (namespace->key, &sb_enc->subspace);
-  GNUNET_CRYPTO_hash (&sb_enc->subspace,
-                      sizeof (struct GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded),
-                      &sks_uri->data.sks.namespace);
+
+  sks_uri = GNUNET_new (struct GNUNET_FS_Uri);
+  sks_uri->type = GNUNET_FS_URI_SKS;
   sks_uri->data.sks.identifier = GNUNET_strdup (identifier);
-  GNUNET_CRYPTO_hash_xor (&id, &sks_uri->data.sks.namespace,
-                          &sb_enc->identifier);
-  GNUNET_CRYPTO_hash_to_aes_key (&key, &sk, &iv);
-  GNUNET_CRYPTO_aes_encrypt (&sb[1], size - sizeof (struct SBlock), &sk, &iv,
-                             &sb_enc[1]);
-  sb_enc->purpose.purpose = htonl (GNUNET_SIGNATURE_PURPOSE_FS_SBLOCK);
-  sb_enc->purpose.size =
-      htonl (slen + mdsize + nidlen + sizeof (struct SBlock) -
-             sizeof (struct GNUNET_CRYPTO_RsaSignature));
-  GNUNET_assert (GNUNET_OK ==
-                 GNUNET_CRYPTO_rsa_sign (namespace->key, &sb_enc->purpose,
-                                         &sb_enc->signature));
-  psc = GNUNET_malloc (sizeof (struct PublishSksContext));
+  GNUNET_CRYPTO_ecdsa_key_get_public (ns,
+				    &sks_uri->data.sks.ns);
+
+  psc = GNUNET_new (struct GNUNET_FS_PublishSksContext);
+  psc->h = h;
   psc->uri = sks_uri;
   psc->cont = cont;
-  psc->namespace = namespace;
-  namespace->rc++;
   psc->cont_cls = cont_cls;
-  if (0 != (options & GNUNET_FS_PUBLISH_OPTION_SIMULATE_ONLY))
+  psc->ns = *ns;
+  if (0 == (options & GNUNET_FS_PUBLISH_OPTION_SIMULATE_ONLY))
   {
-    GNUNET_free (sb_enc);
-    GNUNET_free (sb);
-    sb_put_cont (psc, GNUNET_OK, NULL);
-    return;
-  }
-  psc->dsh = GNUNET_DATASTORE_connect (h->cfg);
-  if (NULL == psc->dsh)
-  {
-    GNUNET_free (sb_enc);
-    GNUNET_free (sb);
-    sb_put_cont (psc, GNUNET_NO, _("Failed to connect to datastore."));
-    return;
+    psc->dsh = GNUNET_DATASTORE_connect (h->cfg);
+    if (NULL == psc->dsh)
+    {
+      sks_publish_cont (psc,
+			_("Failed to connect to datastore."));
+      return NULL;
+    }
   }
-  GNUNET_CRYPTO_hash_xor (&sks_uri->data.sks.namespace, &id, &query);
   if (NULL != update)
   {
-    psc->nsn = GNUNET_malloc (sizeof (struct NamespaceUpdateNode));
+    psc->nsn = GNUNET_new (struct NamespaceUpdateNode);
     psc->nsn->id = GNUNET_strdup (identifier);
     psc->nsn->update = GNUNET_strdup (update);
     psc->nsn->md = GNUNET_CONTAINER_meta_data_duplicate (meta);
     psc->nsn->uri = GNUNET_FS_uri_dup (uri);
   }
-  GNUNET_DATASTORE_put (psc->dsh, 0, &sb_enc->identifier, size, sb_enc,
-                        GNUNET_BLOCK_TYPE_FS_SBLOCK, bo->content_priority,
-                        bo->anonymity_level, bo->replication_level,
-                        bo->expiration_time, -2, 1,
-                        GNUNET_CONSTANTS_SERVICE_TIMEOUT, &sb_put_cont, psc);
-  GNUNET_free (sb);
-  GNUNET_free (sb_enc);
+  psc->uc = GNUNET_FS_publish_ublock_ (h,
+				       psc->dsh,
+				       identifier,
+				       update,
+				       ns,
+				       meta,
+				       uri,
+				       bo,
+				       options,
+				       &sks_publish_cont,
+				       psc);
+  return psc;
+}
+
+
+/**
+ * Abort the SKS publishing operation.
+ *
+ * @param psc context of the operation to abort.
+ */
+void
+GNUNET_FS_publish_sks_cancel (struct GNUNET_FS_PublishSksContext *psc)
+{
+  if (NULL != psc->uc)
+  {
+    GNUNET_FS_publish_ublock_cancel_ (psc->uc);
+    psc->uc = NULL;
+  }
+  if (NULL != psc->dsh)
+  {
+    GNUNET_DATASTORE_disconnect (psc->dsh, GNUNET_NO);
+    psc->dsh = NULL;
+  }
+  GNUNET_FS_uri_destroy (psc->uri);
+  if (NULL != psc->nsn)
+  {
+    GNUNET_CONTAINER_meta_data_destroy (psc->nsn->md);
+    GNUNET_FS_uri_destroy (psc->nsn->uri);
+    GNUNET_free (psc->nsn->id);
+    GNUNET_free (psc->nsn->update);
+    GNUNET_free (psc->nsn);
+  }
+  GNUNET_free (psc);
 }
 
 
@@ -913,12 +549,18 @@ struct ProcessUpdateClosure
  *         GNUNET_NO if not.
  */
 static int
-process_update_node (void *cls, const GNUNET_HashCode * key, void *value)
+process_update_node (void *cls,
+		     const struct GNUNET_HashCode *key,
+		     void *value)
 {
   struct ProcessUpdateClosure *pc = cls;
   struct NamespaceUpdateNode *nsn = value;
 
-  pc->ip (pc->ip_cls, nsn->id, nsn->uri, nsn->md, nsn->update);
+  pc->ip (pc->ip_cls,
+	  nsn->id,
+	  nsn->uri,
+	  nsn->md,
+	  nsn->update);
   return GNUNET_YES;
 }
 
@@ -929,9 +571,9 @@ process_update_node (void *cls, const GNUNET_HashCode * key, void *value)
 struct FindTreeClosure
 {
   /**
-   * Namespace we are operating on.
+   * UIG we are operating on.
    */
-  struct GNUNET_FS_Namespace *namespace;
+  struct GNUNET_FS_UpdateInformationGraph *uig;
 
   /**
    * Array with 'head's of TREEs.
@@ -976,15 +618,17 @@ struct FindTreeClosure
  *         GNUNET_NO if not.
  */
 static int
-find_trees (void *cls, const GNUNET_HashCode * key, void *value)
+find_trees (void *cls,
+	    const struct GNUNET_HashCode *key,
+	    void *value)
 {
   struct FindTreeClosure *fc = cls;
   struct NamespaceUpdateNode *nsn = value;
-  GNUNET_HashCode hc;
+  struct GNUNET_HashCode hc;
 
   if (nsn->nug == fc->nug)
   {
-    if (nsn->tree_id == UINT_MAX)
+    if (UINT_MAX == nsn->tree_id)
       return GNUNET_YES;        /* circular */
     GNUNET_assert (nsn->tree_id < fc->tree_array_size);
     if (fc->tree_array[nsn->tree_id] != nsn)
@@ -994,7 +638,7 @@ find_trees (void *cls, const GNUNET_HashCode * key, void *value)
       return GNUNET_YES;        /* that's our own root (can this be?) */
     /* merge existing TREE, we have a root for both */
     fc->tree_array[nsn->tree_id] = NULL;
-    if (fc->id == UINT_MAX)
+    if (UINT_MAX == fc->id)
       fc->id = nsn->tree_id;    /* take over ID */
   }
   else
@@ -1003,7 +647,7 @@ find_trees (void *cls, const GNUNET_HashCode * key, void *value)
     nsn->tree_id = UINT_MAX;    /* mark as undef */
     /* trace */
     GNUNET_CRYPTO_hash (nsn->update, strlen (nsn->update), &hc);
-    GNUNET_CONTAINER_multihashmap_get_multiple (fc->namespace->update_map, &hc,
+    GNUNET_CONTAINER_multihashmap_get_multiple (fc->uig->update_map, &hc,
                                                 &find_trees, fc);
   }
   return GNUNET_YES;
@@ -1027,91 +671,87 @@ find_trees (void *cls, const GNUNET_HashCode * key, void *value)
  * I know, odd definition of a tree, but the GUI will display an actual
  * tree (GtkTreeView), so that's what counts for the term here.
  *
- * @param namespace namespace to inspect for updateable content
+ * @param h fs handle to use
+ * @param ns namespace to inspect for updateable content
  * @param next_id ID to look for; use NULL to look for tree roots
  * @param ip function to call on each updateable identifier
  * @param ip_cls closure for ip
  */
 void
-GNUNET_FS_namespace_list_updateable (struct GNUNET_FS_Namespace *namespace,
+GNUNET_FS_namespace_list_updateable (struct GNUNET_FS_Handle *h,
+				     const struct GNUNET_CRYPTO_EcdsaPrivateKey *ns,
                                      const char *next_id,
                                      GNUNET_FS_IdentifierProcessor ip,
                                      void *ip_cls)
 {
   unsigned int i;
   unsigned int nug;
-  GNUNET_HashCode hc;
+  struct GNUNET_HashCode hc;
   struct NamespaceUpdateNode *nsn;
   struct ProcessUpdateClosure pc;
   struct FindTreeClosure fc;
+  struct GNUNET_FS_UpdateInformationGraph *uig;
 
-  if (namespace->update_nodes == NULL)
-    read_update_information_graph (namespace);
-  if (namespace->update_nodes == NULL)
+  uig = read_update_information_graph (h, ns);
+  if (NULL == uig->update_nodes)
   {
-#if DEBUG_NAMESPACE
     GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
                 "No updateable nodes found for ID `%s'\n", next_id);
-#endif
+    free_update_information_graph (uig);
     return;                     /* no nodes */
   }
-  if (namespace->update_map == NULL)
+  uig->update_map =
+    GNUNET_CONTAINER_multihashmap_create (2 +
+					  3 * uig->update_node_count /
+					  4,
+					  GNUNET_NO);
+  for (i = 0; i < uig->update_node_count; i++)
   {
-    /* need to construct */
-    namespace->update_map =
-        GNUNET_CONTAINER_multihashmap_create (2 +
-                                              3 * namespace->update_node_count /
-                                              4);
-    for (i = 0; i < namespace->update_node_count; i++)
-    {
-      nsn = namespace->update_nodes[i];
-      GNUNET_CRYPTO_hash (nsn->id, strlen (nsn->id), &hc);
-      GNUNET_CONTAINER_multihashmap_put (namespace->update_map, &hc, nsn,
-                                         GNUNET_CONTAINER_MULTIHASHMAPOPTION_MULTIPLE);
-    }
+    nsn = uig->update_nodes[i];
+    GNUNET_CRYPTO_hash (nsn->id, strlen (nsn->id), &hc);
+    GNUNET_CONTAINER_multihashmap_put (uig->update_map, &hc, nsn,
+				       GNUNET_CONTAINER_MULTIHASHMAPOPTION_MULTIPLE);
   }
-  if (next_id != NULL)
+  if (NULL != next_id)
   {
     GNUNET_CRYPTO_hash (next_id, strlen (next_id), &hc);
     pc.ip = ip;
     pc.ip_cls = ip_cls;
-    GNUNET_CONTAINER_multihashmap_get_multiple (namespace->update_map, &hc,
+    GNUNET_CONTAINER_multihashmap_get_multiple (uig->update_map, &hc,
                                                 &process_update_node, &pc);
+    free_update_information_graph (uig);
     return;
   }
-#if DEBUG_NAMESPACE
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
               "Calculating TREEs to find roots of update trees\n");
-#endif
   /* Find heads of TREEs in update graph */
-  nug = ++namespace->nug_gen;
+  nug = ++uig->nug_gen;
   fc.tree_array = NULL;
   fc.tree_array_size = 0;
 
-  for (i = 0; i < namespace->update_node_count; i++)
+  for (i = 0; i < uig->update_node_count; i++)
   {
-    nsn = namespace->update_nodes[i];
+    nsn = uig->update_nodes[i];
     if (nsn->nug == nug)
     {
-#if DEBUG_NAMESPACE
       GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "TREE of node `%s' is %u\n", nsn->id,
                   nsn->nug);
-#endif
       continue;                 /* already placed in TREE */
     }
     GNUNET_CRYPTO_hash (nsn->update, strlen (nsn->update), &hc);
     nsn->nug = nug;
+    nsn->tree_id = UINT_MAX;
     fc.id = UINT_MAX;
     fc.nug = nug;
-    fc.namespace = namespace;
-    GNUNET_CONTAINER_multihashmap_get_multiple (namespace->update_map, &hc,
+    fc.uig = uig;
+    GNUNET_CONTAINER_multihashmap_get_multiple (uig->update_map, &hc,
                                                 &find_trees, &fc);
-    if (fc.id == UINT_MAX)
+    if (UINT_MAX == fc.id)
     {
       /* start new TREE */
       for (fc.id = 0; fc.id < fc.tree_array_size; fc.id++)
       {
-        if (fc.tree_array[fc.id] == NULL)
+        if (NULL == fc.tree_array[fc.id])
         {
           fc.tree_array[fc.id] = nsn;
           nsn->tree_id = fc.id;
@@ -1123,17 +763,15 @@ GNUNET_FS_namespace_list_updateable (struct GNUNET_FS_Namespace *namespace,
         GNUNET_array_append (fc.tree_array, fc.tree_array_size, nsn);
         nsn->tree_id = fc.id;
       }
-#if DEBUG_NAMESPACE
       GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
                   "Starting new TREE %u with node `%s'\n", nsn->tree_id,
                   nsn->id);
-#endif
       /* put all nodes with same identifier into this TREE */
       GNUNET_CRYPTO_hash (nsn->id, strlen (nsn->id), &hc);
       fc.id = nsn->tree_id;
       fc.nug = nug;
-      fc.namespace = namespace;
-      GNUNET_CONTAINER_multihashmap_get_multiple (namespace->update_map, &hc,
+      fc.uig = uig;
+      GNUNET_CONTAINER_multihashmap_get_multiple (uig->update_map, &hc,
                                                   &find_trees, &fc);
     }
     else
@@ -1142,28 +780,23 @@ GNUNET_FS_namespace_list_updateable (struct GNUNET_FS_Namespace *namespace,
       fc.tree_array[fc.id] = nsn;
       nsn->tree_id = fc.id;
     }
-#if DEBUG_NAMESPACE
-    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "TREE of node `%s' is %u\n", nsn->id,
+    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+		"TREE of node `%s' is %u\n", nsn->id,
                 fc.id);
-#endif
   }
   for (i = 0; i < fc.tree_array_size; i++)
   {
     nsn = fc.tree_array[i];
     if (NULL != nsn)
     {
-#if DEBUG_NAMESPACE
       GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Root of TREE %u is node `%s'\n", i,
                   nsn->id);
-#endif
-
       ip (ip_cls, nsn->id, nsn->uri, nsn->md, nsn->update);
     }
   }
   GNUNET_array_grow (fc.tree_array, fc.tree_array_size, 0);
-#if DEBUG_NAMESPACE
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Done processing TREEs\n");
-#endif
+  free_update_information_graph (uig);
 }