fix

[oweals/gnunet.git] / src / fs / fs_publish.c

diff --git a/src/fs/fs_publish.c b/src/fs/fs_publish.c
index aa7f794be2124ceff4c839553f9540dc43388b9f..2ebb96169c5933855d18be38bfc3b332cc1b293c 100644 (file)
--- a/src/fs/fs_publish.c
+++ b/src/fs/fs_publish.c
@@ -85,7 +85,7 @@ GNUNET_FS_publish_make_status_ (struct GNUNET_FS_ProgressInfo *pi,
                                const struct GNUNET_FS_FileInformation *p,
                                uint64_t offset)
 {
-  pi->value.publish.sc = sc;
+  pi->value.publish.pc = sc;
   pi->value.publish.fi = p;
   pi->value.publish.cctx
     = p->client_info;
@@ -109,11 +109,15 @@ GNUNET_FS_publish_make_status_ (struct GNUNET_FS_ProgressInfo *pi,
 /**
  * Cleanup the publish context, we're done with it.
  *
- * @param pc struct to clean up after
+ * @param cls struct to clean up after
+ * @param tc scheduler context
  */
 static void
-publish_cleanup (struct GNUNET_FS_PublishContext *pc)
+publish_cleanup (void *cls,
+                const struct GNUNET_SCHEDULER_TaskContext *tc)
 {
+  struct GNUNET_FS_PublishContext *pc = cls;
+
   GNUNET_FS_file_information_destroy (pc->fi, NULL, NULL);
   if (pc->namespace != NULL)
     GNUNET_FS_namespace_delete (pc->namespace, GNUNET_NO);
@@ -121,7 +125,10 @@ publish_cleanup (struct GNUNET_FS_PublishContext *pc)
   GNUNET_free_non_null (pc->nuid);
   GNUNET_free_non_null (pc->serialization);
   if (pc->dsh != NULL)
-    GNUNET_DATASTORE_disconnect (pc->dsh, GNUNET_NO);
+    {
+      GNUNET_DATASTORE_disconnect (pc->dsh, GNUNET_NO);
+      pc->dsh = NULL;
+    }
   if (pc->client != NULL)
     GNUNET_CLIENT_disconnect (pc->client, GNUNET_NO);
   GNUNET_free (pc);
@@ -146,9 +153,11 @@ ds_put_cont (void *cls,
 
   if (GNUNET_SYSERR == pcc->sc->in_network_wait)
     {
-      /* we were aborted in the meantime,
-        finish shutdown! */
-      publish_cleanup (pcc->sc);
+      /* we were aborted in the meantime, finish shutdown! */
+      GNUNET_SCHEDULER_add_continuation (pcc->sc->h->sched,                                     
+                                        &publish_cleanup,
+                                        pcc->sc,
+                                        GNUNET_SCHEDULER_REASON_PREREQ_DONE);
       GNUNET_free (pcc);
       return;
     }
@@ -295,6 +304,11 @@ publish_kblocks_cont (void *cls,
 
   if (NULL != emsg)
     {
+#if DEBUG_PUBLISH
+      GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+                 "Error uploading KSK blocks: %s\n",
+                 emsg);
+#endif
       signal_publish_error (p, pc, emsg);
       GNUNET_FS_file_information_sync_ (p);
       GNUNET_FS_publish_sync_ (pc);
@@ -305,6 +319,10 @@ publish_kblocks_cont (void *cls,
                                              pc);
       return;
     }
+#if DEBUG_PUBLISH
+  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+             "KSK blocks published, moving on to next file\n");
+#endif
   if (NULL != p->dir)
     signal_publish_completion (p, pc);    
   /* move on to next file */
@@ -391,7 +409,7 @@ encode_cont (void *cls,
   struct GNUNET_FS_FileInformation *p;
   struct GNUNET_FS_ProgressInfo pi;
   char *emsg;
-  
+
   p = sc->fi_pos;
   GNUNET_FS_tree_encoder_finish (p->te,
                                 &p->chk_uri,
@@ -399,6 +417,11 @@ encode_cont (void *cls,
   p->te = NULL;
   if (NULL != emsg)
     {
+#if DEBUG_PUBLISH
+      GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+                 "Error during tree walk: %s\n",
+                 emsg);
+#endif
       GNUNET_asprintf (&p->emsg, 
                       _("Upload failed: %s"),
                       emsg);
@@ -408,6 +431,10 @@ encode_cont (void *cls,
       pi.value.publish.specifics.error.message = p->emsg;
       p->client_info =  GNUNET_FS_publish_make_status_ (&pi, sc, p, 0);
     }
+#if DEBUG_PUBLISH
+  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+             "Finished with tree encoder\n");
+#endif  
   /* continue with main */
   sc->upload_task 
     = GNUNET_SCHEDULER_add_with_priority (sc->h->sched,
@@ -446,6 +473,10 @@ block_proc (void *cls,
   p = sc->fi_pos;
   if (NULL == sc->dsh)
     {
+#if DEBUG_PUBLISH
+      GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+                 "Waiting for datastore connection\n");
+#endif
       sc->upload_task
        = GNUNET_SCHEDULER_add_with_priority (sc->h->sched,
                                              GNUNET_SCHEDULER_PRIORITY_BACKGROUND,
@@ -566,6 +597,10 @@ publish_content (struct GNUNET_FS_PublishContext *sc)
     {
       if (p->is_directory)
        {
+#if DEBUG_PUBLISH
+         GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+                     "Creating directory\n");
+#endif
          db = GNUNET_FS_directory_builder_create (p->meta);
          dirpos = p->data.dir.entries;
          while (NULL != dirpos)
@@ -611,6 +646,10 @@ publish_content (struct GNUNET_FS_PublishContext *sc)
       size = (p->is_directory) 
        ? p->data.dir.dir_size 
        : p->data.file.file_size;
+#if DEBUG_PUBLISH
+      GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+                 "Creating tree encoder\n");
+#endif
       p->te = GNUNET_FS_tree_encoder_create (sc->h,
                                             size,
                                             sc,
@@ -620,6 +659,10 @@ publish_content (struct GNUNET_FS_PublishContext *sc)
                                             &encode_cont);
 
     }
+#if DEBUG_PUBLISH
+  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+             "Processing next block from tree\n");
+#endif
   GNUNET_FS_tree_encoder_next (p->te);
 }
 
@@ -716,6 +759,7 @@ hash_for_index_cb (void *cls,
       return;
     }
   fn = GNUNET_STRINGS_filename_expand (p->filename);
+  GNUNET_assert (fn != NULL);
   slen = strlen (fn) + 1;
   if (slen > GNUNET_SERVER_MAX_MESSAGE_SIZE - sizeof(struct IndexStartMessage))
     {
@@ -732,7 +776,7 @@ hash_for_index_cb (void *cls,
 #if DEBUG_PUBLISH
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
              "Hash of indexed file `%s' is `%s'\n",
-             p->data.file.filename,
+             p->filename,
              GNUNET_h2s (res));
 #endif
   client = GNUNET_CLIENT_connect (sc->h->sched,
@@ -810,6 +854,10 @@ GNUNET_FS_publish_main_ (void *cls,
   p = pc->fi_pos;
   if (NULL == p)
     {
+#if DEBUG_PUBLISH
+      GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+                 "Upload complete, now publishing SKS and KSK blocks.\n");
+#endif
       /* upload of entire hierarchy complete,
         publish namespace entries */
       GNUNET_FS_publish_sync_ (pc);
@@ -829,6 +877,11 @@ GNUNET_FS_publish_main_ (void *cls,
   /* abort on error */
   if (NULL != p->emsg)
     {
+#if DEBUG_PUBLISH
+      GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+                 "Error uploading: %s\n",
+                 p->emsg);
+#endif
       /* error with current file, abort all
         related files as well! */
       while (NULL != p->dir)
@@ -862,6 +915,10 @@ GNUNET_FS_publish_main_ (void *cls,
   /* handle completion */
   if (NULL != p->chk_uri)
     {
+#if DEBUG_PUBLISH
+      GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+                 "File upload complete, now publishing KSK blocks.\n");
+#endif
       GNUNET_FS_publish_sync_ (pc);
       /* upload of "p" complete, publish KBlocks! */
       if (p->keywords != NULL)
@@ -931,6 +988,7 @@ GNUNET_FS_publish_main_ (void *cls,
  * @param uri pointer to the keywords that will be used for this entry (can be modified)
  * @param anonymity pointer to selected anonymity level (can be modified)
  * @param priority pointer to selected priority (can be modified)
+ * @param do_index should we index?
  * @param expirationTime pointer to selected expiration time (can be modified)
  * @param client_info pointer to client context set upon creation (can be modified)
  * @return GNUNET_OK to continue (always)
@@ -943,6 +1001,7 @@ fip_signal_start(void *cls,
                 struct GNUNET_FS_Uri **uri,
                 uint32_t *anonymity,
                 uint32_t *priority,
+                int *do_index,
                 struct GNUNET_TIME_Absolute *expirationTime,
                 void **client_info)
 {
@@ -967,6 +1026,7 @@ fip_signal_start(void *cls,
  * @param uri pointer to the keywords that will be used for this entry (can be modified)
  * @param anonymity pointer to selected anonymity level (can be modified)
  * @param priority pointer to selected priority (can be modified)
+ * @param do_index should we index?
  * @param expirationTime pointer to selected expiration time (can be modified)
  * @param client_info pointer to client context set upon creation (can be modified)
  * @return GNUNET_OK to continue (always)
@@ -979,6 +1039,7 @@ fip_signal_suspend(void *cls,
                   struct GNUNET_FS_Uri **uri,
                   uint32_t *anonymity,
                   uint32_t *priority,
+                  int *do_index,
                   struct GNUNET_TIME_Absolute *expirationTime,
                   void **client_info)
 {
@@ -992,6 +1053,11 @@ fip_signal_suspend(void *cls,
   pi.status = GNUNET_FS_STATUS_PUBLISH_SUSPEND;
   GNUNET_break (NULL == GNUNET_FS_publish_make_status_ (&pi, sc, fi, off));
   *client_info = NULL;
+  if (NULL != sc->dsh)
+    {
+      GNUNET_DATASTORE_disconnect (sc->dsh, GNUNET_NO);
+      sc->dsh = NULL;
+    }
   return GNUNET_OK;
 }
 
@@ -1016,9 +1082,10 @@ GNUNET_FS_publish_signal_suspend_ (void *cls)
                                      &fip_signal_suspend,
                                      pc);
   GNUNET_FS_end_top (pc->h, pc->top);
-  publish_cleanup (pc);
+  publish_cleanup (pc, NULL);
 }
 
+
 /**
  * Publish a file or directory.
  *
@@ -1097,6 +1164,7 @@ GNUNET_FS_publish_start (struct GNUNET_FS_Handle *h,
  * @param uri pointer to the keywords that will be used for this entry (can be modified)
  * @param anonymity pointer to selected anonymity level (can be modified)
  * @param priority pointer to selected priority (can be modified)
+ * @param do_index should we index?
  * @param expirationTime pointer to selected expiration time (can be modified)
  * @param client_info pointer to client context set upon creation (can be modified)
  * @return GNUNET_OK to continue (always)
@@ -1109,6 +1177,7 @@ fip_signal_stop(void *cls,
                struct GNUNET_FS_Uri **uri,
                uint32_t *anonymity,
                uint32_t *priority,
+               int *do_index,
                struct GNUNET_TIME_Absolute *expirationTime,
                void **client_info)
 {
@@ -1144,6 +1213,11 @@ void
 GNUNET_FS_publish_stop (struct GNUNET_FS_PublishContext *pc)
 {
   GNUNET_FS_end_top (pc->h, pc->top);
+  if (NULL != pc->dsh)
+    {
+      GNUNET_DATASTORE_disconnect (pc->dsh, GNUNET_NO);
+      pc->dsh = NULL;
+    }
   if (GNUNET_SCHEDULER_NO_TASK != pc->upload_task)
     {
       GNUNET_SCHEDULER_cancel (pc->h->sched, pc->upload_task);
@@ -1163,7 +1237,7 @@ GNUNET_FS_publish_stop (struct GNUNET_FS_PublishContext *pc)
       pc->in_network_wait = GNUNET_SYSERR;
       return;
     }
-  publish_cleanup (pc);
+  publish_cleanup (pc, NULL);
 }
 
 
@@ -1274,7 +1348,11 @@ kb_put_cont (void *cls,
 
   if (GNUNET_OK != success)
     {
-      GNUNET_DATASTORE_disconnect (pkc->dsh, GNUNET_NO);
+      if (NULL != pkc->dsh)
+       {
+         GNUNET_DATASTORE_disconnect (pkc->dsh, GNUNET_NO);
+         pkc->dsh = NULL;
+       }
       GNUNET_free (pkc->cpy);
       GNUNET_free (pkc->kb);
       pkc->cont (pkc->cont_cls,
@@ -1315,7 +1393,10 @@ publish_ksk_cont (void *cls,
        (NULL == pkc->dsh) )
     {
       if (NULL != pkc->dsh)
-       GNUNET_DATASTORE_disconnect (pkc->dsh, GNUNET_NO);
+       {
+         GNUNET_DATASTORE_disconnect (pkc->dsh, GNUNET_NO);
+         pkc->dsh = NULL;
+       }
       GNUNET_free (pkc->cpy);
       GNUNET_free (pkc->kb);
       pkc->cont (pkc->cont_cls,
@@ -1336,6 +1417,7 @@ publish_ksk_cont (void *cls,
                             &iv,
                             &pkc->cpy[1]);
   pk = GNUNET_CRYPTO_rsa_key_create_from_hash (&key);
+  GNUNET_assert (NULL != pk);
   GNUNET_CRYPTO_rsa_key_get_public (pk, &pkc->cpy->keyspace);
   GNUNET_CRYPTO_hash (&pkc->cpy->keyspace,
                      sizeof (struct GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded),
@@ -1441,7 +1523,10 @@ GNUNET_FS_publish_ksk (struct GNUNET_FS_Handle *h,
       GNUNET_break (0);
       GNUNET_free (pkc->kb);
       if (pkc->dsh != NULL)
-       GNUNET_DATASTORE_disconnect (pkc->dsh, GNUNET_NO);
+       {
+         GNUNET_DATASTORE_disconnect (pkc->dsh, GNUNET_NO);
+         pkc->dsh = NULL;
+       }
       cont (cont_cls, NULL, _("Internal error."));
       GNUNET_free (pkc);
       return;
@@ -1507,7 +1592,10 @@ sb_put_cont (void *cls,
   struct PublishSksContext *psc = cls;
 
   if (NULL != psc->dsh)
-    GNUNET_DATASTORE_disconnect (psc->dsh, GNUNET_NO);
+    {
+      GNUNET_DATASTORE_disconnect (psc->dsh, GNUNET_NO);
+      psc->dsh = NULL;
+    }
   if (GNUNET_OK != success)
     psc->cont (psc->cont_cls,
               NULL,
@@ -1674,7 +1762,6 @@ GNUNET_FS_publish_sks (struct GNUNET_FS_Handle *h,
                        GNUNET_CONSTANTS_SERVICE_TIMEOUT,
                        &sb_put_cont,
                        psc);
-
   GNUNET_free (sb);
   GNUNET_free (sb_enc);
 }