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

[gnunet]

Author: grothoff
Date: 2010-05-06 11:30:39 +0200 (Thu, 06 May 2010)
New Revision: 11212

Modified:
   gnunet/src/fs/fs.c
   gnunet/src/fs/fs_publish.c
Log:
dsh handling

Modified: gnunet/src/fs/fs.c
===================================================================
--- gnunet/src/fs/fs.c  2010-05-06 09:18:49 UTC (rev 11211)
+++ gnunet/src/fs/fs.c  2010-05-06 09:30:39 UTC (rev 11212)
@@ -1419,6 +1419,14 @@
          goto cleanup;
        }
     }
+  if ( (0 == (pc->options & GNUNET_FS_PUBLISH_OPTION_SIMULATE_ONLY)) &&
+       (GNUNET_YES != pc->all_done) )
+    {
+      pc->dsh = GNUNET_DATASTORE_connect (h->cfg,
+                                         h->sched);
+      if (NULL == pc->dsh)
+       goto cleanup;
+    } 
   if (fi_pos != NULL)
     {
       pc->fi_pos = find_file_position (pc->fi,

Modified: gnunet/src/fs/fs_publish.c
===================================================================
--- gnunet/src/fs/fs_publish.c  2010-05-06 09:18:49 UTC (rev 11211)
+++ gnunet/src/fs/fs_publish.c  2010-05-06 09:30:39 UTC (rev 11212)
@@ -120,7 +120,8 @@
   GNUNET_free_non_null (pc->nid);  
   GNUNET_free_non_null (pc->nuid);
   GNUNET_free_non_null (pc->serialization);
-  GNUNET_DATASTORE_disconnect (pc->dsh, GNUNET_NO);
+  if (pc->dsh != NULL)
+    GNUNET_DATASTORE_disconnect (pc->dsh, GNUNET_NO);
   if (pc->client != NULL)
     GNUNET_CLIENT_disconnect (pc->client, GNUNET_NO);
   GNUNET_free (pc);