1 files changed, 37 insertions, 142 deletions

diff --git a/src/fs/fs_publish_ksk.c b/src/fs/fs_publish_ksk.c
index 10512af5f..7cbc880a2 100644
--- a/src/fs/fs_publish_ksk.c
+++ b/src/fs/fs_publish_ksk.c
@@ -33,7 +33,7 @@
 #include "gnunet_fs_service.h"
 #include "fs_api.h"
 #include "fs_tree.h"
-
+#include "fs_publish_ublock.h"
 
 /**
  * Context for the KSK publication.
@@ -47,33 +47,29 @@ struct GNUNET_FS_PublishKskContext
   struct GNUNET_FS_Uri *ksk_uri;
 
   /**
-   * Global FS context.
+   * URI to publish.
    */
-  struct GNUNET_FS_Handle *h;
+  struct GNUNET_FS_Uri *uri;
 
   /**
-   * The master block that we are sending
-   * (in plaintext), has "mdsize+slen" more
-   * bytes than the struct would suggest.
+   * Metadata to use.
    */
-  struct UBlock *ub;
+  struct GNUNET_CONTAINER_MetaData *meta;
 
   /**
-   * Buffer of the same size as "kb" for
-   * the encrypted version.
+   * Global FS context.
    */
-  struct UBlock *cpy;
+  struct GNUNET_FS_Handle *h;
 
   /**
-   * Handle to the datastore, NULL if we are just
-   * simulating.
+   * UBlock publishing operation that is active.
    */
-  struct GNUNET_DATASTORE_Handle *dsh;
+  struct GNUNET_FS_PublishUblockContext *uc;
 
   /**
-   * Handle to datastore PUT request.
+   * Handle to the datastore, NULL if we are just simulating.
    */
-  struct GNUNET_DATASTORE_QueueEntry *qre;
+  struct GNUNET_DATASTORE_Handle *dsh;
 
   /**
    * Current task.
@@ -96,14 +92,9 @@ struct GNUNET_FS_PublishKskContext
   struct GNUNET_FS_BlockOptions bo;
 
   /**
-   * Size of the serialized metadata.
-   */
-  ssize_t mdsize;
-
-  /**
-   * Size of the (CHK) URI as a string.
-   */
-  size_t slen;
+   * Options to use.
+   */ 
+  enum GNUNET_FS_PublishOptions options;
 
   /**
    * Keyword that we are currently processing.
@@ -122,7 +113,8 @@ struct GNUNET_FS_PublishKskContext
  * @param tc unused
  */
 static void
-publish_ksk_cont (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc);
+publish_ksk_cont (void *cls, 
+                  const struct GNUNET_SCHEDULER_TaskContext *tc);
 
 
 /**
@@ -130,19 +122,16 @@ publish_ksk_cont (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc);
  * the result from the PUT request.
  *
  * @param cls closure of type "struct GNUNET_FS_PublishKskContext*"
- * @param success GNUNET_OK on success
- * @param min_expiration minimum expiration time required for content to be stored
  * @param msg error message (or NULL)
  */
 static void
-kb_put_cont (void *cls, int success, 
-             struct GNUNET_TIME_Absolute min_expiration,
+kb_put_cont (void *cls,
              const char *msg)
 {
   struct GNUNET_FS_PublishKskContext *pkc = cls;
 
-  pkc->qre = NULL;
-  if (GNUNET_OK != success)
+  pkc->uc = NULL;
+  if (NULL != msg)
   {
     GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, 
                 "KBlock PUT operation failed: %s\n", msg);
@@ -166,15 +155,6 @@ publish_ksk_cont (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
 {
   struct GNUNET_FS_PublishKskContext *pkc = cls;
   const char *keyword;
-  struct GNUNET_HashCode key;
-  struct GNUNET_HashCode seed;
-  struct GNUNET_HashCode signing_key;
-  struct GNUNET_HashCode query;
-  struct GNUNET_CRYPTO_AesSessionKey skey;
-  struct GNUNET_CRYPTO_AesInitializationVector iv;
-  struct GNUNET_FS_PseudonymHandle *ph;
-  struct GNUNET_FS_PseudonymIdentifier pseudonym;
-  struct UBlock *ub_dst;
 
   pkc->ksk_task = GNUNET_SCHEDULER_NO_TASK;
   if ( (pkc->i == pkc->ksk_uri->data.ksk.keywordCount) ||
@@ -186,61 +166,15 @@ publish_ksk_cont (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
     return;
   }
   keyword = pkc->ksk_uri->data.ksk.keywords[pkc->i++];
-  pkc->sks_task = GNUNET_FS_publish_sks (pkc->h,
-                                         anonymous,
-                                         keyword, NULL,
-                                         pkc->meta,
-                                         pkc->uri,
-                                         &pkc->bo,
-                                         pkc->options,
-                                         &publish_ksk_cont, pkc);
-                                         
-
-  /* derive signing seed from plaintext */
-  GNUNET_CRYPTO_hash (&pkc->ub[1],
-                      1 + pkc->slen + pkc->mdsize,
-                      &seed);
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Publishing under keyword `%s'\n",
-              &keyword[1]);  
-  /* 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);
-  ub_dst = pkc->cpy;
-  GNUNET_CRYPTO_aes_encrypt (&pkc->ub[1], 
-                             1 + pkc->slen + pkc->mdsize,
-                             &skey, &iv,
-                             &ub_dst[1]);
-  ph = GNUNET_FS_pseudonym_get_anonymous_pseudonym_handle ();
-  GNUNET_CRYPTO_hash (&key, sizeof (key), &signing_key);
-  ub_dst->purpose.size = htonl (1 + pkc->slen + pkc->mdsize + 
-                                sizeof (struct UBlock)
-                                - sizeof (struct GNUNET_FS_PseudonymSignature));
-  ub_dst->purpose.purpose = htonl (GNUNET_SIGNATURE_PURPOSE_FS_UBLOCK);
-  
-  GNUNET_FS_pseudonym_get_identifier (ph, &pseudonym);
-  GNUNET_FS_pseudonym_derive_verification_key (&pseudonym, 
-                                               &signing_key,
-                                               &ub_dst->verification_key);
-  GNUNET_FS_pseudonym_sign (ph,
-                            &ub_dst->purpose,
-                            &seed,
-                            &signing_key,
-                            &ub_dst->signature);
-
-  GNUNET_CRYPTO_hash (&ub_dst->verification_key,
-                      sizeof (ub_dst->verification_key),
-                      &query);
-  GNUNET_FS_pseudonym_destroy (ph);
-  pkc->qre =
-      GNUNET_DATASTORE_put (pkc->dsh, 0, &query,
-                            1 + pkc->slen + pkc->mdsize + sizeof (struct UBlock),
-                            ub_dst, GNUNET_BLOCK_TYPE_FS_UBLOCK,
-                            pkc->bo.content_priority, pkc->bo.anonymity_level,
-                            pkc->bo.replication_level, pkc->bo.expiration_time,
-                            -2, 1, GNUNET_CONSTANTS_SERVICE_TIMEOUT,
-                            &kb_put_cont, pkc);
+  pkc->uc = GNUNET_FS_publish_ublock_ (pkc->h,
+                                       pkc->dsh,
+                                       keyword, NULL,
+                                       GNUNET_CRYPTO_ecc_key_get_anonymous (),
+                                       pkc->meta,
+                                       pkc->uri,
+                                       &pkc->bo,
+                                       pkc->options,
+                                       &kb_put_cont, pkc);
 }
 
 
@@ -267,17 +201,15 @@ GNUNET_FS_publish_ksk (struct GNUNET_FS_Handle *h,
                        GNUNET_FS_PublishContinuation cont, void *cont_cls)
 {
   struct GNUNET_FS_PublishKskContext *pkc;
-  char *uris;
-  size_t size;
-  char *kbe;
-  char *sptr;
 
   GNUNET_assert (NULL != uri);
-  pkc = GNUNET_malloc (sizeof (struct GNUNET_FS_PublishKskContext));
+  pkc = GNUNET_new (struct GNUNET_FS_PublishKskContext);
   pkc->h = h;
   pkc->bo = *bo;
+  pkc->options = options;
   pkc->cont = cont;
   pkc->cont_cls = cont_cls;
+  pkc->meta = GNUNET_CONTAINER_meta_data_duplicate (meta);
   if (0 == (options & GNUNET_FS_PUBLISH_OPTION_SIMULATE_ONLY))
   {
     pkc->dsh = GNUNET_DATASTORE_connect (h->cfg);
@@ -288,44 +220,7 @@ GNUNET_FS_publish_ksk (struct GNUNET_FS_Handle *h,
       return NULL;
     }
   }
-  if (meta == NULL)
-    pkc->mdsize = 0;
-  else
-    pkc->mdsize = GNUNET_CONTAINER_meta_data_get_serialized_size (meta);
-  GNUNET_assert (pkc->mdsize >= 0);
-  uris = GNUNET_FS_uri_to_string (uri);
-  pkc->slen = strlen (uris) + 1;
-  size = pkc->mdsize + sizeof (struct UBlock) + pkc->slen + 1;
-  if (size > MAX_UBLOCK_SIZE)
-  {
-    size = MAX_UBLOCK_SIZE;
-    pkc->mdsize = size - sizeof (struct UBlock) - pkc->slen + 1;
-  }
-  pkc->ub = GNUNET_malloc (size);
-  kbe = (char *) &pkc->ub[1];
-  kbe++; /* leave one '\0' for the update identifier */
-  memcpy (kbe, uris, pkc->slen);
-  GNUNET_free (uris);
-  sptr = &kbe[pkc->slen];
-  if (meta != NULL)
-    pkc->mdsize =
-        GNUNET_CONTAINER_meta_data_serialize (meta, &sptr, pkc->mdsize,
-                                              GNUNET_CONTAINER_META_DATA_SERIALIZE_PART);
-  if (-1 == pkc->mdsize)
-  {
-    GNUNET_break (0);
-    GNUNET_free (pkc->ub);
-    if (NULL != pkc->dsh)
-    {
-      GNUNET_DATASTORE_disconnect (pkc->dsh, GNUNET_NO);
-      pkc->dsh = NULL;
-    }
-    GNUNET_free (pkc);
-    cont (cont_cls, NULL, _("Internal error."));
-    return NULL;
-  }
-  size = sizeof (struct UBlock) + pkc->slen + pkc->mdsize + 1;
-  pkc->cpy = GNUNET_malloc (size);
+  pkc->uri = GNUNET_FS_uri_dup (uri);
   pkc->ksk_uri = GNUNET_FS_uri_dup (ksk_uri);
   pkc->ksk_task = GNUNET_SCHEDULER_add_now (&publish_ksk_cont, pkc);
   return pkc;
@@ -345,19 +240,19 @@ GNUNET_FS_publish_ksk_cancel (struct GNUNET_FS_PublishKskContext *pkc)
     GNUNET_SCHEDULER_cancel (pkc->ksk_task);
     pkc->ksk_task = GNUNET_SCHEDULER_NO_TASK;
   }
-  if (NULL != pkc->qre)
+  if (NULL != pkc->uc)
   {
-    GNUNET_DATASTORE_cancel (pkc->qre);
-    pkc->qre = NULL;
+    GNUNET_FS_publish_ublock_cancel_ (pkc->uc);
+    pkc->uc = NULL;
   }
   if (NULL != pkc->dsh)
   {
     GNUNET_DATASTORE_disconnect (pkc->dsh, GNUNET_NO);
     pkc->dsh = NULL;
   }
-  GNUNET_free (pkc->cpy);
-  GNUNET_free (pkc->ub);
+  GNUNET_CONTAINER_meta_data_destroy (pkc->meta);
   GNUNET_FS_uri_destroy (pkc->ksk_uri);
+  GNUNET_FS_uri_destroy (pkc->uri);
   GNUNET_free (pkc);
 }