From: Igor Putovny Date: Fri, 7 Mar 2025 12:06:43 +0000 (+0100) Subject: Rename X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=141c9e2a1f74dd10503c76d31e95e92da9225e70;p=thirdparty%2Fbird.git Rename --- diff --git a/proto/aggregator/aggregator.c b/proto/aggregator/aggregator.c index c42b4e7fb..dc814e0e6 100644 --- a/proto/aggregator/aggregator.c +++ b/proto/aggregator/aggregator.c @@ -708,7 +708,7 @@ aggregator_rt_notify(struct proto *P, struct channel *src_ch, net *net, rte *new { if (p->root) { - aggregator_recalculate(p, old_route, new_route); + aggregator_recompute(p, old_route, new_route); /* Process route withdrawals triggered by recalculation */ aggregator_withdraw_rte(p); diff --git a/proto/aggregator/aggregator.h b/proto/aggregator/aggregator.h index 5e58526bb..e6f1e134b 100644 --- a/proto/aggregator/aggregator.h +++ b/proto/aggregator/aggregator.h @@ -148,7 +148,7 @@ struct trie_node { }; void aggregator_aggregate(struct aggregator_proto *p); -void aggregator_recalculate(struct aggregator_proto *p, struct aggregator_route *old, struct aggregator_route *new); +void aggregator_recompute(struct aggregator_proto *p, struct aggregator_route *old, struct aggregator_route *new); void aggregator_bucket_update(struct aggregator_proto *p, struct aggregator_bucket *bucket, struct network *net); struct trie_node *aggregator_create_new_node(struct slab *trie_slab); diff --git a/proto/aggregator/trie.c b/proto/aggregator/trie.c index bd667d150..877b5e645 100644 --- a/proto/aggregator/trie.c +++ b/proto/aggregator/trie.c @@ -921,7 +921,7 @@ aggregator_construct_trie(struct aggregator_proto *p) * Run Optimal Routing Table Constructor (ORTC) algorithm */ static void -aggregator_calculate_trie(struct aggregator_proto *p) +aggregator_compute_trie(struct aggregator_proto *p) { ASSERT_DIE(p->addr_type == NET_IP4 || p->addr_type == NET_IP6); @@ -937,14 +937,14 @@ aggregator_aggregate(struct aggregator_proto *p) ASSERT_DIE(p->root != NULL); aggregator_construct_trie(p); - aggregator_calculate_trie(p); + aggregator_compute_trie(p); } /* * Incorporate prefix change into the trie and reaggregate */ void -aggregator_recalculate(struct aggregator_proto *p, struct aggregator_route *old, struct aggregator_route *new) +aggregator_recompute(struct aggregator_proto *p, struct aggregator_route *old, struct aggregator_route *new) { struct trie_node *updated_node = NULL;