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

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

Browse Source
This commit is contained in:
Maria Matejka 2023-11-08 22:14:19 +01:00
commit 49ee823f82
2 changed files with 12 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 proto_item ';'
| 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 IGP TABLE rtable ';' {
if ($4->addr_type == NET_IP4)

12
proto/static/static.c
View File

@ -39,6 +39,7 @@
#include "nest/iface.h"
#include "nest/protocol.h"
#include "nest/route.h"
#include "nest/mpls.h"
#include "nest/cli.h"
#include "conf/conf.h"
#include "filter/filter.h"
@ -484,6 +485,8 @@ static_init(struct proto_config *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->iface_sub.neigh_notify = static_neigh_notify;
P->reload_routes = static_reload_routes;
P->sources.class = &static_rte_owner_class;
@ -514,6 +517,8 @@ static_start(struct proto *P)
BUFFER_INIT(p->marked, p->p.pool, 4);
proto_setup_mpls_map(P, RTS_STATIC);
/* We have to go UP before routes could be installed */
proto_notify_state(P, PS_UP);
@ -531,6 +536,8 @@ static_shutdown(struct proto *P)
struct static_config *cf = (void *) P->cf;
struct static_route *r;
proto_shutdown_mpls_map(P);
/* Just reset the flag, the routes will be flushed by the nest */
WALK_LIST(r, cf->routes)
static_reset_rte(p, r);
@ -627,9 +634,12 @@ static_reconfigure(struct proto *P, struct proto_config *CF)
(IGP_TABLE(o, ip6) != IGP_TABLE(n, ip6)))
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;
proto_setup_mpls_map(P, RTS_STATIC);
p->p.cf = CF;
/* Reset route lists in neighbor entries */