May 2024 - Bird-users - Mailing Lists

[PATCH] Babel: allow enabling link quality estimation manually
by Nick Cao 09 Apr '25

09 Apr '25

Link quality estimation is useful for link types other than wireless, especially when using babel with tunnels where packet losses do occur. --- doc/bird.sgml | 6 ++++++ proto/babel/babel.c | 19 ++++++------------- proto/babel/babel.h | 1 + proto/babel/config.Y | 5 ++++- 4 files changed, 17 insertions(+), 14 deletions(-) diff --git a/doc/bird.sgml b/doc/bird.sgml index 8041faa9..417ec030 100644 --- a/doc/bird.sgml +++ b/doc/bird.sgml @@ -2032,6 +2032,12 @@ protocol babel [<name>] { hardware drivers or platforms do not implement this feature. Default: yes. + <tag><label id="babel-link-quality">link quality <m/switch/</tag> + If set, link quality estimation is performed on this interface. + Link quality is measured by packet loss and is used for computing + metrics of routes going through this interface. Default: yes for + wireless interfaces, otherwise no. + <tag><label id="babel-next-hop-ipv4">next hop ipv4 <m/address/</tag> Set the next hop address advertised for IPv4 routes advertised on this interface. Default: the preferred IPv4 address of the interface. diff --git a/proto/babel/babel.c b/proto/babel/babel.c index 7f0cca73..6a238d75 100644 --- a/proto/babel/babel.c +++ b/proto/babel/babel.c @@ -593,21 +593,15 @@ babel_update_cost(struct babel_neighbor *nbr) if (!rcv || !nbr->ifa->up) goto done; - switch (cf->type) - { - case BABEL_IFACE_TYPE_WIRED: - case BABEL_IFACE_TYPE_TUNNEL: + if (!cf->link_quality) { /* k-out-of-j selection - Appendix 2.1 in the RFC. */ /* Link is bad if less than cf->limit/16 of expected hellos were received */ - if (rcv * 16 < cf->limit * max) - break; - - rxcost = cf->rxcost; - txcost = nbr->txcost; - break; - - case BABEL_IFACE_TYPE_WIRELESS: + if (!(rcv * 16 < cf->limit * max)) { + rxcost = cf->rxcost; + txcost = nbr->txcost; + } + } else { /* * ETX - Appendix 2.2 in the RFC. * @@ -622,7 +616,6 @@ babel_update_cost(struct babel_neighbor *nbr) */ rxcost = MIN( cf->rxcost * max / rcv, BABEL_INFINITY); txcost = MIN(nbr->txcost * max / rcv, BABEL_INFINITY); - break; } if (cf->rtt_cost && nbr->srtt > cf->rtt_min) diff --git a/proto/babel/babel.h b/proto/babel/babel.h index edde4cab..d152d099 100644 --- a/proto/babel/babel.h +++ b/proto/babel/babel.h @@ -145,6 +145,7 @@ struct babel_iface_config { u8 type; u8 limit; /* Minimum number of Hellos to keep link up */ u8 check_link; + u8 link_quality; uint port; uint hello_interval; /* Hello interval, in us */ uint ihu_interval; /* IHU interval, in us */ diff --git a/proto/babel/config.Y b/proto/babel/config.Y index b8af0267..cbf873c5 100644 --- a/proto/babel/config.Y +++ b/proto/babel/config.Y @@ -26,7 +26,7 @@ CF_KEYWORDS(BABEL, INTERFACE, METRIC, RXCOST, HELLO, UPDATE, INTERVAL, PORT, TYPE, WIRED, WIRELESS, RX, TX, BUFFER, PRIORITY, LENGTH, CHECK, LINK, NEXT, HOP, IPV4, IPV6, BABEL_METRIC, SHOW, INTERFACES, NEIGHBORS, ENTRIES, RANDOMIZE, ROUTER, ID, AUTHENTICATION, NONE, MAC, PERMISSIVE, - EXTENDED, TUNNEL, RTT, MIN, MAX, DECAY, SEND, TIMESTAMPS) + EXTENDED, TUNNEL, RTT, MIN, MAX, DECAY, SEND, TIMESTAMPS, QUALITY) CF_GRAMMAR @@ -72,6 +72,7 @@ babel_iface_start: BABEL_IFACE->rtt_decay = BABEL_RTT_DECAY; BABEL_IFACE->rtt_send = 1; BABEL_IFACE->check_link = 1; + BABEL_IFACE->link_quality = 0; BABEL_IFACE->ext_next_hop = 1; }; @@ -84,6 +85,7 @@ babel_iface_finish: BABEL_IFACE->hello_interval = BABEL_HELLO_INTERVAL_WIRELESS; if (!BABEL_IFACE->rxcost) BABEL_IFACE->rxcost = BABEL_RXCOST_WIRELESS; + BABEL_IFACE->link_quality = 1; } else { @@ -156,6 +158,7 @@ babel_iface_item: | TX tos { BABEL_IFACE->tx_tos = $2; } | TX PRIORITY expr { BABEL_IFACE->tx_priority = $3; } | CHECK LINK bool { BABEL_IFACE->check_link = $3; } + | LINK QUALITY bool { BABEL_IFACE->link_quality = $3; } | NEXT HOP IPV4 ipa { BABEL_IFACE->next_hop_ip4 = $4; if (!ipa_is_ip4($4)) cf_error("Must be an IPv4 address"); } | NEXT HOP IPV6 ipa { BABEL_IFACE->next_hop_ip6 = $4; if (!ipa_is_ip6($4)) cf_error("Must be an IPv6 address"); } | EXTENDED NEXT HOP bool { BABEL_IFACE->ext_next_hop = $4; } -- 2.41.0

4 14

[PATCH] Bus error on ARMv7 when using OSPF
by Matthew Reeve 18 Dec '24

18 Dec '24

Hi, when using bird 2.0.8 on openwrt 21.02 (and other versions) on a Netgear R7800 router, if the OSPF protocol is used, either v2 or v3, bird immediately crashes on startup with: Fri Jun 11 14:41:11 2021 daemon.info bird: Started Fri Jun 11 14:41:11 2021 kern.err kernel: [ 3500.853248] Alignment trap: not handling instruction f44c0a1f at [<00035848>] Fri Jun 11 14:41:11 2021 kern.alert kernel: [ 3500.853283] 8<--- cut here --- Fri Jun 11 14:41:11 2021 kern.alert kernel: [ 3500.859363] Unhandled fault: alignment exception (0x801) at 0x007e0624 Fri Jun 11 14:41:11 2021 kern.alert kernel: [ 3500.862443] pgd = 0bbef4fd Fri Jun 11 14:41:11 2021 kern.alert kernel: [ 3500.868821] [007e0624] *pgd=5d6ca835, *pte=5c40b75f, *ppte=5c40bc7f This router uses an ARMv7 processor and the issue seems to be to do with memory alignment issues. I've debugged it and traced it to an access to the top_hash_entry struct. I've found that if I add the PACKED macro to the struct definition then it fixes the problem, as per this patch: --- a/proto/ospf/topology.h +++ b/proto/ospf/topology.h @@ -41,7 +41,7 @@ struct top_hash_entry u8 mode; /* LSA generated during RT calculation (LSA_RTCALC or LSA_STALE)*/ u8 nhs_reuse; /* Whether nhs nodes can be reused during merging. See a note in rt.c:add_cand() */ -}; +} PACKED; /* Prevents ospf_hash_find() to ignore the entry, for p->lsrqh and p->lsrth */ Thanks.

4 11

Bird 3 Status
by Marcelo Balbinot 18 Dec '24

18 Dec '24

Hi BIRD Team, Could you give us a brief update on the status of version 3 ? Do you have any expected dates for a new release !? Thanks, -- Marcelo Balbinot

3 5

[PATCH v3] Babel: Replace internal route selection by bird's nest
by Daniel Gröber 11 Dec '24

11 Dec '24

This allows for filtering routes from specific interfaces and neighbours. With the current internal route selection proto babel exports only up to one route and an admin cannot do fine-grained filtering. To fix this we rip out the internal route selection entirely and put them all into the bird's nest instead. This appears to not actually be a breaking change as route announcement was already based on which routes bird would send back to babel_rt_notify filters shouldn't be able to tell the difference between a single and multiple routes AFAIK. --- Changes in v3: - Subsume FIB_RESTART v2 patch: instead of restarting FIB iteration we keep lists of actions to perform after FIB iteration is finished. proto/babel/babel.c | 269 +++++++++++++++++++------------------------- proto/babel/babel.h | 8 +- 2 files changed, 120 insertions(+), 157 deletions(-) diff --git a/proto/babel/babel.c b/proto/babel/babel.c index ff8b6b52..087fd95b 100644 --- a/proto/babel/babel.c +++ b/proto/babel/babel.c @@ -29,10 +29,11 @@ * possible routes for the prefix are tracked as &babel_route entries and the * feasibility distance is maintained through &babel_source structures. * - * The main route selection is done in babel_select_route(). This is called when - * an entry is updated by receiving updates from the network or when modified by - * internal timers. The function selects from feasible and reachable routes the - * one with the lowest metric to be announced to the core. + * The main route selection is done by the bird nest (heh). For each prefix we + * export all feasible routes to the core with a distinct source (rte_src) per + * neihbour. Bird will then notify us of the optimal one by calling + * babel_rt_notify and we remember which neighbour it selected in + * babel_entry.selected_nbr. */ #include <stdlib.h> @@ -50,7 +51,7 @@ static inline int ge_mod64k(uint a, uint b) { return (u16)(a - b) < 0x8000; } static void babel_expire_requests(struct babel_proto *p, struct babel_entry *e); -static void babel_select_route(struct babel_proto *p, struct babel_entry *e, struct babel_route *mod); +static void babel_announce_rte(struct babel_proto *p, struct babel_entry *e, struct babel_route *r); static inline void babel_announce_retraction(struct babel_proto *p, struct babel_entry *e); static void babel_send_route_request(struct babel_proto *p, struct babel_entry *e, struct babel_neighbor *n); static void babel_send_seqno_request(struct babel_proto *p, struct babel_entry *e, struct babel_seqno_request *sr, struct babel_neighbor *n); @@ -164,13 +165,19 @@ babel_get_route(struct babel_proto *p, struct babel_entry *e, struct babel_neigh return r; } +static struct babel_route * +babel_get_selected_route(struct babel_proto *p, struct babel_entry *e) +{ + if (e->selected_nbr) + return babel_get_route(p, e, e->selected_nbr); + return NULL; +} + static inline void babel_retract_route(struct babel_proto *p, struct babel_route *r) { r->metric = r->advert_metric = BABEL_INFINITY; - - if (r == r->e->selected) - babel_select_route(p, r->e, r); + babel_announce_rte(p, r->e, r); } static void @@ -182,9 +189,6 @@ babel_flush_route(struct babel_proto *p UNUSED, struct babel_route *r) rem_node(NODE r); rem_node(&r->neigh_route); - if (r->e->selected == r) - r->e->selected = NULL; - sl_free(r); } @@ -200,6 +204,7 @@ babel_expire_route(struct babel_proto *p, struct babel_route *r) { r->metric = r->advert_metric = BABEL_INFINITY; r->expires = current_time() + cf->hold_time; + babel_announce_rte(p, r->e, r); } else { @@ -210,7 +215,7 @@ babel_expire_route(struct babel_proto *p, struct babel_route *r) static void babel_refresh_route(struct babel_proto *p, struct babel_route *r) { - if (r == r->e->selected) + if (r == babel_get_selected_route(p, r->e)) babel_send_route_request(p, r->e, r->neigh); r->refresh_time = 0; @@ -221,16 +226,15 @@ babel_expire_routes_(struct babel_proto *p, struct fib *rtable) { struct babel_config *cf = (void *) p->p.cf; struct babel_route *r, *rx; + struct babel_entry *retract_head = NULL, *delete_head = NULL; + struct babel_route *expire_head = NULL; struct fib_iterator fit; btime now_ = current_time(); - FIB_ITERATE_INIT(&fit, rtable); -loop: + FIB_ITERATE_INIT(&fit, rtable); FIB_ITERATE_START(rtable, &fit, struct babel_entry, e) { - int changed = 0; - WALK_LIST_DELSAFE(r, rx, e->routes) { if (r->refresh_time && r->refresh_time <= now_) @@ -238,23 +242,11 @@ loop: if (r->expires && r->expires <= now_) { - changed = changed || (r == e->selected); - babel_expire_route(p, r); + r->expire_next = expire_head; + expire_head = r; } } - if (changed) - { - /* - * We have to restart the iteration because there may be a cascade of - * synchronous events babel_select_route() -> nest table change -> - * babel_rt_notify() -> rtable change, invalidating hidden variables. - */ - FIB_ITERATE_PUT(&fit); - babel_select_route(p, e, NULL); - goto loop; - } - /* Clean up stale entries */ if ((e->valid == BABEL_ENTRY_STALE) && ((e->updated + cf->hold_time) <= now_)) e->valid = BABEL_ENTRY_DUMMY; @@ -262,9 +254,8 @@ loop: /* Clean up unreachable route */ if (e->unreachable && (!e->valid || (e->router_id == p->router_id))) { - FIB_ITERATE_PUT(&fit); - babel_announce_retraction(p, e); - goto loop; + e->retract_next = retract_head; + retract_head = e; } babel_expire_sources(p, e); @@ -273,12 +264,25 @@ loop: /* Remove empty entries */ if (!e->valid && EMPTY_LIST(e->routes) && EMPTY_LIST(e->sources) && EMPTY_LIST(e->requests)) { - FIB_ITERATE_PUT(&fit); - fib_delete(rtable, e); - goto loop; + e->delete_next = delete_head; + delete_head = e; } } FIB_ITERATE_END; + + for (struct babel_route *r_next, *r = expire_head; r ; r = r_next) { + r_next = r->expire_next; + babel_expire_route(p, r); + } + + for (struct babel_entry *e = retract_head; e ; e = e->retract_next) { + babel_announce_retraction(p, e); + } + + for (struct babel_entry *e_next, *e = delete_head; e ; e = e_next) { + e_next = e->delete_next; + fib_delete(rtable, e); + } } static void @@ -447,6 +451,7 @@ babel_get_neighbor(struct babel_iface *ifa, ip_addr addr) nbr = mb_allocz(ifa->pool, sizeof(struct babel_neighbor)); nbr->ifa = ifa; + nbr->src = rt_get_source(&p->p, idm_alloc(&p->src_ids)); nbr->addr = addr; nbr->rxcost = BABEL_INFINITY; nbr->txcost = BABEL_INFINITY; @@ -474,6 +479,8 @@ babel_flush_neighbor(struct babel_proto *p, struct babel_neighbor *nbr) } nbr->ifa = NULL; + + idm_free(&p->src_ids, nbr->src->private_id); rem_node(NODE nbr); mb_free(nbr); } @@ -634,11 +641,40 @@ done: WALK_LIST2(r, n, nbr->routes, neigh_route) { r->metric = babel_compute_metric(nbr, r->advert_metric); - babel_select_route(p, r->e, r); + babel_announce_rte(p, r->e, r); } } } +static void +babel_announce_rte_unreachable(struct babel_proto *p, struct babel_entry *e, u8 unreachable) +{ + struct channel *c = (e->n.addr->type == NET_IP4) ? p->ip4_channel : p->ip6_channel; + rte *rte = NULL; + + if (unreachable) { + /* Unreachable */ + rta a0 = { + .source = RTS_BABEL, + .scope = SCOPE_UNIVERSE, + .dest = RTD_UNREACHABLE, + .pref = 1, + }; + + rta *a = rta_lookup(&a0); + rte = rte_get_temp(a, p->p.main_source); + } + + e->unreachable = unreachable; + + /* Unlike the many neighbour routes we only want one unreachable route, for + * one it's ugly to have lots of unreachable routes (if we just did this right + * in babel_announce_rte) but we also loose access to the neibour rte_src id + * when the neighbour is deallocated. This happens on a different schedule + * than unreachable route removal. */ + rte_update2(c, e->n.addr, rte, p->p.main_source); +} + /** * babel_announce_rte - announce selected route to the core * @p: Babel protocol instance @@ -649,12 +685,11 @@ done: * the entry is valid and ours, the unreachable route is announced instead. */ static void -babel_announce_rte(struct babel_proto *p, struct babel_entry *e) +babel_announce_rte(struct babel_proto *p, struct babel_entry *e, struct babel_route *r) { - struct babel_route *r = e->selected; struct channel *c = (e->n.addr->type == NET_IP4) ? p->ip4_channel : p->ip6_channel; - if (r) + if (r->metric != BABEL_INFINITY && r->feasible) { rta a0 = { .source = RTS_BABEL, @@ -698,124 +733,27 @@ babel_announce_rte(struct babel_proto *p, struct babel_entry *e) a0.nh.flags = RNF_ONLINK; rta *a = rta_lookup(&a0); - rte *rte = rte_get_temp(a, p->p.main_source); + rte *rte = rte_get_temp(a, r->neigh->src); - e->unreachable = 0; - rte_update2(c, e->n.addr, rte, p->p.main_source); - } - else if (e->valid && (e->router_id != p->router_id)) - { - /* Unreachable */ - rta a0 = { - .source = RTS_BABEL, - .scope = SCOPE_UNIVERSE, - .dest = RTD_UNREACHABLE, - .pref = 1, - }; - - rta *a = rta_lookup(&a0); - rte *rte = rte_get_temp(a, p->p.main_source); - - e->unreachable = 1; - rte_update2(c, e->n.addr, rte, p->p.main_source); + rte_update2(c, e->n.addr, rte, r->neigh->src); + babel_announce_rte_unreachable(p, e, 0); } else - { - /* Retraction */ - e->unreachable = 0; - rte_update2(c, e->n.addr, NULL, p->p.main_source); - } + rte_update2(c, e->n.addr, NULL, r->neigh->src); } /* Special case of babel_announce_rte() just for retraction */ static inline void babel_announce_retraction(struct babel_proto *p, struct babel_entry *e) { + TRACE(D_EVENTS, "Retract unreachable route for %N", + e->n.addr); + struct channel *c = (e->n.addr->type == NET_IP4) ? p->ip4_channel : p->ip6_channel; e->unreachable = 0; rte_update2(c, e->n.addr, NULL, p->p.main_source); } - -/** - * babel_select_route - select best route for given route entry - * @p: Babel protocol instance - * @e: Babel entry to select the best route for - * @mod: Babel route that was modified or NULL if unspecified - * - * Select the best reachable and feasible route for a given prefix among the - * routes received from peers, and propagate it to the nest. This just selects - * the reachable and feasible route with the lowest metric, but keeps selected - * the old one in case of tie. - * - * If no feasible route is available for a prefix that previously had a route - * selected, a seqno request is sent to try to get a valid route. If the entry - * is valid and not owned by us, the unreachable route is announced to the nest - * (to blackhole packets going to it, as per section 2.8). It is later removed - * by babel_expire_routes(). Otherwise, the route is just removed from the nest. - * - * Argument @mod is used to optimize best route calculation. When specified, the - * function can assume that only the @mod route was modified to avoid full best - * route selection and announcement when non-best route was modified in minor - * way. The caller is advised to not call babel_select_route() when no change is - * done (e.g. periodic route updates) to avoid unnecessary announcements of the - * same best route. The caller is not required to call the function in case of a - * retraction of a non-best route. - * - * Note that the function does not active triggered updates. That is done by - * babel_rt_notify() when the change is propagated back to Babel. - */ -static void -babel_select_route(struct babel_proto *p, struct babel_entry *e, struct babel_route *mod) -{ - struct babel_route *r, *best = e->selected; - - /* Shortcut if only non-best was modified */ - if (mod && (mod != best)) - { - /* Either select modified route, or keep old best route */ - if ((mod->metric < (best ? best->metric : BABEL_INFINITY)) && mod->feasible) - best = mod; - else - return; - } - else - { - /* Selected route may be modified and no longer admissible */ - if (!best || (best->metric == BABEL_INFINITY) || !best->feasible) - best = NULL; - - /* Find the best feasible route from all routes */ - WALK_LIST(r, e->routes) - if ((r->metric < (best ? best->metric : BABEL_INFINITY)) && r->feasible) - best = r; - } - - if (best) - { - if (best != e->selected) - TRACE(D_EVENTS, "Picked new route for prefix %N: router-id %lR metric %d", - e->n.addr, best->router_id, best->metric); - } - else if (e->selected) - { - /* - * We have lost all feasible routes. We have to broadcast seqno request - * (Section 3.8.2.1) and keep unreachable route for a while (section 2.8). - * The later is done automatically by babel_announce_rte(). - */ - - TRACE(D_EVENTS, "Lost feasible route for prefix %N", e->n.addr); - if (e->valid && (e->selected->router_id == e->router_id)) - babel_add_seqno_request(p, e, e->selected->router_id, e->selected->seqno + 1, 0, NULL); - } - else - return; - - e->selected = best; - babel_announce_rte(p, e); -} - /* * Functions to send replies */ @@ -1300,7 +1238,7 @@ babel_handle_update(union babel_msg *m, struct babel_iface *ifa) s = babel_find_source(e, msg->router_id); /* for feasibility */ feasible = babel_is_feasible(s, msg->seqno, msg->metric); metric = babel_compute_metric(nbr, msg->metric); - best = e->selected; + best = babel_get_selected_route(p, e); /* * RFC section 3.8.2.2 - Dealing with unfeasible updates. Generate a one-off @@ -1338,7 +1276,7 @@ babel_handle_update(union babel_msg *m, struct babel_iface *ifa) e->updated = current_time(); } - babel_select_route(p, e, r); + babel_announce_rte(p, e, r); } void @@ -2003,10 +1941,10 @@ babel_dump_route(struct babel_route *r) } static void -babel_dump_entry(struct babel_entry *e) +babel_dump_entry(struct babel_proto *p, struct babel_entry *e) { struct babel_source *s; - struct babel_route *r; + struct babel_route *r, *best = babel_get_selected_route(p, e); debug("Babel: Entry %N:\n", e->n.addr); @@ -2016,7 +1954,7 @@ babel_dump_entry(struct babel_entry *e) WALK_LIST(r,e->routes) { debug(" "); - if (r == e->selected) debug("*"); + if (r == best) debug("*"); babel_dump_route(r); } } @@ -2057,12 +1995,12 @@ babel_dump(struct proto *P) FIB_WALK(&p->ip4_rtable, struct babel_entry, e) { - babel_dump_entry(e); + babel_dump_entry(p, e); } FIB_WALK_END; FIB_WALK(&p->ip6_rtable, struct babel_entry, e) { - babel_dump_entry(e); + babel_dump_entry(p, e); } FIB_WALK_END; } @@ -2186,7 +2124,7 @@ babel_show_entries_(struct babel_proto *p, struct fib *rtable) FIB_WALK(rtable, struct babel_entry, e) { - struct babel_route *r = NULL; + struct babel_route *r = NULL, *best = babel_get_selected_route(p, e); uint rts = 0, srcs = 0; node *n; @@ -2199,7 +2137,7 @@ babel_show_entries_(struct babel_proto *p, struct fib *rtable) if (e->valid) cli_msg(-1025, "%-*N %-23lR %6u %5u %7u %7u", width, e->n.addr, e->router_id, e->metric, e->seqno, rts, srcs); - else if (r = e->selected) + else if (r = best) cli_msg(-1025, "%-*N %-23lR %6u %5u %7u %7u", width, e->n.addr, r->router_id, r->metric, r->seqno, rts, srcs); else @@ -2236,10 +2174,10 @@ babel_show_routes_(struct babel_proto *p, struct fib *rtable) FIB_WALK(rtable, struct babel_entry, e) { - struct babel_route *r; + struct babel_route *r, *best = babel_get_selected_route(p, e); WALK_LIST(r, e->routes) { - char c = (r == e->selected) ? '*' : (r->feasible ? '+' : ' '); + char c = (r == best) ? '*' : (r->feasible ? '+' : ' '); btime time = r->expires ? r->expires - current_time() : 0; cli_msg(-1025, "%-*N %-25I %-10s %5u %c %5u %7t", width, e->n.addr, r->next_hop, r->neigh->ifa->ifname, @@ -2320,15 +2258,18 @@ babel_rt_notify(struct proto *P, struct channel *c UNUSED, struct network *net, { struct babel_proto *p = (void *) P; struct babel_entry *e; + struct babel_iface *ifa; + struct babel_neighbor *n; if (new) { /* Update */ + uint internal = new->src->proto == P; uint rt_seqno; uint rt_metric = ea_get_int(new->attrs->eattrs, EA_BABEL_METRIC, 0); u64 rt_router_id = 0; - if (new->src->proto == P) + if (internal) { rt_seqno = ea_find(new->attrs->eattrs, EA_BABEL_SEQNO)->u.data; eattr *e = ea_find(new->attrs->eattrs, EA_BABEL_ROUTER_ID); @@ -2350,6 +2291,18 @@ babel_rt_notify(struct proto *P, struct channel *c UNUSED, struct network *net, e = babel_get_entry(p, net->n.addr); + while (internal) { + ifa = babel_find_iface(p, new->attrs->nh.iface); + if (!ifa) break; + n = babel_find_neighbor(ifa, new->attrs->from); + if (!n) break; + e->selected_nbr = n; + break; + } + if (!internal) { + e->selected_nbr = NULL; + } + /* Activate triggered updates */ if ((e->valid != BABEL_ENTRY_VALID) || (e->router_id != rt_router_id)) @@ -2373,6 +2326,9 @@ babel_rt_notify(struct proto *P, struct channel *c UNUSED, struct network *net, e->valid = BABEL_ENTRY_STALE; e->metric = BABEL_INFINITY; + e->selected_nbr = NULL; + + babel_announce_rte_unreachable(p, e, 1); babel_trigger_update(p); e->updated = current_time(); @@ -2464,6 +2420,7 @@ babel_start(struct proto *P) p->source_slab = sl_new(P->pool, sizeof(struct babel_source)); p->msg_slab = sl_new(P->pool, sizeof(struct babel_msg_node)); p->seqno_slab = sl_new(P->pool, sizeof(struct babel_seqno_request)); + idm_init(&p->src_ids, P->pool, 8); p->log_pkt_tbf = (struct tbf){ .rate = 1, .burst = 5 }; diff --git a/proto/babel/babel.h b/proto/babel/babel.h index da8386b3..1d7e19f0 100644 --- a/proto/babel/babel.h +++ b/proto/babel/babel.h @@ -25,6 +25,7 @@ #include "lib/socket.h" #include "lib/string.h" #include "lib/timer.h" +#include "lib/idm.h" #define EA_BABEL_METRIC EA_CODE(PROTOCOL_BABEL, 0) #define EA_BABEL_ROUTER_ID EA_CODE(PROTOCOL_BABEL, 1) @@ -174,6 +175,7 @@ struct babel_proto { slab *source_slab; slab *msg_slab; slab *seqno_slab; + struct idm src_ids; struct tbf log_pkt_tbf; /* TBF for packet messages */ }; @@ -216,6 +218,7 @@ struct babel_iface { struct babel_neighbor { node n; struct babel_iface *ifa; + struct rte_src *src; ip_addr addr; u16 rxcost; /* Sent in last IHU */ @@ -256,6 +259,7 @@ struct babel_source { struct babel_route { node n; node neigh_route; + struct babel_route *expire_next; struct babel_entry *e; struct babel_neighbor *neigh; @@ -281,7 +285,9 @@ struct babel_seqno_request { }; struct babel_entry { - struct babel_route *selected; + struct babel_neighbor *selected_nbr; + + struct babel_entry *retract_next, *delete_next; list routes; /* Routes for this prefix (struct babel_route) */ list sources; /* Source entries for this prefix (struct babel_source). */ -- 2.30.2

6 13

Bird is not adding routes into kernel anymore
by Nico Schottelius 09 Sep '24

09 Sep '24

Good morning, yesterday we upgrade in a lab from 2.13.1 to 2.14 and (great idea) at the same time modified some configuration bits. Since then bird does not seem to write routes into the kernel anymore, even though relevant bits seem to be in the configuration. The config (in parts) looks like this: -------------------------------------------------------------------------------- protocol device { } protocol kernel kernel_v4 { ipv4 { export all; }; } protocol kernel kernel_v6 { ipv6 { export all; }; } ... protocol static { ipv6; route 2a0a:5480::/48 unreachable; # LAN route 2a0a:5480:1::/48 unreachable; # k8s route 2a0a:5480:3::/48 unreachable; # router specific route 2a0a:5480:0:c001::/96 via 2a0a:5480::20d:b9ff:fe5a:816c; # jool } protocol static { ipv4; route 185.203.113.0/24 unreachable; } protocol bfd { # openvpn interface "tun*" { interval 500 ms; idle tx interval 2 s; }; # transfer interface "eth0" { interval 500 ms; idle tx interval 2 s; }; } -------------------------------------------------------------------------------- Plus various BGP instances at the end. If I check birdc, things seems to be good: -------------------------------------------------------------------------------- bird> show route Table master4: 185.203.114.0/23 unicast [server121_v6_v4 22:24:45.009] * (100) [AS213081i] via 2a0a:e5c0:32:4::1 on tun1 185.203.113.2/32 unicast [r2ge_v6_v4 22:35:40.181 from 2a0a:5480::2] * (100/10) [i] via fe80::20d:b9ff:fe46:3bd4 on eth0 185.203.113.0/24 unreachable [static2 22:12:35.949] * (200) unicast [r2ge_v6_v4 22:35:40.181 from 2a0a:5480::2] (100/10) [i] via fe80::20d:b9ff:fe46:3bd4 on eth0 148.222.248.1/32 unicast [server121_v6_v4 09:39:56.279] * (100) [AS209898i] via 2a0a:e5c0:32:4::1 on tun1 unicast [r2ge_v6_v4 09:39:57.048 from 2a0a:5480::2] (100/20) [AS209898i] via fe80::20d:b9ff:fe46:3bd4 on eth0 ... bird> show protocols Name Proto Table State Since Info device1 Device --- up 22:12:35.949 kernel_v4 Kernel master4 up 22:12:35.949 kernel_v6 Kernel master6 up 22:12:35.949 static1 Static master6 up 22:12:35.949 static2 Static master4 up 22:12:35.949 bfd1 BFD --- up 22:12:35.949 r2ge_v6_v4 BGP --- up 22:35:40.175 Established genauso_v6 BGP --- start 22:12:35.949 Passive server121_v6_v4 BGP --- up 22:24:15.183 Established radv1 RAdv master6 up 22:12:35.949 ospf6 OSPF master6 up 22:12:35.949 Running fiberstream Static master4 up 22:12:35.949 direct1 Direct --- up 22:12:35.949 genauso_1 BGP --- up 22:12:36.974 Established genauso_2 BGP --- up 22:12:36.979 Established genauso_3 BGP --- up 22:12:36.985 Established genauso_4 BGP --- start 22:14:01.848 Idle bird> bird> show protocols all kernel_v4 Name Proto Table State Since Info kernel_v4 Kernel master4 up 22:12:35.949 Channel ipv4 State: UP Table: master4 Preference: 10 Input filter: ACCEPT Output filter: ACCEPT Routes: 0 imported, 23 exported, 0 preferred Route change stats: received rejected filtered ignored accepted Import updates: 0 0 0 0 0 Import withdraws: 0 0 --- 0 0 Export updates: 265 0 0 --- 265 Export withdraws: 113 --- --- --- 113 bird> show protocols all kernel_v6 Name Proto Table State Since Info kernel_v6 Kernel master6 up 22:12:35.949 Channel ipv6 State: UP Table: master6 Preference: 10 Input filter: ACCEPT Output filter: ACCEPT Routes: 0 imported, 83 exported, 0 preferred Route change stats: received rejected filtered ignored accepted Import updates: 0 0 0 0 0 Import withdraws: 0 0 --- 0 0 Export updates: 2797 0 0 --- 2797 Export withdraws: 431 --- --- --- 431 bird> -------------------------------------------------------------------------------- However checking the route table in the kernel, there is not a single route injected by bird: -------------------------------------------------------------------------------- # ip r default via 192.168.1.254 dev eth1 proto dhcp src 192.168.1.159 metric 1003 192.168.1.0/24 dev eth1 proto dhcp scope link src 192.168.1.159 metric 1003 194.5.220.0/24 via 192.168.1.254 dev eth1 / # ip -6 r 2a0a:5480::/64 dev eth0 proto kernel metric 256 pref medium 2a0a:5480:0:a::b dev lo proto kernel metric 256 pref medium 2a0a:5480:3:1::/64 dev k8sbridge proto kernel metric 256 pref medium 2a0a:5480:3:3::3 dev lo proto kernel metric 256 pref medium 2a0a:5480:3:4::/64 dev tun0 proto kernel metric 256 pref medium 2a0a:e5c0:32:4::/64 dev tun1 proto kernel metric 256 pref medium fe80::/64 dev eth0 proto kernel metric 256 pref medium fe80::/64 dev eth1 proto kernel metric 256 pref medium fe80::/64 dev k8sbridge proto kernel metric 256 pref medium fe80::/64 dev veth99f0c958 proto kernel metric 256 pref medium fe80::/64 dev vethe20cee78 proto kernel metric 256 pref medium fe80::/64 dev veth8f504fac proto kernel metric 256 pref medium fe80::/64 dev vethc03bfec4 proto kernel metric 256 pref medium fe80::/64 dev veth046f7cf0 proto kernel metric 256 pref medium fe80::/64 dev veth434f4ff5 proto kernel metric 256 pref medium fe80::/64 dev vethd021bdfa proto kernel metric 256 pref medium fe80::/64 dev veth935a701b proto kernel metric 256 pref medium fe80::/64 dev veth473f9ed3 proto kernel metric 256 pref medium fe80::/64 dev veth931ba96a proto kernel metric 256 pref medium fe80::/64 dev vethdbaa705e proto kernel metric 256 pref medium fe80::/64 dev tun1 proto kernel metric 256 pref medium fe80::/64 dev tun0 proto kernel metric 256 pref medium / # -------------------------------------------------------------------------------- I think I saw some routes shortly being installed and then vanish within a second again, but I cannot even take a screenshot of it - so it might be that bird writes the routes and that they instantly disappear. I can reproduce the missing routes on 2 lab machines and I was even able to downgrade to 2.13.1 and reproduce it there, too. I have attached the log output of bird below. Does anyone have an idea on what might be going wrong? Best regards, Nico -------------------------------------------------------------------------------- 2023-12-25 22:12:35.949 <INFO> Started 2023-12-25 22:12:36.210 <WARN> Next hop address 2a0a:5480:2:4::2 resolvable through recursive route for ::/0 2023-12-25 22:12:36.216 <WARN> Next hop address 2a0a:e5c0:31:4::1 resolvable through recursive route for 2a0a:e5c0:31:4::/64 2023-12-25 22:12:36.216 <WARN> Next hop address 2a0a:5480:2:4::2 resolvable through recursive route for 2a0a:5480:2:4::/64 2023-12-25 22:12:36.218 <WARN> Next hop address 2a0a:5480:2:4::2 resolvable through recursive route for 2a0a:5480:2:4::/64 2023-12-25 22:12:36.218 <WARN> Next hop address 2a0a:e5c0:31:4::1 resolvable through recursive route for 2a0a:e5c0:31:4::/64 2023-12-25 22:12:36.909 <WARN> Next hop address 2a0a:e5c0:31:4::1 resolvable through recursive route for 2a0a:e5c0:31:4::/64 2023-12-25 22:12:36.909 <WARN> Next hop address 2a0a:5480:2:4::2 resolvable through recursive route for 2a0a:5480:2:4::/64 2023-12-25 22:12:36.909 <WARN> Next hop address 2a0a:5480:2:4::2 resolvable through recursive route for 2a0a:5480:2:4::/64 2023-12-25 22:12:36.909 <WARN> Next hop address 2a0a:e5c0:31:4::1 resolvable through recursive route for 2a0a:e5c0:31:4::/64 2023-12-25 22:12:38.723 <WARN> Next hop address 2a0a:e5c0:31:4::1 resolvable through recursive route for 2a0a:e5c0:31:4::/64 2023-12-25 22:12:38.723 <WARN> Next hop address 2a0a:5480:2:4::2 resolvable through recursive route for 2a0a:5480:2:4::/64 2023-12-25 22:12:38.723 <WARN> Next hop address 2a0a:5480:2:4::2 resolvable through recursive route for 2a0a:5480:2:4::/64 2023-12-25 22:12:38.723 <WARN> Next hop address 2a0a:e5c0:31:4::1 resolvable through recursive route for 2a0a:e5c0:31:4::/64 2023-12-25 22:16:45.534 <WARN> Netlink: No such device 2023-12-25 22:20:13.582 <WARN> Netlink: No such device 2023-12-25 22:23:11.536 <RMT> server121_v6_v4: Received: Administrative shutdown 2023-12-25 22:28:13.570 <WARN> Netlink: No such device 2023-12-25 22:29:40.051 <WARN> Next hop address 2a0a:e5c0:31:4::1 resolvable through recursive route for 2a0a:e5c0:31:4::/64 2023-12-25 22:29:40.051 <WARN> Next hop address 2a0a:5480:2:4::2 resolvable through recursive route for 2a0a:5480:2:4::/64 2023-12-25 22:29:40.051 <WARN> Next hop address 2a0a:5480:2:4::2 resolvable through recursive route for 2a0a:5480:2:4::/64 2023-12-25 22:29:40.051 <WARN> Next hop address 2a0a:e5c0:31:4::1 resolvable through recursive route for 2a0a:e5c0:31:4::/64 2023-12-25 22:29:40.059 <WARN> Next hop address 2a0a:e5c0:31:4::1 resolvable through recursive route for 2a0a:e5c0:31:4::/64 2023-12-25 22:29:40.059 <WARN> Next hop address 2a0a:5480:2:4::2 resolvable through recursive route for 2a0a:5480:2:4::/64 2023-12-25 22:29:40.059 <WARN> Next hop address 2a0a:5480:2:4::2 resolvable through recursive route for 2a0a:5480:2:4::/64 2023-12-25 22:29:40.059 <WARN> Next hop address 2a0a:e5c0:31:4::1 resolvable through recursive route for 2a0a:e5c0:31:4::/64 2023-12-25 22:29:40.091 <WARN> Next hop address 2a0a:e5c0:31:4::1 resolvable through recursive route for 2a0a:e5c0:31:4::/64 2023-12-25 22:29:40.091 <WARN> Next hop address 2a0a:5480:2:4::2 resolvable through recursive route for 2a0a:5480:2:4::/64 2023-12-25 22:29:40.091 <WARN> Next hop address 2a0a:5480:2:4::2 resolvable through recursive route for 2a0a:5480:2:4::/64 2023-12-25 22:29:40.091 <WARN> Next hop address 2a0a:e5c0:31:4::1 resolvable through recursive route for 2a0a:e5c0:31:4::/64 2023-12-25 22:30:02.584 <RMT> r2ge_v6_v4: Received: Administrative shutdown 2023-12-25 22:34:33.277 <WARN> Netlink: No such device 2023-12-25 22:49:44.311 <WARN> Netlink: No such device 2023-12-25 22:50:35.660 <WARN> Netlink: No such device 2023-12-25 22:50:43.548 <WARN> Netlink: No such device 2023-12-25 23:08:38.133 <WARN> Netlink: No such device 2023-12-25 23:28:39.044 <WARN> Netlink: No such device 2023-12-25 23:53:43.584 <WARN> Netlink: No such device 2023-12-26 00:02:43.576 <WARN> Netlink: No such device 2023-12-26 00:09:43.593 <WARN> Netlink: No such device 2023-12-26 00:17:44.840 <WARN> Netlink: No such device 2023-12-26 00:19:44.792 <WARN> Netlink: No such device 2023-12-26 00:24:48.079 <WARN> Netlink: No such device 2023-12-26 00:52:52.080 <WARN> Netlink: No such device 2023-12-26 01:04:44.532 <WARN> Netlink: No such device 2023-12-26 01:32:43.574 <WARN> Netlink: No such device 2023-12-26 02:17:43.583 <WARN> Netlink: No such device 2023-12-26 02:43:44.123 <WARN> Netlink: No such device 2023-12-26 03:07:06.367 <WARN> Netlink: No such device 2023-12-26 03:08:53.050 <WARN> Netlink: No such device 2023-12-26 03:39:10.264 <WARN> Netlink: No such device 2023-12-26 04:03:13.540 <WARN> Netlink: No such device 2023-12-26 04:03:43.591 <WARN> Netlink: No such device 2023-12-26 04:07:13.660 <WARN> Netlink: No such device 2023-12-26 04:22:44.732 <WARN> Netlink: No such device 2023-12-26 04:27:15.276 <WARN> Netlink: No such device 2023-12-26 04:39:43.578 <WARN> Netlink: No such device 2023-12-26 04:41:43.598 <WARN> Netlink: No such device 2023-12-26 05:09:18.230 <WARN> Netlink: No such device 2023-12-26 06:10:45.058 <WARN> Netlink: No such device 2023-12-26 06:15:27.087 <WARN> Netlink: No such device 2023-12-26 06:45:32.092 <WARN> Netlink: No such device 2023-12-26 06:55:33.326 <WARN> Netlink: No such device 2023-12-26 07:05:43.542 <WARN> Netlink: No such device 2023-12-26 07:17:35.427 <WARN> Netlink: No such device 2023-12-26 07:29:35.980 <WARN> Netlink: No such device 2023-12-26 08:01:39.077 <WARN> Netlink: No such device 2023-12-26 09:01:44.615 <WARN> Netlink: No such device 2023-12-26 09:02:43.566 <WARN> Netlink: No such device 2023-12-26 09:17:47.696 <WARN> Netlink: No such device 2023-12-26 09:23:48.668 <WARN> Netlink: No such device 2023-12-26 09:27:49.466 <WARN> Netlink: No such device 2023-12-26 09:29:43.564 <WARN> Netlink: No such device 2023-12-26 09:39:52.004 <WARN> Netlink: No such device 2023-12-26 09:44:58.208 <WARN> Netlink: No such device 2023-12-26 09:45:43.545 <WARN> Netlink: No such device 2023-12-26 09:55:53.271 <WARN> Netlink: No such device 2023-12-26 10:09:53.189 <WARN> Netlink: No such device -------------------------------------------------------------------------------- -- Sustainable and modern Infrastructures by ungleich.ch

3 4

babel RTT metric false samples
by Stephanie Wilde-Hobbs 14 Aug '24

14 Aug '24

Hi, The babel RTT metric measurements provided by bird appears suspect for my setup. The metric through a tunnel with a latency of about 5ms is shown in babel as 150+ms. Can others replicate this issue? (should be easy to check for other babel users since RTT measurement is on by default in recent versions) First I suspected a problem with the tunnel, but I compared bird's babel RTT measurement against a long-running ping for the same time period and got ~160ms measured by bird's babel implementation, and 4.6ms with a 28ms maximum latency reported by pings in the same wireguard tunnel. Other machines across my network also report similarly inflated RTT metrics for all non-wired links. Debug logs show many RTT samples with approximately correct timestamps (4-6ms) then the occasional IHU with 800-1200ms calculated instead. Calculating the RTT metric by hand using babel packet logs shows that the calculations are correct. By correlating two packet dumps (the machines have <1ms NTP timekeeping) I can also see that the packets for which high RTT is calculated have similar transit times through the tunnel as other packets. Hence, I suspect the accuracy of the packet timestamps recorded by bird. Is the current packet timestamping system giving correct timestamps if the packet arrives while babel is processing another event? I can provide packet captures for anyone interested in debugging further. Thanks, Stephanie.

5 5

RE: Bird bfd configuration
by LIU Chris 14 Jun '24

14 Jun '24

Hello, I am trying to configure BFD protocol. If configure 2 instances with below, it doesn't work. So I have to configure one instance, and put all the neighbors list to it. Is it possible to configure separate instance ? The below doesn't work protocol bfd Test1 { interface "eth2" { min rx interval 1000000 us; min tx interval 1000000 us; idle tx interval 3000000 us; multiplier 3; }; neighbor X1.Y1.Z1.A1 local X1.Y1.Z1.B1; } protocol bfd Test2 { interface "eth0" { min rx interval 1000000 us; min tx interval 1000000 us; idle tx interval 3000000 us; multiplier 3; }; neighbor X2.Y2.Z2.A2 local X2.Y2.Z2.B2; } Below it is working, protocol bfd Test { interface "eth*" { min rx interval 1000000 us; min tx interval 1000000 us; idle tx interval 3000000 us; multiplier 3; }; neighbor X1.Y1.Z1.A1 local X1.Y1.Z1.B1; neighbor X2.Y2.Z2.A2 local X2.Y2.Z2.B2; } With best regards, Chris Thales is in the process of carving out its Transportation activity (GTS) from other Thales' activities. In order to prepare this internal restructuring, a new e-mail address has been adopted and your GTS contacts now use urbanandmainlines.com. Please note that their Thales e-mail address remains also valid.

4 11

BGP Confederation Internal ASN Filtering and is_bogon() Functionality in New BIRD Version
by Brandon Zhi 08 Jun '24

08 Jun '24

Hi there, I am writing to inquire about the capabilities of the new version of BIRD regarding BGP Confederation internal ASNs. Specifically, I would like to know: 1. Can the new BIRD version filter BGP Confederation internal ASNs? 2. Does it support calculating the total AS path length, including internal ASNs within a BGP Confederation? Additionally, I have encountered an issue while using the `is_bogon()` function. It currently filters a route with the AS path (65000) 398741. I suspect this is because (65000) is being treated as a BOGON ASN. Below is the `define BOGON_ASNS` I am using: ```plaintext define BOGON_ASNS = [ 0, # RFC 7607 23456, # RFC 4893 AS_TRANS 64496..64511, # RFC 5398 and documentation/example ASNs 64512..65534, # RFC 6996 Private ASNs 65535, # RFC 7300 Last 16 bit ASN 65536..65551, # RFC 5398 and documentation/example ASNs 65552..131071, # RFC IANA reserved ASNs 4200000000..4294967294, # RFC 6996 Private ASNs 4294967295 # RFC 7300 Last 32 bit ASN ]; ``` Best regards, *Brandon Zhi* HUIZE LTD www.huize.asia <https://huize.asia/>| www.ixp.su | Twitter This e-mail and any attachments or any reproduction of this e-mail in whatever manner are confidential and for the use of the addressee(s) only. HUIZE LTD can’t take any liability and guarantee of the text of the email message and virus.

5 11

bug: routes in linux kernel are not removed on withdraw if krt_metric is used
by Leif Jakob 28 May '24

28 May '24

bird version: 2.0.12-7 (Debian stable) Hi, I use this config to install BGP routes into the linux kernel: protocol kernel { kernel table 300; scan time 10; learn on; graceful restart; metric 0; # needed to override in filter ipv6 { import none; # kernel->bgp - nothing needed export filter { # bgp->kernel if ( proto = "xxx" ) then { krt_metric = 20; accept; } # lower is choosed first by kernel if ( proto = "yyy" ) then { krt_metric = 30; accept; } reject; }; }; } This works fine. But when the route is removed (protocol gets down) it's still in the linux kernel. If I remove the krt_metric in the config it all works fine. Thanks Leif

2 1

[PATCH v2] conf: only offer bfd in bgp if bfd protocol is enabled
by Yuri Honegger 28 May '24

28 May '24

When trying to build bird with bfd support disabled (e.g. ./configure --with-protocols=bgp,static), it fails since the bgp configuration code expects bfd to be around. This patch makes the bfd option in the bgp protocol unavailable using some preprocessor logic if we are building without bfd. I'm currently trying to port bird to mac os x and the bfd module continues to cause trouble. Disabling it would therefore be useful. Sorry, with the first patch I accidentally managed to include the patch file itself. Here is a clean one. --- conf/Makefile | 4 +++- nest/config.Y | 2 ++ proto/bgp/config.Y | 3 ++- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/conf/Makefile b/conf/Makefile index 19db9c2c..0fa6749a 100644 --- a/conf/Makefile +++ b/conf/Makefile @@ -14,8 +14,10 @@ $(o)cf-parse.y: $(s)gen_parser.m4 $(o)keywords.h: $(s)gen_keywords.m4 $(o)commands.h: $(s)gen_commands.m4 +enabled_protocols_m4_defines = $(foreach protocol,$(protocols),-D PROTOCOL_$(protocol)_ENABLED) + $(conf-y-targets): $(s)confbase.Y $(s)flowspec.Y - $(M4) $(M4FLAGS) -P $(if $(word 2,$(filter %.m4,$^)),$(error "Too many M4 scripts for one target"),$(filter %.m4,$^)) $(filter %.Y,$^) >$@ + $(M4) $(M4FLAGS) -P $(enabled_protocols_m4_defines) $(if $(word 2,$(filter %.m4,$^)),$(error "Too many M4 scripts for one target"),$(filter %.m4,$^)) $(filter %.Y,$^) >$@ $(o)cf-parse.tab.h: $(o)cf-parse.tab.c diff --git a/nest/config.Y b/nest/config.Y index 62b28072..a560a12f 100644 --- a/nest/config.Y +++ b/nest/config.Y @@ -603,6 +603,7 @@ password_item_end: /* BFD options */ +m4_ifdef([[PROTOCOL_bfd_ENABLED]],[[ bfd_item: INTERVAL expr_us { this_bfd_opts->min_rx_int = this_bfd_opts->min_tx_int = $2; } @@ -647,6 +648,7 @@ bfd_opts_end: bfd_opts: bfd_opts_start '{' bfd_items '}' bfd_opts_end ; +]]) /* Core commands */ diff --git a/proto/bgp/config.Y b/proto/bgp/config.Y index 4ce06488..f15cbad3 100644 --- a/proto/bgp/config.Y +++ b/proto/bgp/config.Y @@ -220,11 +220,12 @@ bgp_proto: | bgp_proto CHECK LINK bool ';' { BGP_CFG->check_link = $4; } | bgp_proto BFD bool ';' { if ($3) init_bfd_opts(&BGP_CFG->bfd); else BGP_CFG->bfd = NULL; } | bgp_proto BFD GRACEFUL ';' { init_bfd_opts(&BGP_CFG->bfd); BGP_CFG->bfd->mode = BGP_BFD_GRACEFUL; } - | bgp_proto BFD { open_bfd_opts(&BGP_CFG->bfd); } bfd_opts { close_bfd_opts(); } ';' | bgp_proto ENFORCE FIRST AS bool ';' { BGP_CFG->enforce_first_as = $5; } | bgp_proto LOCAL ROLE bgp_role_name ';' { BGP_CFG->local_role = $4; } | bgp_proto REQUIRE ROLES bool ';' { BGP_CFG->require_roles = $4; } | bgp_proto DISABLE RX bool ';' { BGP_CFG->disable_rx = $4; } + /* Since BFD is optional, only add the BFD option when building with BFD enabled */ + m4_ifdef([[PROTOCOL_bfd_ENABLED]],[[ | bgp_proto BFD { open_bfd_opts(&BGP_CFG->bfd); } bfd_opts { close_bfd_opts(); } ';']]) ; bgp_afi: -- 2.39.3 (Apple Git-146)

2 1