Added GNUNET_BLOCK_EVALUATION_RESULT_IRRELEVANT

5 files changed, 24 insertions, 5 deletions

diff --git a/src/dht/gnunet-service-dht_clients.c b/src/dht/gnunet-service-dht_clients.c
index 593674569..f3539dab9 100644
--- a/src/dht/gnunet-service-dht_clients.c
+++ b/src/dht/gnunet-service-dht_clients.c
@@ -1058,6 +1058,8 @@ forward_reply (void *cls, const struct GNUNET_HashCode * key, void *value)
   case GNUNET_BLOCK_EVALUATION_REQUEST_INVALID:
     GNUNET_break (0);
     return GNUNET_NO;
+  case GNUNET_BLOCK_EVALUATION_RESULT_IRRELEVANT:
+    return GNUNET_YES;
   case GNUNET_BLOCK_EVALUATION_TYPE_NOT_SUPPORTED:
     GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
                 _("Unsupported block type (%u) in request!\n"), record->type);
diff --git a/src/dht/gnunet-service-dht_datacache.c b/src/dht/gnunet-service-dht_datacache.c
index 4768c14fd..87c93f559 100644
--- a/src/dht/gnunet-service-dht_datacache.c
+++ b/src/dht/gnunet-service-dht_datacache.c
@@ -176,6 +176,12 @@ datacache_get_iterator (void *cls,
                               ("# Invalid RESULTS found in datacache"), 1,
                               GNUNET_NO);
     break;
+  case GNUNET_BLOCK_EVALUATION_RESULT_IRRELEVANT:
+    GNUNET_STATISTICS_update (GDS_stats,
+                              gettext_noop
+                              ("# Irrelevant RESULTS found in datacache"), 1,
+                              GNUNET_NO);
+    break;
   case GNUNET_BLOCK_EVALUATION_REQUEST_VALID:
     GNUNET_break (0);
     break;
diff --git a/src/dht/gnunet-service-dht_routing.c b/src/dht/gnunet-service-dht_routing.c
index 4c2e69b36..1f2b2a516 100644
--- a/src/dht/gnunet-service-dht_routing.c
+++ b/src/dht/gnunet-service-dht_routing.c
@@ -226,6 +226,12 @@ process (void *cls, const struct GNUNET_HashCode * key, void *value)
                               ("# Invalid REPLIES matched against routing table"),
                               1, GNUNET_NO);
     return GNUNET_SYSERR;
+  case GNUNET_BLOCK_EVALUATION_RESULT_IRRELEVANT:
+    GNUNET_STATISTICS_update (GDS_stats,
+                              gettext_noop
+                              ("# Irrelevant REPLIES matched against routing table"),
+                              1, GNUNET_NO);
+    return GNUNET_OK;
   case GNUNET_BLOCK_EVALUATION_REQUEST_VALID:
     GNUNET_break (0);
     return GNUNET_OK;
diff --git a/src/include/gnunet_block_lib.h b/src/include/gnunet_block_lib.h
index 90a3549b1..cd4b2a0ac 100644
--- a/src/include/gnunet_block_lib.h
+++ b/src/include/gnunet_block_lib.h
@@ -148,21 +148,26 @@ enum GNUNET_BLOCK_EvaluationResult
   GNUNET_BLOCK_EVALUATION_RESULT_INVALID = 3,
 
     /**
+     * Block does not match xquery (valid result, not relevant for the request)
+     */
+  GNUNET_BLOCK_EVALUATION_RESULT_IRRELEVANT = 4,
+
+    /**
      * Query is valid, no reply given.
      */
-  GNUNET_BLOCK_EVALUATION_REQUEST_VALID = 4,
+  GNUNET_BLOCK_EVALUATION_REQUEST_VALID = 10,
 
     /**
      * Query format does not match block type (invalid query).  For
      * example, xquery not given or xquery_size not appropriate for
      * type.
      */
-  GNUNET_BLOCK_EVALUATION_REQUEST_INVALID = 5,
+  GNUNET_BLOCK_EVALUATION_REQUEST_INVALID = 11,
 
     /**
      * Specified block type not supported by this plugin.
      */
-  GNUNET_BLOCK_EVALUATION_TYPE_NOT_SUPPORTED = 6
+  GNUNET_BLOCK_EVALUATION_TYPE_NOT_SUPPORTED = 20
 };
 
 
diff --git a/src/mesh/plugin_block_mesh.c b/src/mesh/plugin_block_mesh.c
index 2b5067fac..a8ac085a0 100644
--- a/src/mesh/plugin_block_mesh.c
+++ b/src/mesh/plugin_block_mesh.c
@@ -138,11 +138,11 @@ block_plugin_mesh_evaluate (void *cls, enum GNUNET_BLOCK_Type type,
       {
         case GNUNET_SYSERR:
           GNUNET_break_op(0);
-          /* fall thru */
+          return GNUNET_BLOCK_EVALUATION_RESULT_INVALID;
         case GNUNET_NO:
           GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
                       "BLOCK XQUERY %s not accepted\n", xquery);
-          return GNUNET_BLOCK_EVALUATION_RESULT_INVALID;
+          return GNUNET_BLOCK_EVALUATION_RESULT_IRRELEVANT;
         default:
           GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
                       "BLOCK XQUERY %s accepted\n", xquery);