-enable mesh, as stream needs it, activate testcase

3 files changed, 25 insertions, 4 deletions

diff --git a/src/fs/gnunet-service-fs_pr.c b/src/fs/gnunet-service-fs_pr.c
index 6acc0e2bf..ecd841808 100644
--- a/src/fs/gnunet-service-fs_pr.c
+++ b/src/fs/gnunet-service-fs_pr.c
@@ -1175,11 +1175,23 @@ stream_reply_proc (void *cls,
   struct GNUNET_HashCode query;
 
   pr->stream_request = NULL;
+  if (GNUNET_BLOCK_TYPE_ANY == type)
+  {
+    GNUNET_break (NULL == data);
+    GNUNET_break (0 == data_size);
+    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+                "Error retrieiving block via stream\n");
+    /* FIXME: should re-try a few times... */
+    return;
+  }
   if (GNUNET_YES !=
       GNUNET_BLOCK_get_key (GSF_block_ctx,
                             type,
                             data, data_size, &query))
   {
+    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+                "Failed to derive key for block of type %d\n",
+                (int) type);
     GNUNET_break_op (0);
     return;
   }
@@ -1209,7 +1221,11 @@ GSF_stream_lookup_ (struct GSF_PendingRequest *pr)
   if (0 != pr->public_data.anonymity_level)
     return;
   if (0 == pr->public_data.target)
+  {
+    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+                "Cannot do stream-based download, target peer not known\n");
     return;
+  }
   if (NULL != pr->stream_request)
     return;
   pr->stream_request = GSF_stream_query (pr->public_data.target,
diff --git a/src/fs/test_fs_defaults.conf b/src/fs/test_fs_defaults.conf
index 001f24350..c2225f17c 100644
--- a/src/fs/test_fs_defaults.conf
+++ b/src/fs/test_fs_defaults.conf
@@ -67,9 +67,6 @@ HOSTKEYSFILE = ${DATADIR}/testing_hostkeys.dat
 QUOTA=65536
 DATABASE=sqlite
 
-[mesh]
-AUTOSTART = NO
-
 [dns]
 AUTOSTART = NO
 
diff --git a/src/fs/test_gnunet_service_fs_p2p_stream.conf b/src/fs/test_gnunet_service_fs_p2p_stream.conf
index 85c4e52fe..9d01208cb 100644
--- a/src/fs/test_gnunet_service_fs_p2p_stream.conf
+++ b/src/fs/test_gnunet_service_fs_p2p_stream.conf
@@ -5,4 +5,12 @@
 # testcase to truly work; however, as the code
 # is not finished, not setting the option should
 # allow the test to at least pass for now...
-# DISABLE_ANON_TRANSFER = YES
+DISABLE_ANON_TRANSFER = YES
+
+# Do we cache content from other nodes? (may improve anonymity)
+CONTENT_CACHING = NO
+
+# Do we send unsolicited data to other nodes if we have excess bandwidth?
+# (may improve anonymity, probably not a good idea if content_caching is NO)
+CONTENT_PUSHING = NO
+