diff options
author | Christian Grothoff <christian@grothoff.org> | 2017-02-22 13:41:33 +0100 |
---|---|---|
committer | Christian Grothoff <christian@grothoff.org> | 2017-02-22 13:41:33 +0100 |
commit | 4ba0fa6ba9f9be044c8c96ddd4d909e7d84403b5 (patch) | |
tree | a85ef8a265b9ae57750d51feec58690a15f17d02 /src/fs | |
parent | 55f509b7c7809f1c8dc9db66a8df11ef55aaf628 (diff) | |
download | gnunet-4ba0fa6ba9f9be044c8c96ddd4d909e7d84403b5.tar.gz gnunet-4ba0fa6ba9f9be044c8c96ddd4d909e7d84403b5.zip |
support BF size adjustments in other plugins
Diffstat (limited to 'src/fs')
-rw-r--r-- | src/fs/gnunet-service-fs_pr.c | 10 | ||||
-rw-r--r-- | src/fs/plugin_block_fs.c | 8 |
2 files changed, 12 insertions, 6 deletions
diff --git a/src/fs/gnunet-service-fs_pr.c b/src/fs/gnunet-service-fs_pr.c index 87e2d2ee1..b0fda24b5 100644 --- a/src/fs/gnunet-service-fs_pr.c +++ b/src/fs/gnunet-service-fs_pr.c | |||
@@ -264,8 +264,9 @@ refresh_bloomfilter (enum GNUNET_BLOCK_Type type, | |||
264 | UINT32_MAX), | 264 | UINT32_MAX), |
265 | NULL, | 265 | NULL, |
266 | 0, | 266 | 0, |
267 | "fs-seen-set-size", | 267 | "seen-set-size", |
268 | pr->replies_seen_count); | 268 | pr->replies_seen_count, |
269 | NULL); | ||
269 | if (NULL == pr->bg) | 270 | if (NULL == pr->bg) |
270 | return; | 271 | return; |
271 | GNUNET_break (GNUNET_OK == | 272 | GNUNET_break (GNUNET_OK == |
@@ -383,8 +384,9 @@ GSF_pending_request_create_ (enum GSF_PendingRequestOptions options, | |||
383 | mingle, | 384 | mingle, |
384 | bf_data, | 385 | bf_data, |
385 | bf_size, | 386 | bf_size, |
386 | "fs-seen-set-size", | 387 | "seen-set-size", |
387 | 0); | 388 | 0, |
389 | NULL); | ||
388 | } | 390 | } |
389 | else if ((replies_seen_count > 0) && | 391 | else if ((replies_seen_count > 0) && |
390 | (0 != (options & GSF_PRO_BLOOMFILTER_FULL_REFRESH))) | 392 | (0 != (options & GSF_PRO_BLOOMFILTER_FULL_REFRESH))) |
diff --git a/src/fs/plugin_block_fs.c b/src/fs/plugin_block_fs.c index 5ccbd237e..bea6b148c 100644 --- a/src/fs/plugin_block_fs.c +++ b/src/fs/plugin_block_fs.c | |||
@@ -95,14 +95,16 @@ block_plugin_fs_create_group (void *cls, | |||
95 | switch (type) | 95 | switch (type) |
96 | { | 96 | { |
97 | case GNUNET_BLOCK_TYPE_FS_DBLOCK: | 97 | case GNUNET_BLOCK_TYPE_FS_DBLOCK: |
98 | GNUNET_break (NULL == va_arg (va, const char *)); | ||
98 | return NULL; | 99 | return NULL; |
99 | case GNUNET_BLOCK_TYPE_FS_IBLOCK: | 100 | case GNUNET_BLOCK_TYPE_FS_IBLOCK: |
101 | GNUNET_break (NULL == va_arg (va, const char *)); | ||
100 | return NULL; | 102 | return NULL; |
101 | case GNUNET_BLOCK_TYPE_FS_UBLOCK: | 103 | case GNUNET_BLOCK_TYPE_FS_UBLOCK: |
102 | guard = va_arg (va, const char *); | 104 | guard = va_arg (va, const char *); |
103 | if (0 != memcmp (guard, | 105 | if (0 != memcmp (guard, |
104 | "fs-seen-set-size", | 106 | "seen-set-size", |
105 | strlen ("fs-seen-set-size"))) | 107 | strlen ("seen-set-size"))) |
106 | { | 108 | { |
107 | /* va-args invalid! bad bug, complain! */ | 109 | /* va-args invalid! bad bug, complain! */ |
108 | GNUNET_break (0); | 110 | GNUNET_break (0); |
@@ -114,6 +116,7 @@ block_plugin_fs_create_group (void *cls, | |||
114 | } | 116 | } |
115 | if (0 == size) | 117 | if (0 == size) |
116 | size = raw_data_size; /* not for us to determine, use what we got! */ | 118 | size = raw_data_size; /* not for us to determine, use what we got! */ |
119 | GNUNET_break (NULL == va_arg (va, const char *)); | ||
117 | return GNUNET_BLOCK_GROUP_bf_create (cls, | 120 | return GNUNET_BLOCK_GROUP_bf_create (cls, |
118 | size, | 121 | size, |
119 | BLOOMFILTER_K, | 122 | BLOOMFILTER_K, |
@@ -122,6 +125,7 @@ block_plugin_fs_create_group (void *cls, | |||
122 | raw_data, | 125 | raw_data, |
123 | raw_data_size); | 126 | raw_data_size); |
124 | default: | 127 | default: |
128 | GNUNET_break (NULL == va_arg (va, const char *)); | ||
125 | GNUNET_break (0); | 129 | GNUNET_break (0); |
126 | return NULL; | 130 | return NULL; |
127 | } | 131 | } |