-rps: open channel when inserting peer in view
[oweals/gnunet.git] / src / block / plugin_block_template.c
index 7c62de6b1b4eeb3ca50dbcdabf487848a4a253d3..6cb69ef5ff4e11a67a359720260756e999136f8c 100644 (file)
@@ -1,6 +1,6 @@
 /*
      This file is part of GNUnet
-     (C) 2010 Christian Grothoff (and other contributing authors)
+     Copyright (C) 2010 GNUnet e.V.
 
      GNUnet is free software; you can redistribute it and/or modify
      it under the terms of the GNU General Public License as published
@@ -14,8 +14,8 @@
 
      You should have received a copy of the GNU General Public License
      along with GNUnet; see the file COPYING.  If not, write to the
-     Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-     Boston, MA 02111-1307, USA.
+     Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+     Boston, MA 02110-1301, USA.
 */
 
 /**
@@ -36,6 +36,7 @@
  *
  * @param cls closure
  * @param type block type
+ * @param eo control flags
  * @param query original query (hash)
  * @param bf pointer to bloom filter associated with query; possibly updated (!)
  * @param bf_mutator mutation value for bf
  * @return characterization of result
  */
 static enum GNUNET_BLOCK_EvaluationResult
-block_plugin_template_evaluate (void *cls, enum GNUNET_BLOCK_Type type,
-                                const struct GNUNET_HashCode * query,
+block_plugin_template_evaluate (void *cls,
+                                enum GNUNET_BLOCK_Type type,
+                                enum GNUNET_BLOCK_EvaluationOptions eo,
+                                const struct GNUNET_HashCode *query,
                                 struct GNUNET_CONTAINER_BloomFilter **bf,
-                                int32_t bf_mutator, const void *xquery,
-                                size_t xquery_size, const void *reply_block,
+                                int32_t bf_mutator,
+                                const void *xquery,
+                                size_t xquery_size,
+                                const void *reply_block,
                                 size_t reply_block_size)
 {
   struct GNUNET_HashCode chash;
@@ -111,7 +116,7 @@ libgnunet_plugin_block_template_init (void *cls)
   };
   struct GNUNET_BLOCK_PluginFunctions *api;
 
-  api = GNUNET_malloc (sizeof (struct GNUNET_BLOCK_PluginFunctions));
+  api = GNUNET_new (struct GNUNET_BLOCK_PluginFunctions);
   api->evaluate = &block_plugin_template_evaluate;
   api->get_key = &block_plugin_template_get_key;
   api->types = types;