[GNUnet-SVN] r24945 - in gnunet/src: dht include mesh

[gnunet]

Author: bartpolot
Date: 2012-11-14 11:50:52 +0100 (Wed, 14 Nov 2012)
New Revision: 24945

Modified:
   gnunet/src/dht/gnunet-service-dht_clients.c
   gnunet/src/dht/gnunet-service-dht_datacache.c
   gnunet/src/dht/gnunet-service-dht_routing.c
   gnunet/src/include/gnunet_block_lib.h
   gnunet/src/mesh/plugin_block_mesh.c
Log:
Added GNUNET_BLOCK_EVALUATION_RESULT_IRRELEVANT

Modified: gnunet/src/dht/gnunet-service-dht_clients.c
===================================================================
--- gnunet/src/dht/gnunet-service-dht_clients.c 2012-11-14 10:45:14 UTC (rev 
24944)
+++ gnunet/src/dht/gnunet-service-dht_clients.c 2012-11-14 10:50:52 UTC (rev 
24945)
@@ -1058,6 +1058,8 @@
   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);

Modified: gnunet/src/dht/gnunet-service-dht_datacache.c
===================================================================
--- gnunet/src/dht/gnunet-service-dht_datacache.c       2012-11-14 10:45:14 UTC 
(rev 24944)
+++ gnunet/src/dht/gnunet-service-dht_datacache.c       2012-11-14 10:50:52 UTC 
(rev 24945)
@@ -176,6 +176,12 @@
                               ("# 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;

Modified: gnunet/src/dht/gnunet-service-dht_routing.c
===================================================================
--- gnunet/src/dht/gnunet-service-dht_routing.c 2012-11-14 10:45:14 UTC (rev 
24944)
+++ gnunet/src/dht/gnunet-service-dht_routing.c 2012-11-14 10:50:52 UTC (rev 
24945)
@@ -226,6 +226,12 @@
                               ("# 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;

Modified: gnunet/src/include/gnunet_block_lib.h
===================================================================
--- gnunet/src/include/gnunet_block_lib.h       2012-11-14 10:45:14 UTC (rev 
24944)
+++ gnunet/src/include/gnunet_block_lib.h       2012-11-14 10:50:52 UTC (rev 
24945)
@@ -148,21 +148,26 @@
   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
 };
 
 

Modified: gnunet/src/mesh/plugin_block_mesh.c
===================================================================
--- gnunet/src/mesh/plugin_block_mesh.c 2012-11-14 10:45:14 UTC (rev 24944)
+++ gnunet/src/mesh/plugin_block_mesh.c 2012-11-14 10:50:52 UTC (rev 24945)
@@ -138,11 +138,11 @@
       {
         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);