[GNUnet-SVN] r19852 - gnunet/src/fs

[gnunet]

Author: grothoff
Date: 2012-02-18 22:57:14 +0100 (Sat, 18 Feb 2012)
New Revision: 19852

Modified:
   gnunet/src/fs/fs_api.c
   gnunet/src/fs/fs_publish.c
Log:
-sync after getting URI on publishing to resume properly; also bugfix...

Modified: gnunet/src/fs/fs_api.c
===================================================================
--- gnunet/src/fs/fs_api.c      2012-02-18 21:37:48 UTC (rev 19851)
+++ gnunet/src/fs/fs_api.c      2012-02-18 21:57:14 UTC (rev 19852)
@@ -676,13 +676,13 @@
   filename = NULL;
   if ((GNUNET_OK != GNUNET_BIO_read_meta_data (rh, "metadata", &ret->meta)) ||
       (GNUNET_OK != GNUNET_BIO_read_string (rh, "ksk-uri", &ksks, 32 * 1024)) 
||
-      ((ksks != NULL) &&
-       (NULL == (ret->keywords = GNUNET_FS_uri_parse (ksks, NULL)))) ||
-      (GNUNET_YES != GNUNET_FS_uri_test_ksk (ret->keywords)) ||
+      ( (NULL != ksks) &&
+       ( (NULL == (ret->keywords = GNUNET_FS_uri_parse (ksks, NULL))) ||
+         (GNUNET_YES != GNUNET_FS_uri_test_ksk (ret->keywords)) ) ) ||
       (GNUNET_OK != GNUNET_BIO_read_string (rh, "chk-uri", &chks, 1024)) ||
-      ((chks != NULL) &&
-       ((NULL == (ret->chk_uri = GNUNET_FS_uri_parse (chks, NULL))) ||
-        (GNUNET_YES != GNUNET_FS_uri_test_chk (ret->chk_uri)))) ||
+      ( (NULL != chks) &&
+       ( (NULL == (ret->chk_uri = GNUNET_FS_uri_parse (chks, NULL))) ||
+         (GNUNET_YES != GNUNET_FS_uri_test_chk (ret->chk_uri))) ) ||
       (GNUNET_OK != read_start_time (rh, &ret->start_time)) ||
       (GNUNET_OK != GNUNET_BIO_read_string (rh, "emsg", &ret->emsg, 16 * 1024))
       || (GNUNET_OK !=

Modified: gnunet/src/fs/fs_publish.c
===================================================================
--- gnunet/src/fs/fs_publish.c  2012-02-18 21:37:48 UTC (rev 19851)
+++ gnunet/src/fs/fs_publish.c  2012-02-18 21:57:14 UTC (rev 19852)
@@ -388,6 +388,7 @@
   p = pc->fi_pos;
   GNUNET_FS_tree_encoder_finish (p->te, &p->chk_uri, &emsg);
   p->te = NULL;
+  GNUNET_FS_file_information_sync_ (p);
   if (NULL != emsg)
   {
     GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Error during tree walk: %s\n", emsg);