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

[gnunet]

Author: grothoff
Date: 2012-11-15 13:46:25 +0100 (Thu, 15 Nov 2012)
New Revision: 24981

Modified:
   gnunet/src/fs/gnunet-service-fs_pr.c
   gnunet/src/fs/plugin_block_fs.c
Log:
-make use of new IRRELEVANT status code

Modified: gnunet/src/fs/gnunet-service-fs_pr.c
===================================================================
--- gnunet/src/fs/gnunet-service-fs_pr.c        2012-11-15 12:13:21 UTC (rev 
24980)
+++ gnunet/src/fs/gnunet-service-fs_pr.c        2012-11-15 12:46:25 UTC (rev 
24981)
@@ -842,6 +842,14 @@
     GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
                 "Duplicate response, discarding.\n");
     return GNUNET_YES;          /* duplicate */
+  case GNUNET_BLOCK_EVALUATION_RESULT_IRRELEVANT:
+    GNUNET_STATISTICS_update (GSF_stats,
+                              gettext_noop
+                              ("# irrelevant replies discarded"),
+                              1, GNUNET_NO);
+    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+                "Irrelevant response, ignoring.\n");
+    return GNUNET_YES;
   case GNUNET_BLOCK_EVALUATION_RESULT_INVALID:
     return GNUNET_YES;          /* wrong namespace */
   case GNUNET_BLOCK_EVALUATION_REQUEST_VALID:

Modified: gnunet/src/fs/plugin_block_fs.c
===================================================================
--- gnunet/src/fs/plugin_block_fs.c     2012-11-15 12:13:21 UTC (rev 24980)
+++ gnunet/src/fs/plugin_block_fs.c     2012-11-15 12:46:25 UTC (rev 24981)
@@ -124,12 +124,7 @@
                         sizeof (struct 
GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded),
                         &sh);
     if (0 != memcmp (nsid, &sh, sizeof (struct GNUNET_HashCode)))
-    {
-      GNUNET_log_from (GNUNET_ERROR_TYPE_WARNING, "block-fs",
-                       _
-                       ("Reply mismatched in terms of namespace.  
Discarded.\n"));
-      return GNUNET_BLOCK_EVALUATION_RESULT_INVALID;
-    }
+      return GNUNET_BLOCK_EVALUATION_RESULT_IRRELEVANT;
     if (NULL != bf)
     {
       GNUNET_CRYPTO_hash (reply_block, reply_block_size, &chash);