/*
This file is part of GNUnet.
- (C) 2001 - 2011 Christian Grothoff (and other contributing authors)
+ (C) 2012 Christian Grothoff (and other contributing authors)
GNUnet is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published
Free Software Foundation, Inc., 59 Temple Place - Suite 330,
Boston, MA 02111-1307, USA.
*/
-
/**
* @author Bartlomiej Polot
* @file mesh/mesh_block_lib.c
*/
-
-#ifdef __cplusplus
-extern "C"
-{
-#if 0
- /* keep Emacsens' auto-indent happy */
-}
-#endif
-#endif
-
+#include "platform.h"
#include "mesh_block_lib.h"
/**
- * Iterator over edges in a block.
+ * Noop iterator over all edges in a block.
*
- * @param cls Closure.
+ * @param cls Closure, not used.
* @param token Token that follows to next state.
* @param len Lenght of token.
* @param key Hash of next state.
+ *
+ * @return GNUNET_YES, to keep iterating
*/
static int
check_edge (void *cls,
GNUNET_MESH_regex_block_check (const struct MeshRegexBlock *block,
size_t size)
{
- return GNUNET_MESH_regex_block_iterate(NULL, block, size, &check_edge);
+ return GNUNET_MESH_regex_block_iterate(block, size, &check_edge, NULL);
}
/**
* Iterate over all edges of a block of a regex state.
*
- * @param cls Closure for the iterator.
* @param block Block to iterate over.
* @param size Size of block.
* @param iterator Function to call on each edge in the block.
+ * @param iter_cls Closure for the iterator.
*
* @return How many bytes of block have been processed
*/
int
-GNUNET_MESH_regex_block_iterate (void *cls,
- const struct MeshRegexBlock *block,
+GNUNET_MESH_regex_block_iterate (const struct MeshRegexBlock *block,
size_t size,
- GNUNET_MESH_EgdeIterator iterator)
+ GNUNET_MESH_EgdeIterator iterator,
+ void *iter_cls)
{
struct MeshRegexEdge *edge;
unsigned int n;
char *aux;
offset = sizeof (struct MeshRegexBlock);
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "* Start iterating block of size %u, off %u\n",
+ size, offset);
if (offset > size) // Is it safe to access the regex block?
+ {
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "* Block is smaller than struct MeshRegexBlock, END\n");
return GNUNET_SYSERR;
+ }
n = ntohl (block->n_proof);
- offset =+ n;
+ offset += n;
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "* Proof length: %u, off %u\n", n, offset);
if (offset > size) // Is it safe to access the regex proof?
+ {
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "* Block is smaller than Block + proof, END\n");
return GNUNET_SYSERR;
+ }
aux = (char *) &block[1]; // Skip regex block
aux = &aux[n]; // Skip regex proof
n = ntohl (block->n_edges);
- for (i = 0; i < n; n++) // aux always points at the end of the previous block
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "* Edges: %u\n", n);
+ for (i = 0; i < n; i++) // aux always points at the end of the previous block
{
offset += sizeof (struct MeshRegexEdge);
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "* Edge %u, off %u\n", i, offset);
if (offset > size) // Is it safe to access the next edge block?
+ {
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "* Size not enough for MeshRegexEdge, END\n");
return GNUNET_SYSERR;
+ }
edge = (struct MeshRegexEdge *) aux;
n_token = ntohl (edge->n_token);
offset += n_token;
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "* Token lenght %u, off %u\n", n_token, offset);
if (offset > size) // Is it safe to access the edge token?
+ {
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "* Size not enough for edge token, END\n");
return GNUNET_SYSERR;
+ }
aux = (char *) &edge[1]; // Skip edge block
if (NULL != iterator)
- if (GNUNET_NO == iterator (cls, aux, n_token, &edge->key))
+ if (GNUNET_NO == iterator (iter_cls, aux, n_token, &edge->key))
return GNUNET_OK;
aux = &aux[n_token]; // Skip edge token
}
// The total size should be exactly the size of (regex + all edges) blocks
- return (offset == size) ? GNUNET_OK : GNUNET_SYSERR;
-}
-
-#if 0 /* keep Emacsens' auto-indent happy */
-{
-#endif
-#ifdef __cplusplus
+ if (offset == size)
+ {
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "* Block processed, END OK\n");
+ return GNUNET_OK;
+ }
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "* Size %u, read %u END KO\n", size, offset);
+ return GNUNET_SYSERR;
}
-#endif
-/* end of mesh_protocol.h */
+/* end of mesh_block_lib.c */