diff options
author | Christian Grothoff <grothoff@gnunet.org> | 2021-12-29 00:15:37 +0100 |
---|---|---|
committer | Christian Grothoff <grothoff@gnunet.org> | 2021-12-29 00:15:37 +0100 |
commit | fd620976c140d5df43cf174a54a9f88c4808cad3 (patch) | |
tree | a19dbae1aaf4c1b5b42004d75bb629ba334fbc9f /src/gns | |
parent | 68b028c18c8f701debc97c4480c903136274f71f (diff) | |
download | gnunet-fd620976c140d5df43cf174a54a9f88c4808cad3.tar.gz gnunet-fd620976c140d5df43cf174a54a9f88c4808cad3.zip |
-more FTBFS
Diffstat (limited to 'src/gns')
-rw-r--r-- | src/gns/plugin_block_gns.c | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/src/gns/plugin_block_gns.c b/src/gns/plugin_block_gns.c index 083ea7cc4..407754a8c 100644 --- a/src/gns/plugin_block_gns.c +++ b/src/gns/plugin_block_gns.c | |||
@@ -255,8 +255,7 @@ block_plugin_gns_check_block (void *cls, | |||
255 | const void *block, | 255 | const void *block, |
256 | size_t block_size) | 256 | size_t block_size) |
257 | { | 257 | { |
258 | const struct GNUNET_GNSRECORD_Block *block; | 258 | const struct GNUNET_GNSRECORD_Block *gblock; |
259 | struct GNUNET_HashCode h; | ||
260 | 259 | ||
261 | if (type != GNUNET_BLOCK_TYPE_GNS_NAMERECORD) | 260 | if (type != GNUNET_BLOCK_TYPE_GNS_NAMERECORD) |
262 | return GNUNET_SYSERR; | 261 | return GNUNET_SYSERR; |
@@ -265,14 +264,14 @@ block_plugin_gns_check_block (void *cls, | |||
265 | GNUNET_break_op (0); | 264 | GNUNET_break_op (0); |
266 | return GNUNET_NO; | 265 | return GNUNET_NO; |
267 | } | 266 | } |
268 | block = reply_block; | 267 | gblock = block; |
269 | if (GNUNET_GNSRECORD_block_get_size (block) > block_size) | 268 | if (GNUNET_GNSRECORD_block_get_size (gblock) > block_size) |
270 | { | 269 | { |
271 | GNUNET_break_op (0); | 270 | GNUNET_break_op (0); |
272 | return GNUNET_NO; | 271 | return GNUNET_NO; |
273 | } | 272 | } |
274 | if (GNUNET_OK != | 273 | if (GNUNET_OK != |
275 | GNUNET_GNSRECORD_block_verify (block)) | 274 | GNUNET_GNSRECORD_block_verify (gblock)) |
276 | { | 275 | { |
277 | GNUNET_break_op (0); | 276 | GNUNET_break_op (0); |
278 | return GNUNET_NO; | 277 | return GNUNET_NO; |
@@ -316,7 +315,7 @@ block_plugin_gns_check_reply (void *cls, | |||
316 | if (reply_block_size < sizeof(struct GNUNET_GNSRECORD_Block)) | 315 | if (reply_block_size < sizeof(struct GNUNET_GNSRECORD_Block)) |
317 | { | 316 | { |
318 | GNUNET_break_op (0); | 317 | GNUNET_break_op (0); |
319 | return GNUNET_BLOCK_REPLY_RESULT_INVALID; | 318 | return GNUNET_BLOCK_REPLY_INVALID; |
320 | } | 319 | } |
321 | block = reply_block; | 320 | block = reply_block; |
322 | if (GNUNET_GNSRECORD_block_get_size (block) > reply_block_size) | 321 | if (GNUNET_GNSRECORD_block_get_size (block) > reply_block_size) |
@@ -328,7 +327,7 @@ block_plugin_gns_check_reply (void *cls, | |||
328 | reply_block_size, | 327 | reply_block_size, |
329 | &chash); | 328 | &chash); |
330 | if (GNUNET_YES == | 329 | if (GNUNET_YES == |
331 | GNUNET_BLOCK_GROUP_bf_test_and_set (bg, | 330 | GNUNET_BLOCK_GROUP_bf_test_and_set (group, |
332 | &chash)) | 331 | &chash)) |
333 | return GNUNET_BLOCK_REPLY_OK_DUPLICATE; | 332 | return GNUNET_BLOCK_REPLY_OK_DUPLICATE; |
334 | return GNUNET_BLOCK_REPLY_OK_MORE; | 333 | return GNUNET_BLOCK_REPLY_OK_MORE; |