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

[gnunet]

Author: grothoff
Date: 2012-11-25 13:32:59 +0100 (Sun, 25 Nov 2012)
New Revision: 25130

Modified:
   gnunet/src/fs/gnunet-service-fs_pr.c
   gnunet/src/fs/test_fs_defaults.conf
   gnunet/src/fs/test_gnunet_service_fs_p2p_stream.conf
Log:
-enable mesh, as stream needs it, activate testcase

Modified: gnunet/src/fs/gnunet-service-fs_pr.c
===================================================================
--- gnunet/src/fs/gnunet-service-fs_pr.c        2012-11-25 12:31:00 UTC (rev 
25129)
+++ gnunet/src/fs/gnunet-service-fs_pr.c        2012-11-25 12:32:59 UTC (rev 
25130)
@@ -1175,11 +1175,23 @@
   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 @@
   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,

Modified: gnunet/src/fs/test_fs_defaults.conf
===================================================================
--- gnunet/src/fs/test_fs_defaults.conf 2012-11-25 12:31:00 UTC (rev 25129)
+++ gnunet/src/fs/test_fs_defaults.conf 2012-11-25 12:32:59 UTC (rev 25130)
@@ -67,9 +67,6 @@
 QUOTA=65536
 DATABASE=sqlite
 
-[mesh]
-AUTOSTART = NO
-
 [dns]
 AUTOSTART = NO
 

Modified: gnunet/src/fs/test_gnunet_service_fs_p2p_stream.conf
===================================================================
--- gnunet/src/fs/test_gnunet_service_fs_p2p_stream.conf        2012-11-25 
12:31:00 UTC (rev 25129)
+++ gnunet/src/fs/test_gnunet_service_fs_p2p_stream.conf        2012-11-25 
12:32:59 UTC (rev 25130)
@@ -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
+