mirrors/bird
mirrors/bird
0
0
Fork 0
mirror of https://gitlab.nic.cz/labs/bird.git synced 2024-11-08 12:18:42 +00:00
Code Releases Activity

Small changes, add assert

Browse Source
This commit is contained in:
Igor Putovny 2024-07-03 15:44:36 +02:00
parent 0f1d150906
commit d9c54c3292
1 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
proto/aggregator/aggregator.c
View File

@ -497,9 +497,7 @@ remove_potential_buckets(struct trie_node *node)
static void static void
third_pass(struct trie_node *node) third_pass(struct trie_node *node)
{ {
if (!node) assert(node != NULL);
return;
assert(node->potential_buckets_count <= MAX_POTENTIAL_BUCKETS_COUNT); assert(node->potential_buckets_count <= MAX_POTENTIAL_BUCKETS_COUNT);
/* Root is assigned any of its potential buckets */ /* Root is assigned any of its potential buckets */
@ -511,6 +509,10 @@ third_pass(struct trie_node *node)
} }
else else
{ {
// Internal nodes should not have a bucket since it was deleted during first pass
if (!is_leaf(node))
assert(node->bucket == NULL);
const struct aggregator_bucket *inherited_bucket = get_ancestor_bucket(node); const struct aggregator_bucket *inherited_bucket = get_ancestor_bucket(node);
/* /*
@ -530,8 +532,11 @@ third_pass(struct trie_node *node)
} }
/* Preorder traversal */ /* Preorder traversal */
third_pass(node->child[0]); if (node->child[0])
third_pass(node->child[1]); third_pass(node->child[0]);
if (node->child[1])
third_pass(node->child[1]);
/* Leaves with no assigned bucket are removed */ /* Leaves with no assigned bucket are removed */
if (!node->bucket && is_leaf(node)) if (!node->bucket && is_leaf(node))