mirror of
https://gitlab.nic.cz/labs/bird.git
synced 2025-01-03 15:41:54 +00:00
Merge branch 'mq-aggregator-for-v3' into thread-next
This commit is contained in:
commit
f32e53d7b1
@ -75,6 +75,7 @@ aggregator_bucket_update(struct aggregator_proto *p, struct aggregator_bucket *b
|
|||||||
if (!bucket->rte)
|
if (!bucket->rte)
|
||||||
{
|
{
|
||||||
rte_update(p->dst, net, NULL, bucket->last_src);
|
rte_update(p->dst, net, NULL, bucket->last_src);
|
||||||
|
rt_unlock_source(bucket->last_src);
|
||||||
bucket->last_src = NULL;
|
bucket->last_src = NULL;
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
@ -411,6 +412,9 @@ aggregator_shutdown(struct proto *P)
|
|||||||
sl_free(arte);
|
sl_free(arte);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (b->last_src)
|
||||||
|
rt_unlock_source(b->last_src);
|
||||||
|
|
||||||
ASSERT_DIE(b->count == 0);
|
ASSERT_DIE(b->count == 0);
|
||||||
HASH_REMOVE(p->buckets, AGGR_BUCK, b);
|
HASH_REMOVE(p->buckets, AGGR_BUCK, b);
|
||||||
sl_free(b);
|
sl_free(b);
|
||||||
|
Loading…
Reference in New Issue
Block a user