revise block API to match latest DHT specs

6 files changed, 64 insertions, 178 deletions

diff --git a/src/dht/gnunet-service-dht_clients.c b/src/dht/gnunet-service-dht_clients.c
index 5735b2420..c50406ada 100644
--- a/src/dht/gnunet-service-dht_clients.c
+++ b/src/dht/gnunet-service-dht_clients.c
@@ -982,9 +982,6 @@ forward_reply (void *cls,
     /* should be impossible to encounter here */
     GNUNET_break (0);
     return GNUNET_YES;
-  case GNUNET_BLOCK_REPLY_INVALID:
-    GNUNET_break_op (0);
-    return GNUNET_NO;
   case GNUNET_BLOCK_REPLY_IRRELEVANT:
     return GNUNET_YES;
   default:
diff --git a/src/dht/gnunet-service-dht_datacache.c b/src/dht/gnunet-service-dht_datacache.c
index 91bdfe3da..be0a6db81 100644
--- a/src/dht/gnunet-service-dht_datacache.c
+++ b/src/dht/gnunet-service-dht_datacache.c
@@ -126,7 +126,7 @@ struct GetRequestContext
   /**
    * Return value to give back.
    */
-  enum GNUNET_BLOCK_EvaluationResult eval;
+  enum GNUNET_BLOCK_ReplyEvaluationResult eval;
 };
 
 
@@ -204,13 +204,6 @@ datacache_get_iterator (void *cls,
                               1,
                               GNUNET_NO);
     break;
-  case GNUNET_BLOCK_REPLY_INVALID:
-    /* maybe it expired? */
-    GNUNET_STATISTICS_update (GDS_stats,
-                              "# Invalid RESULTS found in datacache",
-                              1,
-                              GNUNET_NO);
-    break;
   case GNUNET_BLOCK_REPLY_IRRELEVANT:
     GNUNET_STATISTICS_update (GDS_stats,
                               "# Irrelevant RESULTS found in datacache",
@@ -222,7 +215,7 @@ datacache_get_iterator (void *cls,
 }
 
 
-enum GNUNET_BLOCK_EvaluationResult
+enum GNUNET_BLOCK_ReplyEvaluationResult
 GDS_DATACACHE_handle_get (const struct GNUNET_HashCode *key,
                           enum GNUNET_BLOCK_Type type,
                           const void *xquery,
@@ -232,7 +225,7 @@ GDS_DATACACHE_handle_get (const struct GNUNET_HashCode *key,
                           void *gc_cls)
 {
   struct GetRequestContext ctx = {
-    .eval = GNUNET_BLOCK_EVALUATION_REQUEST_VALID,
+                                  .eval = GNUNET_BLOCK_REPLY_TYPE_NOT_SUPPORTED,
     .key = *key,
     .xquery = xquery,
     .xquery_size = xquery_size,
@@ -243,7 +236,7 @@ GDS_DATACACHE_handle_get (const struct GNUNET_HashCode *key,
   unsigned int r;
 
   if (NULL == datacache)
-    return GNUNET_BLOCK_EVALUATION_REQUEST_VALID;
+    return GNUNET_BLOCK_REPLY_TYPE_NOT_SUPPORTED;
   GNUNET_STATISTICS_update (GDS_stats,
                             "# GET requests given to datacache",
                             1,
@@ -262,7 +255,7 @@ GDS_DATACACHE_handle_get (const struct GNUNET_HashCode *key,
 }
 
 
-enum GNUNET_BLOCK_EvaluationResult
+enum GNUNET_BLOCK_ReplyEvaluationResult
 GDS_DATACACHE_get_closest (const struct GNUNET_HashCode *key,
                            enum GNUNET_BLOCK_Type type,
                            const void *xquery,
@@ -272,7 +265,7 @@ GDS_DATACACHE_get_closest (const struct GNUNET_HashCode *key,
                            void *cb_cls)
 {
   struct GetRequestContext ctx = {
-    .eval = GNUNET_BLOCK_EVALUATION_REQUEST_VALID,
+                                  .eval = GNUNET_BLOCK_REPLY_TYPE_NOT_SUPPORTED,
     .key = *key,
     .xquery = xquery,
     .xquery_size = xquery_size,
@@ -283,7 +276,7 @@ GDS_DATACACHE_get_closest (const struct GNUNET_HashCode *key,
   unsigned int r;
 
   if (NULL == datacache)
-    return GNUNET_BLOCK_EVALUATION_REQUEST_VALID;
+    return GNUNET_BLOCK_REPLY_TYPE_NOT_SUPPORTED;
   GNUNET_STATISTICS_update (GDS_stats,
                             "# GET closest requests given to datacache",
                             1,
diff --git a/src/dht/gnunet-service-dht_datacache.h b/src/dht/gnunet-service-dht_datacache.h
index 69a18c605..d860139f5 100644
--- a/src/dht/gnunet-service-dht_datacache.h
+++ b/src/dht/gnunet-service-dht_datacache.h
@@ -107,7 +107,7 @@ typedef void
  * @param gc_cls closure for @a gc
  * @return evaluation result for the local replies
  */
-enum GNUNET_BLOCK_EvaluationResult
+enum GNUNET_BLOCK_ReplyEvaluationResult
 GDS_DATACACHE_handle_get (const struct GNUNET_HashCode *key,
                           enum GNUNET_BLOCK_Type type,
                           const void *xquery,
@@ -130,7 +130,7 @@ GDS_DATACACHE_handle_get (const struct GNUNET_HashCode *key,
  * @param cb_cls closure for @a cb
  * @return evaluation result for the local replies
  */
-enum GNUNET_BLOCK_EvaluationResult
+enum GNUNET_BLOCK_ReplyEvaluationResult
 GDS_DATACACHE_get_closest (const struct GNUNET_HashCode *key,
                            enum GNUNET_BLOCK_Type type,
                            const void *xquery,
diff --git a/src/dht/gnunet-service-dht_neighbours.c b/src/dht/gnunet-service-dht_neighbours.c
index db4ecb34a..7e570d4f5 100644
--- a/src/dht/gnunet-service-dht_neighbours.c
+++ b/src/dht/gnunet-service-dht_neighbours.c
@@ -1821,6 +1821,16 @@ handle_dht_p2p_put (void *cls,
                               GNUNET_NO);
     return;
   }
+  if (GNUNET_NO ==
+      GNUNET_BLOCK_check_block (GDS_block_context,
+                                bd.type,
+                                bd.data,
+                                bd.data_size))
+  {
+    GNUNET_break_op (0);
+    return;
+  }
+
   GNUNET_STATISTICS_update (GDS_stats,
                             "# P2P PUT requests received",
                             1,
@@ -1857,17 +1867,6 @@ handle_dht_p2p_put (void *cls,
     }
   }
 
-  if (GNUNET_NO ==
-      GNUNET_BLOCK_check_block (GDS_block_context,
-                                bd.type,
-                                &bd.key,
-                                bd.data,
-                                bd.data_size))
-  {
-    GNUNET_break_op (0);
-    return;
-  }
-
   {
     struct GNUNET_CONTAINER_BloomFilter *bf;
     struct GNUNET_DHT_PathElement pp[putlen + 1];
@@ -2465,6 +2464,15 @@ handle_dht_p2p_result (void *cls,
   bd.data_size = msize - (sizeof(struct PeerResultMessage)
                           + (get_path_length + bd.put_path_length)
                           * sizeof(struct GNUNET_DHT_PathElement));
+  if (GNUNET_OK !=
+      GNUNET_BLOCK_check_block (GDS_block_context,
+                                bd.type,
+                                bd.data,
+                                bd.data_size))
+  {
+    GNUNET_break_op (0);
+    return;
+  }
   GNUNET_STATISTICS_update (GDS_stats,
                             "# P2P RESULTS received",
                             1,
@@ -2475,7 +2483,6 @@ handle_dht_p2p_result (void *cls,
                             GNUNET_NO);
   {
     enum GNUNET_GenericReturnValue ret;
-    const struct GNUNET_HashCode *pquery;
 
     ret = GNUNET_BLOCK_get_key (GDS_block_context,
                                 bd.type,
@@ -2484,18 +2491,7 @@ handle_dht_p2p_result (void *cls,
                                 &bd.key);
     if (GNUNET_NO == ret)
     {
-      GNUNET_break_op (0);
-      return;
-    }
-    pquery = (GNUNET_OK == ret) ? &bd.key : &prm->key;
-    if (GNUNET_OK !=
-        GNUNET_BLOCK_check_block (GDS_block_context,
-                                  bd.type,
-                                  pquery,
-                                  bd.data,
-                                  bd.data_size))
-    {
-      GNUNET_break_op (0);
+      bd.key = prm->key;
       return;
     }
   }
diff --git a/src/dht/gnunet-service-dht_routing.c b/src/dht/gnunet-service-dht_routing.c
index da9919e82..05902b941 100644
--- a/src/dht/gnunet-service-dht_routing.c
+++ b/src/dht/gnunet-service-dht_routing.c
@@ -208,13 +208,6 @@ process (void *cls,
                               1,
                               GNUNET_NO);
     return GNUNET_OK;
-  case GNUNET_BLOCK_REPLY_INVALID:
-    GNUNET_break (0);
-    GNUNET_STATISTICS_update (GDS_stats,
-                              "# Invalid REPLIES matched against routing table",
-                              1,
-                              GNUNET_NO);
-    return GNUNET_OK;
   case GNUNET_BLOCK_REPLY_IRRELEVANT:
     GNUNET_STATISTICS_update (GDS_stats,
                               "# Irrelevant REPLIES matched against routing table",
diff --git a/src/dht/plugin_block_dht.c b/src/dht/plugin_block_dht.c
index 0dbe21af9..9ff67fa4e 100644
--- a/src/dht/plugin_block_dht.c
+++ b/src/dht/plugin_block_dht.c
@@ -90,88 +90,9 @@ block_plugin_dht_create_group (void *cls,
 
 
 /**
- * Function called to validate a reply or a request.  For
- * request evaluation, simply pass "NULL" for the @a reply_block.
- *
- * @param cls closure
- * @param ctx context
- * @param type block type
- * @param group block group to check against
- * @param eo control flags
- * @param query original query (hash)
- * @param xquery extended query data (can be NULL, depending on type)
- * @param xquery_size number of bytes in @a xquery
- * @param reply_block response to validate
- * @param reply_block_size number of bytes in @a reply_block
- * @return characterization of result
- */
-static enum GNUNET_BLOCK_EvaluationResult
-block_plugin_dht_evaluate (void *cls,
-                           struct GNUNET_BLOCK_Context *ctx,
-                           enum GNUNET_BLOCK_Type type,
-                           struct GNUNET_BLOCK_Group *group,
-                           enum GNUNET_BLOCK_EvaluationOptions eo,
-                           const struct GNUNET_HashCode *query,
-                           const void *xquery,
-                           size_t xquery_size,
-                           const void *reply_block,
-                           size_t reply_block_size)
-{
-  switch (type)
-  {
-  case GNUNET_BLOCK_TYPE_DHT_HELLO:
-    {
-      const struct GNUNET_HELLO_Message *hello;
-      struct GNUNET_PeerIdentity pid;
-      const struct GNUNET_MessageHeader *msg;
-      struct GNUNET_HashCode phash;
-
-      if (0 != xquery_size)
-      {
-        GNUNET_break_op (0);
-        return GNUNET_BLOCK_EVALUATION_REQUEST_INVALID;
-      }
-      if (NULL == reply_block)
-        return GNUNET_BLOCK_EVALUATION_REQUEST_VALID;
-      if (reply_block_size < sizeof(struct GNUNET_MessageHeader))
-      {
-        GNUNET_break_op (0);
-        return GNUNET_BLOCK_EVALUATION_RESULT_INVALID;
-      }
-      msg = reply_block;
-      if (reply_block_size != ntohs (msg->size))
-      {
-        GNUNET_break_op (0);
-        return GNUNET_BLOCK_EVALUATION_RESULT_INVALID;
-      }
-      hello = reply_block;
-      if (GNUNET_OK != GNUNET_HELLO_get_id (hello, &pid))
-      {
-        GNUNET_break_op (0);
-        return GNUNET_BLOCK_EVALUATION_RESULT_INVALID;
-      }
-      GNUNET_CRYPTO_hash (&pid,
-                          sizeof(pid),
-                          &phash);
-      if (GNUNET_YES ==
-          GNUNET_BLOCK_GROUP_bf_test_and_set (group,
-                                              &phash))
-        return GNUNET_BLOCK_EVALUATION_OK_DUPLICATE;
-      return GNUNET_BLOCK_EVALUATION_OK_MORE;
-    }
-  case GNUNET_BLOCK_TYPE_DHT_URL_HELLO:
-    GNUNET_break (0); // legacy API not implemented
-  default:
-    return GNUNET_BLOCK_EVALUATION_TYPE_NOT_SUPPORTED;
-  }
-}
-
-
-/**
  * Function called to validate a query.
  *
  * @param cls closure
- * @param ctx block context
  * @param type block type
  * @param query original query (hash)
  * @param xquery extrended query data (can be NULL, depending on type)
@@ -202,6 +123,7 @@ block_plugin_dht_check_query (void *cls,
     }
     return GNUNET_OK;
   default:
+    GNUNET_break (0);
     return GNUNET_SYSERR;
   }
 }
@@ -212,7 +134,6 @@ block_plugin_dht_check_query (void *cls,
  *
  * @param cls closure
  * @param type block type
- * @param query key for the block (hash), must match exactly
  * @param block block data to validate
  * @param block_size number of bytes in @a block
  * @return #GNUNET_OK if the block is fine, #GNUNET_NO if not
@@ -220,7 +141,6 @@ block_plugin_dht_check_query (void *cls,
 static enum GNUNET_GenericReturnValue
 block_plugin_dht_check_block (void *cls,
                               enum GNUNET_BLOCK_Type type,
-                              const struct GNUNET_HashCode *query,
                               const void *block,
                               size_t block_size)
 {
@@ -273,16 +193,10 @@ block_plugin_dht_check_block (void *cls,
                           sizeof (pid),
                           &h_pid);
       GNUNET_HELLO_builder_free (b);
-      if (0 !=
-          GNUNET_memcmp (&h_pid,
-                         query))
-      {
-        GNUNET_break_op (0);
-        return GNUNET_NO;
-      }
       return GNUNET_OK;
     }
   default:
+    GNUNET_break (0);
     return GNUNET_SYSERR;
   }
 }
@@ -319,30 +233,16 @@ block_plugin_dht_check_reply (
   {
   case GNUNET_BLOCK_TYPE_DHT_HELLO:
     {
-      const struct GNUNET_HELLO_Message *hello;
+      const struct GNUNET_MessageHeader *msg = reply_block;
+      const struct GNUNET_HELLO_Message *hello = reply_block;
       struct GNUNET_PeerIdentity pid;
-      const struct GNUNET_MessageHeader *msg;
       struct GNUNET_HashCode phash;
 
-      if (reply_block_size < sizeof(struct GNUNET_MessageHeader))
-      {
-        GNUNET_break_op (0);
-        return GNUNET_BLOCK_REPLY_INVALID;
-      }
-      msg = reply_block;
-      if (reply_block_size != ntohs (msg->size))
-      {
-        GNUNET_break_op (0);
-        return GNUNET_BLOCK_REPLY_INVALID;
-      }
-      hello = reply_block;
-      if (GNUNET_OK !=
-          GNUNET_HELLO_get_id (hello,
-                               &pid))
-      {
-        GNUNET_break_op (0);
-        return GNUNET_BLOCK_REPLY_INVALID;
-      }
+      GNUNET_assert (reply_block_size >= sizeof(struct GNUNET_MessageHeader));
+      GNUNET_assert (reply_block_size == ntohs (msg->size));
+      GNUNET_assert (GNUNET_OK !=
+                     GNUNET_HELLO_get_id (hello,
+                                          &pid));
       GNUNET_CRYPTO_hash (&pid,
                           sizeof(pid),
                           &phash);
@@ -399,31 +299,35 @@ block_plugin_dht_get_key (void *cls,
 
       if (block_size < sizeof(struct GNUNET_MessageHeader))
       {
-        GNUNET_log_from (GNUNET_ERROR_TYPE_ERROR,
-                         "block-dht",
-                         _ ("Block not of type %u\n"),
-                         GNUNET_BLOCK_TYPE_DHT_HELLO);
-        return GNUNET_NO;
+        GNUNET_break_op (0);
+        memset (key,
+                0,
+                sizeof (*key));
+        return GNUNET_OK;
       }
       msg = block;
       if (block_size != ntohs (msg->size))
       {
-        GNUNET_log_from (GNUNET_ERROR_TYPE_ERROR,
-                         "block-dht",
-                         _ ("Size mismatch for block with type %u\n"),
-                         GNUNET_BLOCK_TYPE_DHT_HELLO);
-        return GNUNET_NO;
+        GNUNET_break_op (0);
+        memset (key,
+                0,
+                sizeof (*key));
+        return GNUNET_OK;
       }
       hello = block;
-      memset (key, 0, sizeof(*key));
+      memset (key,
+              0,
+              sizeof(*key));
       pid = (struct GNUNET_PeerIdentity *) key;
-      if (GNUNET_OK != GNUNET_HELLO_get_id (hello, pid))
+      if (GNUNET_OK !=
+          GNUNET_HELLO_get_id (hello,
+                               pid))
       {
-        GNUNET_log_from (GNUNET_ERROR_TYPE_ERROR,
-                         "block-dht",
-                         _ ("Block of type %u is malformed\n"),
-                         GNUNET_BLOCK_TYPE_DHT_HELLO);
-        return GNUNET_NO;
+        GNUNET_break_op (0);
+        memset (key,
+                0,
+                sizeof (*key));
+        return GNUNET_OK;
       }
       return GNUNET_OK;
     }
@@ -437,7 +341,10 @@ block_plugin_dht_get_key (void *cls,
       if (NULL == b)
       {
         GNUNET_break (0);
-        return GNUNET_NO;
+        memset (key,
+                0,
+                sizeof (*key));
+        return GNUNET_OK;
       }
       GNUNET_HELLO_builder_iterate (b,
                                     &pid,
@@ -449,6 +356,7 @@ block_plugin_dht_get_key (void *cls,
       return GNUNET_OK;
     }
   default:
+    GNUNET_break (0);
     return GNUNET_SYSERR;
   }
 }
@@ -468,7 +376,6 @@ libgnunet_plugin_block_dht_init (void *cls)
   struct GNUNET_BLOCK_PluginFunctions *api;
 
   api = GNUNET_new (struct GNUNET_BLOCK_PluginFunctions);
-  api->evaluate = &block_plugin_dht_evaluate;
   api->get_key = &block_plugin_dht_get_key;
   api->check_query = &block_plugin_dht_check_query;
   api->check_block = &block_plugin_dht_check_block;