mirrors/bird
mirrors/bird
0
0
Fork 0
mirror of https://gitlab.nic.cz/labs/bird.git synced 2025-01-18 06:51:54 +00:00
Code Releases Activity

Make small changes to increase readability

Browse Source
This commit is contained in:
Igor Putovny 2024-05-07 18:09:29 +02:00
parent 3715cb5085
commit de8105a44b
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
proto/aggregator/aggregator.c
View File

@ -514,7 +514,7 @@ second_pass(struct trie_node *node)
if (is_leaf(node)) if (is_leaf(node))
{ {
assert(node->potential_buckets_count > 0); assert(node->potential_buckets_count == 1);
assert(node->potential_buckets[0] != NULL); assert(node->potential_buckets[0] != NULL);
assert(node->potential_buckets[0] == node->bucket); assert(node->potential_buckets[0] == node->bucket);
return; return;
@ -882,7 +882,7 @@ collect_prefixes(struct aggregator_proto *p)
else else
bug("Invalid NET type"); bug("Invalid NET type");
log("%d prefixes collected", count); log("%d prefixes after aggregation", count);
p->after_count = count; p->after_count = count;
} }
@ -910,6 +910,8 @@ construct_trie(struct aggregator_proto *p)
log("INSERT %N", addr); log("INSERT %N", addr);
p->before_count++; p->before_count++;
} }
else
bug("Invalid NET type");
} }
} }
HASH_WALK_END; HASH_WALK_END;
@ -946,7 +948,7 @@ run_aggregation(struct channel *C)
struct aggregator_proto *p = (void *)C->proto; struct aggregator_proto *p = (void *)C->proto;
/* Run aggregation only on feed-end from source channel */ /* Run aggregation only on feed-end from source channel */
if (C == p->dst) if (C != p->src)
return; return;
construct_trie(p); construct_trie(p);
@ -1597,13 +1599,13 @@ aggregator_start(struct proto *P)
{ {
default_net = mb_alloc(P->pool, sizeof(struct network) + sizeof(struct net_addr_ip4)); default_net = mb_alloc(P->pool, sizeof(struct network) + sizeof(struct net_addr_ip4));
net_fill_ip4(default_net->n.addr, IP4_NONE, 0); net_fill_ip4(default_net->n.addr, IP4_NONE, 0);
log("Creating net %p for default route", default_net); log("Creating net %p for default route %N", default_net, default_net->n.addr);
} }
else if (p->addr_type == NET_IP6) else if (p->addr_type == NET_IP6)
{ {
default_net = mb_alloc(P->pool, sizeof(struct network) + sizeof(struct net_addr_ip6)); default_net = mb_alloc(P->pool, sizeof(struct network) + sizeof(struct net_addr_ip6));
net_fill_ip6(default_net->n.addr, IP6_NONE, 0); net_fill_ip6(default_net->n.addr, IP6_NONE, 0);
log("Creating net %p for default route", default_net); log("Creating net %p for default route %N", default_net, default_net->n.addr);
} }
/* Create route attributes with zero nexthop */ /* Create route attributes with zero nexthop */