Update ndpi_patricia_walk_inorder API

This commit is contained in:
Alfredo Cardigliano
2021-02-23 10:23:52 +01:00
parent f8e83f7e35
commit 888ddfcd17
3 changed files with 9 additions and 8 deletions
+1 -1
View File
@@ -975,7 +975,7 @@ extern "C" {
ndpi_patricia_node_t *ndpi_patricia_search_exact(ndpi_patricia_tree_t *patricia, ndpi_prefix_t *prefix);
ndpi_patricia_node_t *ndpi_patricia_search_best(ndpi_patricia_tree_t *patricia, ndpi_prefix_t *prefix);
ndpi_patricia_node_t *ndpi_patricia_lookup(ndpi_patricia_tree_t *patricia, ndpi_prefix_t *prefix);
size_t ndpi_patricia_walk_inorder(ndpi_patricia_node_t *node, ndpi_void_fn2_t func);
size_t ndpi_patricia_walk_inorder(ndpi_patricia_node_t *node, ndpi_void_fn3_t func, void *data);
void ndpi_patricia_remove(ndpi_patricia_tree_t *patricia, ndpi_patricia_node_t *node);
void ndpi_patricia_set_node_u64(ndpi_patricia_node_t *node, u_int64_t value);
+4 -3
View File
@@ -1597,12 +1597,13 @@ typedef struct _ndpi_prefix_t {
} add;
} ndpi_prefix_t;
typedef void (*ndpi_void_fn_t)(void *data);
typedef void (*ndpi_void_fn2_t)(ndpi_prefix_t *prefix, void *data);
typedef struct _ndpi_patricia_node_t ndpi_patricia_node_t;
typedef struct _ndpi_patricia_tree_t ndpi_patricia_tree_t;
typedef void (*ndpi_void_fn_t)(void *data);
typedef void (*ndpi_void_fn2_t)(ndpi_prefix_t *prefix, void *data);
typedef void (*ndpi_void_fn3_t)(ndpi_patricia_node_t *node, void *data, void *user_data);
/* **************************************** */
typedef struct ndpi_ptree ndpi_ptree_t;
+4 -4
View File
@@ -428,22 +428,22 @@ ndpi_patricia_clone (const ndpi_patricia_tree_t * const from)
}
size_t
ndpi_patricia_walk_inorder(ndpi_patricia_node_t *node, ndpi_void_fn2_t func)
ndpi_patricia_walk_inorder(ndpi_patricia_node_t *node, ndpi_void_fn3_t func, void *data)
{
size_t n = 0;
assert(func);
if(node->l) {
n += ndpi_patricia_walk_inorder(node->l, func);
n += ndpi_patricia_walk_inorder(node->l, func, data);
}
if(node->prefix) {
func(node->prefix, node->data);
func(node, node->data, data);
n++;
}
if(node->r) {
n += ndpi_patricia_walk_inorder(node->r, func);
n += ndpi_patricia_walk_inorder(node->r, func, data);
}
return n;