diff options
Diffstat (limited to 'src/block/block.c')
-rw-r--r-- | src/block/block.c | 23 |
1 files changed, 10 insertions, 13 deletions
diff --git a/src/block/block.c b/src/block/block.c index bdef55aa3..ac466337c 100644 --- a/src/block/block.c +++ b/src/block/block.c | |||
@@ -72,8 +72,8 @@ struct GNUNET_BLOCK_Context | |||
72 | * @param hc where to store the result. | 72 | * @param hc where to store the result. |
73 | */ | 73 | */ |
74 | void | 74 | void |
75 | GNUNET_BLOCK_mingle_hash (const GNUNET_HashCode * in, | 75 | GNUNET_BLOCK_mingle_hash (const GNUNET_HashCode * in, uint32_t mingle_number, |
76 | uint32_t mingle_number, GNUNET_HashCode * hc) | 76 | GNUNET_HashCode * hc) |
77 | { | 77 | { |
78 | GNUNET_HashCode m; | 78 | GNUNET_HashCode m; |
79 | 79 | ||
@@ -105,8 +105,8 @@ GNUNET_BLOCK_context_create (const struct GNUNET_CONFIGURATION_Handle *cfg) | |||
105 | if (GNUNET_OK == | 105 | if (GNUNET_OK == |
106 | GNUNET_CONFIGURATION_get_value_string (cfg, "block", "PLUGINS", &plugs)) | 106 | GNUNET_CONFIGURATION_get_value_string (cfg, "block", "PLUGINS", &plugs)) |
107 | { | 107 | { |
108 | GNUNET_log (GNUNET_ERROR_TYPE_INFO, | 108 | GNUNET_log (GNUNET_ERROR_TYPE_INFO, _("Loading block plugins `%s'\n"), |
109 | _("Loading block plugins `%s'\n"), plugs); | 109 | plugs); |
110 | pos = strtok (plugs, " "); | 110 | pos = strtok (plugs, " "); |
111 | while (pos != NULL) | 111 | while (pos != NULL) |
112 | { | 112 | { |
@@ -212,18 +212,16 @@ GNUNET_BLOCK_evaluate (struct GNUNET_BLOCK_Context *ctx, | |||
212 | enum GNUNET_BLOCK_Type type, | 212 | enum GNUNET_BLOCK_Type type, |
213 | const GNUNET_HashCode * query, | 213 | const GNUNET_HashCode * query, |
214 | struct GNUNET_CONTAINER_BloomFilter **bf, | 214 | struct GNUNET_CONTAINER_BloomFilter **bf, |
215 | int32_t bf_mutator, | 215 | int32_t bf_mutator, const void *xquery, |
216 | const void *xquery, | 216 | size_t xquery_size, const void *reply_block, |
217 | size_t xquery_size, | 217 | size_t reply_block_size) |
218 | const void *reply_block, size_t reply_block_size) | ||
219 | { | 218 | { |
220 | struct GNUNET_BLOCK_PluginFunctions *plugin = find_plugin (ctx, type); | 219 | struct GNUNET_BLOCK_PluginFunctions *plugin = find_plugin (ctx, type); |
221 | 220 | ||
222 | if (plugin == NULL) | 221 | if (plugin == NULL) |
223 | return GNUNET_BLOCK_EVALUATION_TYPE_NOT_SUPPORTED; | 222 | return GNUNET_BLOCK_EVALUATION_TYPE_NOT_SUPPORTED; |
224 | return plugin->evaluate (plugin->cls, | 223 | return plugin->evaluate (plugin->cls, type, query, bf, bf_mutator, xquery, |
225 | type, query, bf, bf_mutator, | 224 | xquery_size, reply_block, reply_block_size); |
226 | xquery, xquery_size, reply_block, reply_block_size); | ||
227 | } | 225 | } |
228 | 226 | ||
229 | 227 | ||
@@ -240,8 +238,7 @@ GNUNET_BLOCK_evaluate (struct GNUNET_BLOCK_Context *ctx, | |||
240 | */ | 238 | */ |
241 | int | 239 | int |
242 | GNUNET_BLOCK_get_key (struct GNUNET_BLOCK_Context *ctx, | 240 | GNUNET_BLOCK_get_key (struct GNUNET_BLOCK_Context *ctx, |
243 | enum GNUNET_BLOCK_Type type, | 241 | enum GNUNET_BLOCK_Type type, const void *block, |
244 | const void *block, | ||
245 | size_t block_size, GNUNET_HashCode * key) | 242 | size_t block_size, GNUNET_HashCode * key) |
246 | { | 243 | { |
247 | struct GNUNET_BLOCK_PluginFunctions *plugin = find_plugin (ctx, type); | 244 | struct GNUNET_BLOCK_PluginFunctions *plugin = find_plugin (ctx, type); |