abs_value

diff --git a/src/fs/test_fs_download.c b/src/fs/test_fs_download.c
index a06054f6d9f8c09e95c1537b6b19900517b229d5..0d13b36397726c8a4e34fcba4df61bd8e02ba75f 100644 (file)
--- a/src/fs/test_fs_download.c
+++ b/src/fs/test_fs_download.c
@@ -29,7 +29,7 @@
 #include "gnunet_arm_service.h"
 #include "gnunet_fs_service.h"
 
-#define VERBOSE GNUNET_NO
+#define VERBOSE GNUNET_YES
 
 #define START_ARM GNUNET_YES
 
@@ -86,6 +86,8 @@ timeout_kill_task (void *cls,
       GNUNET_FS_publish_stop (publish);
       publish = NULL;
     }
+  GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+             "Timeout downloading file\n");
   timeout_kill = GNUNET_SCHEDULER_NO_TASK;
   err = 1;
 }
@@ -140,10 +142,10 @@ progress_cb (void *cls,
     case GNUNET_FS_STATUS_PUBLISH_PROGRESS:
 #if VERBOSE
       printf ("Publish is progressing (%llu/%llu at level %u off %llu)...\n",
-              (unsigned long long) event->abs_value.publish.completed,
-              (unsigned long long) event->abs_value.publish.size,
-             event->abs_value.publish.specifics.progress.depth,
-             (unsigned long long) event->abs_value.publish.specifics.progress.offset);
+              (unsigned long long) event->value.publish.completed,
+              (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:
@@ -173,10 +175,10 @@ progress_cb (void *cls,
       GNUNET_assert (download == event->value.download.dc);
 #if VERBOSE
       printf ("Download is progressing (%llu/%llu at level %u off %llu)...\n",
-              (unsigned long long) event->abs_value.download.completed,
-              (unsigned long long) event->abs_value.download.size,
-             event->abs_value.download.specifics.progress.depth,
-             (unsigned long long) event->abs_value.download.specifics.progress.offset);
+              (unsigned long long) event->value.download.completed,
+              (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:

diff --git a/src/fs/test_fs_download_indexed.c b/src/fs/test_fs_download_indexed.c
index 6d1465cd1a2e42ac9dcbe5353f0aa4bf0b7bdefa..1a88ad80ef8ffed756f7d6e95ae4bbf5395f72d1 100644 (file)
--- a/src/fs/test_fs_download_indexed.c
+++ b/src/fs/test_fs_download_indexed.c
@@ -142,10 +142,10 @@ progress_cb (void *cls,
     case GNUNET_FS_STATUS_PUBLISH_PROGRESS:
 #if VERBOSE
       printf ("Publish is progressing (%llu/%llu at level %u off %llu)...\n",
-              (unsigned long long) event->abs_value.publish.completed,
-              (unsigned long long) event->abs_value.publish.size,
-             event->abs_value.publish.specifics.progress.depth,
-             (unsigned long long) event->abs_value.publish.specifics.progress.offset);
+              (unsigned long long) event->value.publish.completed,
+              (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:
@@ -175,10 +175,10 @@ progress_cb (void *cls,
       GNUNET_assert (download == event->value.download.dc);
 #if VERBOSE
       printf ("Download is progressing (%llu/%llu at level %u off %llu)...\n",
-              (unsigned long long) event->abs_value.download.completed,
-              (unsigned long long) event->abs_value.download.size,
-             event->abs_value.download.specifics.progress.depth,
-             (unsigned long long) event->abs_value.download.specifics.progress.offset);
+              (unsigned long long) event->value.download.completed,
+              (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:

diff --git a/src/fs/test_fs_download_persistence.c b/src/fs/test_fs_download_persistence.c
index 66d1199caff8d1df5760d83b0c0de725b53eb999..e00d5255d5671954b90d84e5cc3a8e698a28f625 100644 (file)
--- a/src/fs/test_fs_download_persistence.c
+++ b/src/fs/test_fs_download_persistence.c
@@ -176,10 +176,10 @@ progress_cb (void *cls,
     case GNUNET_FS_STATUS_PUBLISH_PROGRESS:
 #if VERBOSE
       printf ("Publish is progressing (%llu/%llu at level %u off %llu)...\n",
-              (unsigned long long) event->abs_value.publish.completed,
-              (unsigned long long) event->abs_value.publish.size,
-             event->abs_value.publish.specifics.progress.depth,
-             (unsigned long long) event->abs_value.publish.specifics.progress.offset);
+              (unsigned long long) event->value.publish.completed,
+              (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:
@@ -211,10 +211,10 @@ progress_cb (void *cls,
       GNUNET_assert (download == event->value.download.dc);
 #if VERBOSE
       printf ("Download is progressing (%llu/%llu at level %u off %llu)...\n",
-              (unsigned long long) event->abs_value.download.completed,
-              (unsigned long long) event->abs_value.download.size,
-             event->abs_value.download.specifics.progress.depth,
-             (unsigned long long) event->abs_value.download.specifics.progress.offset);
+              (unsigned long long) event->value.download.completed,
+              (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:

diff --git a/src/fs/test_fs_list_indexed.c b/src/fs/test_fs_list_indexed.c
index 206e58bafeb26c321dea04a0c6b8703b930b7af1..ec3d6fecd33bb277ad9ae532a1faf53762f0d061 100644 (file)
--- a/src/fs/test_fs_list_indexed.c
+++ b/src/fs/test_fs_list_indexed.c
@@ -125,10 +125,10 @@ progress_cb (void *cls,
       GNUNET_assert (publish == event->value.publish.pc);
 #if VERBOSE
       printf ("Publish is progressing (%llu/%llu at level %u off %llu)...\n",
-              (unsigned long long) event->abs_value.publish.completed,
-              (unsigned long long) event->abs_value.publish.size,
-             event->abs_value.publish.specifics.progress.depth,
-             (unsigned long long) event->abs_value.publish.specifics.progress.offset);
+              (unsigned long long) event->value.publish.completed,
+              (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_ERROR:

diff --git a/src/fs/test_fs_publish.c b/src/fs/test_fs_publish.c
index 327fa5a69a4dbcf069e87143bebcb09d267501ca..99d4b6710388c9d1325bf14ae4995178fbc0e8ef 100644 (file)
--- a/src/fs/test_fs_publish.c
+++ b/src/fs/test_fs_publish.c
@@ -110,10 +110,10 @@ progress_cb (void *cls,
       GNUNET_assert (publish == event->value.publish.pc);
 #if VERBOSE
       printf ("Publish is progressing (%llu/%llu at level %u off %llu)...\n",
-              (unsigned long long) event->abs_value.publish.completed,
-              (unsigned long long) event->abs_value.publish.size,
-             event->abs_value.publish.specifics.progress.depth,
-             (unsigned long long) event->abs_value.publish.specifics.progress.offset);
+              (unsigned long long) event->value.publish.completed,
+              (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_ERROR:

diff --git a/src/fs/test_fs_publish_persistence.c b/src/fs/test_fs_publish_persistence.c
index 52b2b270e6fd1c7d424ba69f4733fb38ce02786a..4a84bf9dc7c4991b8321e23ddff9e79fb8a3456f 100644 (file)
--- a/src/fs/test_fs_publish_persistence.c
+++ b/src/fs/test_fs_publish_persistence.c
@@ -157,10 +157,10 @@ progress_cb (void *cls,
       GNUNET_assert (publish == event->value.publish.pc);
 #if VERBOSE
       printf ("Publish is progressing (%llu/%llu at level %u off %llu)...\n",
-              (unsigned long long) event->abs_value.publish.completed,
-              (unsigned long long) event->abs_value.publish.size,
-             event->abs_value.publish.specifics.progress.depth,
-             (unsigned long long) event->abs_value.publish.specifics.progress.offset);
+              (unsigned long long) event->value.publish.completed,
+              (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_SUSPEND:

diff --git a/src/fs/test_fs_search.c b/src/fs/test_fs_search.c
index b003b75e1a86127f684ea6a3fe124a0ef6d14efc..2544b8a6e73140919ff2677bc5a0eacbb42d8fe2 100644 (file)
--- a/src/fs/test_fs_search.c
+++ b/src/fs/test_fs_search.c
@@ -101,10 +101,10 @@ progress_cb (void *cls,
     case GNUNET_FS_STATUS_PUBLISH_PROGRESS:
 #if VERBOSE
       printf ("Publish is progressing (%llu/%llu at level %u off %llu)...\n",
-              (unsigned long long) event->abs_value.publish.completed,
-              (unsigned long long) event->abs_value.publish.size,
-             event->abs_value.publish.specifics.progress.depth,
-             (unsigned long long) event->abs_value.publish.specifics.progress.offset);
+              (unsigned long long) event->value.publish.completed,
+              (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:

diff --git a/src/fs/test_fs_search_persistence.c b/src/fs/test_fs_search_persistence.c
index 4def3fe6a3234f47a9b0fa0f9c8a75ac692edd1f..e2a213cd86adfe682f1fb04e8f0e216b59035b54 100644 (file)
--- a/src/fs/test_fs_search_persistence.c
+++ b/src/fs/test_fs_search_persistence.c
@@ -146,10 +146,10 @@ progress_cb (void *cls,
     case GNUNET_FS_STATUS_PUBLISH_PROGRESS:
 #if VERBOSE
       printf ("Publish is progressing (%llu/%llu at level %u off %llu)...\n",
-              (unsigned long long) event->abs_value.publish.completed,
-              (unsigned long long) event->abs_value.publish.size,
-             event->abs_value.publish.specifics.progress.depth,
-             (unsigned long long) event->abs_value.publish.specifics.progress.offset);
+              (unsigned long long) event->value.publish.completed,
+              (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:

diff --git a/src/fs/test_fs_unindex.c b/src/fs/test_fs_unindex.c
index e2c0e86ee9d2d188625036d826463a3e6d026632..82d4cdcf705b22b2ada07eb07fe480eb7c770d1e 100644 (file)
--- a/src/fs/test_fs_unindex.c
+++ b/src/fs/test_fs_unindex.c
@@ -100,10 +100,10 @@ progress_cb (void *cls,
     case GNUNET_FS_STATUS_PUBLISH_PROGRESS:
 #if VERBOSE
       printf ("Publish is progressing (%llu/%llu at level %u off %llu)...\n",
-              (unsigned long long) event->abs_value.publish.completed,
-              (unsigned long long) event->abs_value.publish.size,
-             event->abs_value.publish.specifics.progress.depth,
-             (unsigned long long) event->abs_value.publish.specifics.progress.offset);
+              (unsigned long long) event->value.publish.completed,
+              (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:
@@ -126,10 +126,10 @@ progress_cb (void *cls,
       GNUNET_assert (unindex == event->value.unindex.uc);
 #if VERBOSE
       printf ("Unindex is progressing (%llu/%llu at level %u off %llu)...\n",
-              (unsigned long long) event->abs_value.unindex.completed,
-              (unsigned long long) event->abs_value.unindex.size,
-             event->abs_value.unindex.specifics.progress.depth,
-             (unsigned long long) event->abs_value.unindex.specifics.progress.offset);
+              (unsigned long long) event->value.unindex.completed,
+              (unsigned long long) event->value.unindex.size,
+             event->value.unindex.specifics.progress.depth,
+             (unsigned long long) event->value.unindex.specifics.progress.offset);
 #endif
       break;
     case GNUNET_FS_STATUS_PUBLISH_ERROR:

diff --git a/src/fs/test_fs_unindex_persistence.c b/src/fs/test_fs_unindex_persistence.c
index eec181544e0257b4e88e4018efe7f76ea263bc6f..162dd59af5ac2d65433deeb7a7272e13a47a8879 100644 (file)
--- a/src/fs/test_fs_unindex_persistence.c
+++ b/src/fs/test_fs_unindex_persistence.c
@@ -147,10 +147,10 @@ progress_cb (void *cls,
     case GNUNET_FS_STATUS_PUBLISH_PROGRESS:
 #if VERBOSE
       printf ("Publish is progressing (%llu/%llu at level %u off %llu)...\n",
-              (unsigned long long) event->abs_value.publish.completed,
-              (unsigned long long) event->abs_value.publish.size,
-             event->abs_value.publish.specifics.progress.depth,
-             (unsigned long long) event->abs_value.publish.specifics.progress.offset);
+              (unsigned long long) event->value.publish.completed,
+              (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:
@@ -174,10 +174,10 @@ progress_cb (void *cls,
       GNUNET_assert (unindex == event->value.unindex.uc);
 #if VERBOSE
       printf ("Unindex is progressing (%llu/%llu at level %u off %llu)...\n",
-              (unsigned long long) event->abs_value.unindex.completed,
-              (unsigned long long) event->abs_value.unindex.size,
-             event->abs_value.unindex.specifics.progress.depth,
-             (unsigned long long) event->abs_value.unindex.specifics.progress.offset);
+              (unsigned long long) event->value.unindex.completed,
+              (unsigned long long) event->value.unindex.size,
+             event->value.unindex.specifics.progress.depth,
+             (unsigned long long) event->value.unindex.specifics.progress.offset);
 #endif
       break;
     case GNUNET_FS_STATUS_PUBLISH_SUSPEND: