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

[gnunet]

Author: grothoff
Date: 2009-10-18 14:47:42 -0600 (Sun, 18 Oct 2009)
New Revision: 9182

Modified:
   gnunet/src/fs/fs_tree.c
   gnunet/src/fs/test_fs_download.c
Log:
fixes

Modified: gnunet/src/fs/fs_tree.c
===================================================================
--- gnunet/src/fs/fs_tree.c     2009-10-18 20:34:09 UTC (rev 9181)
+++ gnunet/src/fs/fs_tree.c     2009-10-18 20:47:42 UTC (rev 9182)
@@ -250,7 +250,6 @@
                                  corresponds to */
   for (i=0;i<height;i++)
     bds *= CHK_PER_INODE;
-  GNUNET_assert (0 == (offset % bds));
   ret = offset / bds;
   return ret % CHK_PER_INODE; 
 }
@@ -312,6 +311,19 @@
                             &sk,
                             &iv,
                             enc);
+  if (0 == te->current_depth)
+    {
+      te->uri = GNUNET_malloc (sizeof(struct GNUNET_FS_Uri));
+      te->uri->type = chk;
+      te->uri->data.chk.chk = te->chk_tree[0];
+      te->uri->data.chk.file_length = GNUNET_htonll (te->size);
+      GNUNET_SCHEDULER_add_continuation (te->h->sched,
+                                        GNUNET_NO,
+                                        te->cont,
+                                        te->cls,
+                                        GNUNET_SCHEDULER_REASON_PREREQ_DONE);
+      return;
+    }
   if (NULL != te->proc)
     te->proc (te->cls,
              &mychk->query,
@@ -343,18 +355,6 @@
       else
        te->current_depth = te->chk_tree_depth;
     }
-  if (0 == te->current_depth)
-    {
-      te->uri = GNUNET_malloc (sizeof(struct GNUNET_FS_Uri));
-      te->uri->type = chk;
-      te->uri->data.chk.chk = te->chk_tree[0];
-      te->uri->data.chk.file_length = GNUNET_htonll (te->size);
-      GNUNET_SCHEDULER_add_continuation (te->h->sched,
-                                        GNUNET_NO,
-                                        te->cont,
-                                        te->cls,
-                                        GNUNET_SCHEDULER_REASON_PREREQ_DONE);
-    }
 }
 
 

Modified: gnunet/src/fs/test_fs_download.c
===================================================================
--- gnunet/src/fs/test_fs_download.c    2009-10-18 20:34:09 UTC (rev 9181)
+++ gnunet/src/fs/test_fs_download.c    2009-10-18 20:47:42 UTC (rev 9182)
@@ -96,17 +96,22 @@
     {
     case GNUNET_FS_STATUS_PUBLISH_PROGRESS:
 #if DEBUG_VERBOSE
-      printf ("Publish is progressing (%llu/%llu)...\n",
+      printf ("Publish is progressing (%llu/%llu at level %u off %llu)...\n",
               (unsigned long long) event->value.publish.completed,
-              (unsigned long long) event->value.publish.size);
+              (unsigned long long) event->value.publish.size,
+             event->value.publish.specifics.progress.depth,
+             (unsigned long long) 
event->value.publish.specifics.progress.offset);
 #endif
       break;
     case GNUNET_FS_STATUS_PUBLISH_COMPLETED:
 #if DEBUG_VERBOSE
       printf ("Publish complete.\n");
 #endif
-      GNUNET_FS_publish_stop (publish);
-      publish = NULL;
+      GNUNET_SCHEDULER_add_continuation (sched,
+                                        GNUNET_NO,
+                                        &abort_publish_task,
+                                        NULL,
+                                        GNUNET_SCHEDULER_REASON_PREREQ_DONE);
       fn = GNUNET_DISK_mktemp ("gnunet-download-test-dstXXXXXX");
       download = GNUNET_FS_download_start (fs,
                                           
event->value.publish.specifics.completed.chk_uri,
@@ -123,14 +128,19 @@
 #if DEBUG_VERBOSE
       printf ("Download complete.\n");
 #endif
-      GNUNET_FS_download_stop (download, GNUNET_YES);
-      download = NULL;
+      GNUNET_SCHEDULER_add_continuation (sched,
+                                        GNUNET_NO,
+                                        &abort_download_task,
+                                        NULL,
+                                        GNUNET_SCHEDULER_REASON_PREREQ_DONE);
       break;
     case GNUNET_FS_STATUS_DOWNLOAD_PROGRESS:
 #if DEBUG_VERBOSE
-      printf ("Download is progressing (%llu/%llu)...\n",
+      printf ("Download is progressing (%llu/%llu at level %u off %llu)...\n",
               (unsigned long long) event->value.download.completed,
-              (unsigned long long) event->value.download.size);
+              (unsigned long long) event->value.download.size,
+             event->value.download.specifics.progress.depth,
+             (unsigned long long) 
event->value.download.specifics.progress.offset);
 #endif
       break;
     case GNUNET_FS_STATUS_PUBLISH_ERROR: