0
0
mirror of https://gitlab.nic.cz/labs/bird.git synced 2024-11-09 20:58:44 +00:00

Merge branch 'mq-aggregator-for-v3' into thread-next

This commit is contained in:
Maria Matejka 2023-11-09 15:50:15 +01:00
commit 2193b1efe4

View File

@ -77,8 +77,7 @@
* *
* TODO: * TODO:
* - label range non-intersection check * - label range non-intersection check
* - better range reconfigurations (allow reduce ranges over unused labels) * - protocols should do route refresh instead of restart when reconfiguration
* - protocols should do route refresh instead of resetart when reconfiguration
* requires changing labels (e.g. different label range) * requires changing labels (e.g. different label range)
* - registering static allocations * - registering static allocations
* - checking range in static allocations * - checking range in static allocations
@ -349,9 +348,12 @@ mpls_find_range_(list *l, const char *name)
} }
static int static int
mpls_reconfigure_range(struct mpls_domain *m UNUSED, struct mpls_range *r, struct mpls_range_config *cf) mpls_reconfigure_range(struct mpls_domain *m, struct mpls_range *r, struct mpls_range_config *cf)
{ {
if ((cf->start > r->lo) || (cf->start + cf->length < r->hi)) uint last = lmap_last_one_in_range(&m->labels, r->lo, r->hi);
if (last == r->hi) last = 0;
if ((cf->start > r->lo) || (cf->start + cf->length <= last))
return 0; return 0;
cf->range = r; cf->range = r;