projects
/
oweals
/
gnunet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of gnunet.org:gnunet
[oweals/gnunet.git]
/
src
/
fs
/
plugin_block_fs.c
diff --git
a/src/fs/plugin_block_fs.c
b/src/fs/plugin_block_fs.c
index c5e63c9e2f79c40cc9809ef576bda6375960048f..c762835ce12de34398164e41b8c3ea6af7437e2e 100644
(file)
--- a/
src/fs/plugin_block_fs.c
+++ b/
src/fs/plugin_block_fs.c
@@
-71,17
+71,22
@@
block_plugin_fs_create_group (void *cls,
return NULL;
case GNUNET_BLOCK_TYPE_FS_UBLOCK:
guard = va_arg (va, const char *);
return NULL;
case GNUNET_BLOCK_TYPE_FS_UBLOCK:
guard = va_arg (va, const char *);
- if (0
!
= strcmp (guard,
+ if (0
=
= strcmp (guard,
"seen-set-size"))
{
"seen-set-size"))
{
- /* va-args invalid! bad bug, complain! */
- GNUNET_break (0);
- size = 8;
+ size = GNUNET_BLOCK_GROUP_compute_bloomfilter_size (va_arg (va, unsigned int),
+ BLOOMFILTER_K);
+ }
+ else if (0 == strcmp (guard,
+ "filter-size"))
+ {
+ size = va_arg (va, unsigned int);
}
else
{
}
else
{
- size = GNUNET_BLOCK_GROUP_compute_bloomfilter_size (va_arg (va, unsigned int),
- BLOOMFILTER_K);
+ /* va-args invalid! bad bug, complain! */
+ GNUNET_break (0);
+ size = 8;
}
if (0 == size)
size = raw_data_size; /* not for us to determine, use what we got! */
}
if (0 == size)
size = raw_data_size; /* not for us to determine, use what we got! */
@@
-276,7
+281,7
@@
libgnunet_plugin_block_fs_init (void *cls)
void *
libgnunet_plugin_block_fs_done (void *cls)
{
void *
libgnunet_plugin_block_fs_done (void *cls)
{
- struct GNUNET_
TRANSPORT
_PluginFunctions *api = cls;
+ struct GNUNET_
BLOCK
_PluginFunctions *api = cls;
GNUNET_free (api);
return NULL;
GNUNET_free (api);
return NULL;