From f71b28f067caf23942411128d1ceaee2550d022c Mon Sep 17 00:00:00 2001 From: Christian Grothoff Date: Thu, 15 Nov 2012 12:46:25 +0000 Subject: -make use of new IRRELEVANT status code --- src/fs/gnunet-service-fs_pr.c | 8 ++++++++ src/fs/plugin_block_fs.c | 7 +------ 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/src/fs/gnunet-service-fs_pr.c b/src/fs/gnunet-service-fs_pr.c index f65ed66a6..349232daf 100644 --- a/src/fs/gnunet-service-fs_pr.c +++ b/src/fs/gnunet-service-fs_pr.c @@ -842,6 +842,14 @@ process_reply (void *cls, const struct GNUNET_HashCode * key, void *value) 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: diff --git a/src/fs/plugin_block_fs.c b/src/fs/plugin_block_fs.c index 2e4f7ef87..8e90589cf 100644 --- a/src/fs/plugin_block_fs.c +++ b/src/fs/plugin_block_fs.c @@ -124,12 +124,7 @@ block_plugin_fs_evaluate (void *cls, enum GNUNET_BLOCK_Type type, 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); -- cgit v1.2.3