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

Small changes

Browse Source
This commit is contained in:
Igor Putovny 2024-07-04 15:12:52 +02:00
parent 1ab7a58f38
commit e78958354a
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
proto/aggregator/aggregator.c
View File

@ -51,8 +51,6 @@
extern linpool *rte_update_pool; extern linpool *rte_update_pool;
static void aggregator_bucket_update(struct aggregator_proto *p, struct aggregator_bucket *bucket, struct network *net);
static inline int static inline int
is_leaf(const struct trie_node *node) is_leaf(const struct trie_node *node)
{ {
@ -73,7 +71,7 @@ create_new_node(linpool *trie_pool)
/* /*
* Mark appropriate child of parent node as NULL * Mark appropriate child of parent node as NULL
*/ */
static void static inline void
remove_node(struct trie_node *node) remove_node(struct trie_node *node)
{ {
assert(node != NULL); assert(node != NULL);
@ -671,6 +669,8 @@ print_prefixes(const struct trie_node *node, int type)
} }
} }
static void aggregator_bucket_update(struct aggregator_proto *p, struct aggregator_bucket *bucket, struct network *net);
/* /*
* Create route for aggregated prefix * Create route for aggregated prefix
*/ */
@ -1010,7 +1010,7 @@ aggregator_bucket_update(struct aggregator_proto *p, struct aggregator_bucket *b
rta->source = RTS_AGGREGATED; rta->source = RTS_AGGREGATED;
rta->scope = SCOPE_UNIVERSE; rta->scope = SCOPE_UNIVERSE;
struct ea_list *eal = allocz(sizeof(struct ea_list) + sizeof(struct eattr) * p->aggr_on_da_count); struct ea_list *eal = allocz(sizeof(*eal) + sizeof(struct eattr) * p->aggr_on_da_count);
eal->next = NULL; eal->next = NULL;
eal->count = 0; eal->count = 0;
rta->eattrs = eal; rta->eattrs = eal;
@ -1615,6 +1615,10 @@ aggregator_start(struct proto *P)
{ {
struct aggregator_proto *p = SKIP_BACK(struct aggregator_proto, p, P); struct aggregator_proto *p = SKIP_BACK(struct aggregator_proto, p, P);
assert(p->bucket_pool == NULL);
assert(p->route_pool == NULL);
assert(p->trie_pool == NULL);
p->addr_type = p->src->table->addr_type; p->addr_type = p->src->table->addr_type;
p->bucket_pool = lp_new(P->pool); p->bucket_pool = lp_new(P->pool);
@ -1630,6 +1634,7 @@ aggregator_start(struct proto *P)
if (PREFIX_AGGR == p->aggr_mode) if (PREFIX_AGGR == p->aggr_mode)
{ {
assert(p->trie_pool == NULL);
p->trie_pool = lp_new(P->pool); p->trie_pool = lp_new(P->pool);
settle_init(&p->notify_settle, &p->notify_settle_cf, request_feed_on_settle_timer, p); settle_init(&p->notify_settle, &p->notify_settle_cf, request_feed_on_settle_timer, p);
} }