mirrors/bird
mirrors/bird
0
0
Fork 0
mirror of https://gitlab.nic.cz/labs/bird.git synced 2024-11-08 12:18:42 +00:00
Code Releases Activity

Static: Add MPLS support

Browse Source 
When MPLS is active, static IP/VPN routes are automatically labeled
according to active label policy and corresponding MPLS routes are
automatically generated.
This commit is contained in:
Ondrej Zajicek 2022-09-15 02:29:12 +02:00
parent 333ddd4f98
commit 15c86ed061
2 changed files with 28 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
proto/static/config.Y
View File

@ -63,6 +63,7 @@ static_proto:
static_proto_start proto_name '{' static_proto_start proto_name '{'
| static_proto proto_item ';' | static_proto proto_item ';'
| static_proto proto_channel ';' { this_proto->net_type = $2->net_type; } | static_proto proto_channel ';' { this_proto->net_type = $2->net_type; }
| static_proto mpls_channel ';'
| static_proto CHECK LINK bool ';' { STATIC_CFG->check_link = $4; } | static_proto CHECK LINK bool ';' { STATIC_CFG->check_link = $4; }
| static_proto IGP TABLE rtable ';' { | static_proto IGP TABLE rtable ';' {
if ($4->addr_type == NET_IP4) if ($4->addr_type == NET_IP4)

28
proto/static/static.c
View File

@ -39,6 +39,7 @@
#include "nest/iface.h" #include "nest/iface.h"
#include "nest/protocol.h" #include "nest/protocol.h"
#include "nest/route.h" #include "nest/route.h"
#include "nest/mpls.h"
#include "nest/cli.h" #include "nest/cli.h"
#include "conf/conf.h" #include "conf/conf.h"
#include "filter/filter.h" #include "filter/filter.h"
@ -98,6 +99,22 @@ static_announce_rte(struct static_proto *p, struct static_route *r)
rta_set_recursive_next_hop(p->p.main_channel->table, a, tab, r->via, IPA_NONE, r->mls); rta_set_recursive_next_hop(p->p.main_channel->table, a, tab, r->via, IPA_NONE, r->mls);
} }
if (p->p.mpls_channel)
{
struct mpls_channel *mc = (void *) p->p.mpls_channel;
ea_list *ea = alloca(sizeof(ea_list) + sizeof(eattr));
*ea = (ea_list) { .flags = EALF_SORTED, .count = 1 };
ea->next = a->eattrs;
a->eattrs = ea;
ea->attrs[0] = (eattr) {
.id = EA_MPLS_POLICY,
.type = EAF_TYPE_INT,
.u.data = mc->label_policy,
};
}
/* Already announced */ /* Already announced */
if (r->state == SRS_CLEAN) if (r->state == SRS_CLEAN)
return; return;
@ -463,6 +480,8 @@ static_init(struct proto_config *CF)
P->main_channel = proto_add_channel(P, proto_cf_main_channel(CF)); P->main_channel = proto_add_channel(P, proto_cf_main_channel(CF));
proto_configure_channel(P, &P->mpls_channel, proto_cf_mpls_channel(CF));
P->neigh_notify = static_neigh_notify; P->neigh_notify = static_neigh_notify;
P->reload_routes = static_reload_routes; P->reload_routes = static_reload_routes;
P->rte_better = static_rte_better; P->rte_better = static_rte_better;
@ -497,6 +516,8 @@ static_start(struct proto *P)
BUFFER_INIT(p->marked, p->p.pool, 4); BUFFER_INIT(p->marked, p->p.pool, 4);
proto_setup_mpls_map(P, RTS_STATIC, 1);
/* We have to go UP before routes could be installed */ /* We have to go UP before routes could be installed */
proto_notify_state(P, PS_UP); proto_notify_state(P, PS_UP);
@ -513,6 +534,8 @@ static_shutdown(struct proto *P)
struct static_config *cf = (void *) P->cf; struct static_config *cf = (void *) P->cf;
struct static_route *r; struct static_route *r;
proto_shutdown_mpls_map(P, 1);
/* Just reset the flag, the routes will be flushed by the nest */ /* Just reset the flag, the routes will be flushed by the nest */
WALK_LIST(r, cf->routes) WALK_LIST(r, cf->routes)
static_reset_rte(p, r); static_reset_rte(p, r);
@ -615,9 +638,12 @@ static_reconfigure(struct proto *P, struct proto_config *CF)
(IGP_TABLE(o, ip6) != IGP_TABLE(n, ip6))) (IGP_TABLE(o, ip6) != IGP_TABLE(n, ip6)))
return 0; return 0;
if (!proto_configure_channel(P, &P->main_channel, proto_cf_main_channel(CF))) if (!proto_configure_channel(P, &P->main_channel, proto_cf_main_channel(CF)) ||
!proto_configure_channel(P, &P->mpls_channel, proto_cf_mpls_channel(CF)))
return 0; return 0;
proto_setup_mpls_map(P, RTS_STATIC, 1);
p->p.cf = CF; p->p.cf = CF;
/* Reset route lists in neighbor entries */ /* Reset route lists in neighbor entries */