diff options
author | Christian Grothoff <christian@grothoff.org> | 2012-11-15 12:46:25 +0000 |
---|---|---|
committer | Christian Grothoff <christian@grothoff.org> | 2012-11-15 12:46:25 +0000 |
commit | f71b28f067caf23942411128d1ceaee2550d022c (patch) | |
tree | f2d53f66524ce6c4d24b6bdc7e66ee697d119f36 /src | |
parent | 3215b6b06bcbe0368bd468bc9ea18b09f617ea03 (diff) | |
download | gnunet-f71b28f067caf23942411128d1ceaee2550d022c.tar.gz gnunet-f71b28f067caf23942411128d1ceaee2550d022c.zip |
-make use of new IRRELEVANT status code
Diffstat (limited to 'src')
-rw-r--r-- | src/fs/gnunet-service-fs_pr.c | 8 | ||||
-rw-r--r-- | 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) | |||
842 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, | 842 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, |
843 | "Duplicate response, discarding.\n"); | 843 | "Duplicate response, discarding.\n"); |
844 | return GNUNET_YES; /* duplicate */ | 844 | return GNUNET_YES; /* duplicate */ |
845 | case GNUNET_BLOCK_EVALUATION_RESULT_IRRELEVANT: | ||
846 | GNUNET_STATISTICS_update (GSF_stats, | ||
847 | gettext_noop | ||
848 | ("# irrelevant replies discarded"), | ||
849 | 1, GNUNET_NO); | ||
850 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, | ||
851 | "Irrelevant response, ignoring.\n"); | ||
852 | return GNUNET_YES; | ||
845 | case GNUNET_BLOCK_EVALUATION_RESULT_INVALID: | 853 | case GNUNET_BLOCK_EVALUATION_RESULT_INVALID: |
846 | return GNUNET_YES; /* wrong namespace */ | 854 | return GNUNET_YES; /* wrong namespace */ |
847 | case GNUNET_BLOCK_EVALUATION_REQUEST_VALID: | 855 | 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, | |||
124 | sizeof (struct GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded), | 124 | sizeof (struct GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded), |
125 | &sh); | 125 | &sh); |
126 | if (0 != memcmp (nsid, &sh, sizeof (struct GNUNET_HashCode))) | 126 | if (0 != memcmp (nsid, &sh, sizeof (struct GNUNET_HashCode))) |
127 | { | 127 | return GNUNET_BLOCK_EVALUATION_RESULT_IRRELEVANT; |
128 | GNUNET_log_from (GNUNET_ERROR_TYPE_WARNING, "block-fs", | ||
129 | _ | ||
130 | ("Reply mismatched in terms of namespace. Discarded.\n")); | ||
131 | return GNUNET_BLOCK_EVALUATION_RESULT_INVALID; | ||
132 | } | ||
133 | if (NULL != bf) | 128 | if (NULL != bf) |
134 | { | 129 | { |
135 | GNUNET_CRYPTO_hash (reply_block, reply_block_size, &chash); | 130 | GNUNET_CRYPTO_hash (reply_block, reply_block_size, &chash); |