mirrors/bird
mirrors/bird
0
0
Fork 0
mirror of https://gitlab.nic.cz/labs/bird.git synced 2024-12-22 09:41:54 +00:00
Code Releases Activity

MPLS: Label range non-intersection check

Browse Source
This commit is contained in:
Ondrej Zajicek 2023-09-22 15:47:48 +02:00
parent fcf2258620
commit 3572605151
2 changed files with 48 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
nest/mpls.c
View File

@ -76,7 +76,6 @@
* and withdrawal of MPLS routes. * and withdrawal of MPLS routes.
* *
* TODO: * TODO:
* - label range non-intersection check
* - protocols should do route refresh instead of restart when reconfiguration * - protocols should do route refresh instead of restart when reconfiguration
* requires changing labels (e.g. different label range) * requires changing labels (e.g. different label range)
* - registering static allocations * - registering static allocations
@ -84,6 +83,8 @@
* - special handling of reserved labels * - special handling of reserved labels
*/ */
#include <stdlib.h>
#include "nest/bird.h" #include "nest/bird.h"
#include "nest/route.h" #include "nest/route.h"
#include "nest/mpls.h" #include "nest/mpls.h"
@ -122,6 +123,7 @@ mpls_domain_config_new(struct symbol *s)
rc->name = "static"; rc->name = "static";
rc->start = 16; rc->start = 16;
rc->length = 984; rc->length = 984;
rc->implicit = 1;
mc->static_range = rc; mc->static_range = rc;
/* Predefined dynamic range */ /* Predefined dynamic range */
@ -129,6 +131,7 @@ mpls_domain_config_new(struct symbol *s)
rc->name = "dynamic"; rc->name = "dynamic";
rc->start = 1000; rc->start = 1000;
rc->length = 9000; rc->length = 9000;
rc->implicit = 1;
mc->dynamic_range = rc; mc->dynamic_range = rc;
add_tail(&new_config->mpls_domains, &mc->n); add_tail(&new_config->mpls_domains, &mc->n);
@ -136,10 +139,52 @@ mpls_domain_config_new(struct symbol *s)
return mc; return mc;
} }
static int
mpls_compare_range_configs(const void *r1_, const void *r2_)
{
const struct mpls_range_config * const *r1 = r1_;
const struct mpls_range_config * const *r2 = r2_;
return uint_cmp((*r1)->start, (*r2)->start);
}
void void
mpls_domain_postconfig(struct mpls_domain_config *cf UNUSED) mpls_domain_postconfig(struct mpls_domain_config *cf UNUSED)
{ {
/* Add label range non-intersection check */ /* Label range non-intersection check */
int num_ranges = list_length(&cf->ranges);
struct mpls_range_config **ranges = tmp_alloc(num_ranges * sizeof(struct mpls_range_config *));
{
int i = 0;
struct mpls_range_config *r;
WALK_LIST(r, cf->ranges)
ranges[i++] = r;
}
qsort(ranges, num_ranges, sizeof(struct mpls_range_config *), mpls_compare_range_configs);
struct mpls_range_config *max_range = NULL;
uint max_hi = 0;
for (int i = 0; i < num_ranges; i++)
{
struct mpls_range_config *r = ranges[i];
uint hi = r->start + r->length;
if (r->implicit)
continue;
if (r->start < max_hi)
cf_warn("MPLS label ranges %s and %s intersect", max_range->name, r->name);
if (hi > max_hi)
{
max_range = r;
max_hi = hi;
}
}
} }
static struct mpls_domain * static struct mpls_domain *

1
nest/mpls.h
View File

@ -63,6 +63,7 @@ struct mpls_range_config {
uint start; /* Label range start, (uint) -1 for undefined */ uint start; /* Label range start, (uint) -1 for undefined */
uint length; /* Label range length, (uint) -1 for undefined */ uint length; /* Label range length, (uint) -1 for undefined */
u8 implicit; /* Implicitly defined range */
}; };
struct mpls_range { struct mpls_range {