- Bird-users - Mailing Lists

[PATCH v2 1/2] Babel: Remove unecessary FIB_ITERATE restart
by Daniel Gröber 30 Jan '23

30 Jan '23

The route expiration code appears to have been stolen from rip.c, in that code the rt_notify function actually does modify the rtable fib by calling fib_get. The babel code however does no such thing, so this inefficient restart is just entirely uneccesarry. To prove this is true I add a bunch of checking code that can be removed later. --- Changes in v2: - Fix assert due to misplaced lock/unlock proto/babel/babel.c | 64 ++++++++++++++++++++++++++------------------- proto/babel/babel.h | 8 +++--- 2 files changed, 42 insertions(+), 30 deletions(-) diff --git a/proto/babel/babel.c b/proto/babel/babel.c index ff8b6b52..a52125ff 100644 --- a/proto/babel/babel.c +++ b/proto/babel/babel.c @@ -58,6 +58,9 @@ static void babel_update_cost(struct babel_neighbor *n); static inline void babel_kick_timer(struct babel_proto *p); static inline void babel_iface_kick_timer(struct babel_iface *ifa); +#define rtable_lock(rtable) ASSERT(!(rtable)->lock++) +#define rtable_unlock(rtable) ASSERT(!--(rtable)->lock) + /* * Functions to maintain data structures */ @@ -76,15 +79,16 @@ babel_init_entry(struct fib *f UNUSED, void *E) static inline struct babel_entry * babel_find_entry(struct babel_proto *p, const net_addr *n) { - struct fib *rtable = (n->type == NET_IP4) ? &p->ip4_rtable : &p->ip6_rtable; + struct fib *rtable = (n->type == NET_IP4) ? &p->ip4_rtable.fib : &p->ip6_rtable.fib; return fib_find(rtable, n); } static struct babel_entry * babel_get_entry(struct babel_proto *p, const net_addr *n) { - struct fib *rtable = (n->type == NET_IP4) ? &p->ip4_rtable : &p->ip6_rtable; - struct babel_entry *e = fib_get(rtable, n); + struct babel_rtable *rtable = (n->type == NET_IP4) ? &p->ip4_rtable : &p->ip6_rtable; + ASSERT(!rtable->lock); + struct babel_entry *e = fib_get(&rtable->fib, n); return e; } @@ -217,17 +221,18 @@ babel_refresh_route(struct babel_proto *p, struct babel_route *r) } static void -babel_expire_routes_(struct babel_proto *p, struct fib *rtable) +babel_expire_routes_(struct babel_proto *p, struct babel_rtable *rtable) { struct babel_config *cf = (void *) p->p.cf; struct babel_route *r, *rx; struct fib_iterator fit; btime now_ = current_time(); - FIB_ITERATE_INIT(&fit, rtable); + FIB_ITERATE_INIT(&fit, &rtable->fib); loop: - FIB_ITERATE_START(rtable, &fit, struct babel_entry, e) + rtable_lock(rtable); + FIB_ITERATE_START(&rtable->fib, &fit, struct babel_entry, e) { int changed = 0; @@ -244,16 +249,7 @@ loop: } 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_)) @@ -263,6 +259,7 @@ loop: if (e->unreachable && (!e->valid || (e->router_id == p->router_id))) { FIB_ITERATE_PUT(&fit); + rtable_unlock(rtable); babel_announce_retraction(p, e); goto loop; } @@ -274,11 +271,13 @@ loop: if (!e->valid && EMPTY_LIST(e->routes) && EMPTY_LIST(e->sources) && EMPTY_LIST(e->requests)) { FIB_ITERATE_PUT(&fit); - fib_delete(rtable, e); + rtable_unlock(rtable); + fib_delete(&rtable->fib, e); goto loop; } } FIB_ITERATE_END; + rtable_unlock(rtable); } static void @@ -959,7 +958,7 @@ babel_send_seqno_request(struct babel_proto *p, struct babel_entry *e, * transmitted entry is updated. */ static void -babel_send_update_(struct babel_iface *ifa, btime changed, struct fib *rtable) +babel_send_update_(struct babel_iface *ifa, btime changed, struct babel_rtable *rtable) { struct babel_proto *p = ifa->proto; @@ -970,7 +969,8 @@ babel_send_update_(struct babel_iface *ifa, btime changed, struct fib *rtable) p->update_seqno_inc = 0; } - FIB_WALK(rtable, struct babel_entry, e) + rtable_lock(rtable); + FIB_WALK(&rtable->fib, struct babel_entry, e) { if (!e->valid) continue; @@ -1022,6 +1022,7 @@ babel_send_update_(struct babel_iface *ifa, btime changed, struct fib *rtable) } } FIB_WALK_END; + rtable_unlock(rtable); } static void @@ -2055,16 +2056,21 @@ babel_dump(struct proto *P) WALK_LIST(ifa, p->interfaces) babel_dump_iface(ifa); - FIB_WALK(&p->ip4_rtable, struct babel_entry, e) + rtable_lock(&p->ip4_rtable); + FIB_WALK(&p->ip4_rtable.fib, struct babel_entry, e) { babel_dump_entry(e); } FIB_WALK_END; - FIB_WALK(&p->ip6_rtable, struct babel_entry, e) + rtable_unlock(&p->ip4_rtable); + + rtable_lock(&p->ip6_rtable); + FIB_WALK(&p->ip6_rtable.fib, struct babel_entry, e) { babel_dump_entry(e); } FIB_WALK_END; + rtable_unlock(&p->ip6_rtable); } static void @@ -2180,11 +2186,12 @@ babel_show_neighbors(struct proto *P, const char *iff) } static void -babel_show_entries_(struct babel_proto *p, struct fib *rtable) +babel_show_entries_(struct babel_proto *p, struct babel_rtable *rtable) { int width = babel_sadr_enabled(p) ? -54 : -24; - FIB_WALK(rtable, struct babel_entry, e) + rtable_lock(rtable); + FIB_WALK(&rtable->fib, struct babel_entry, e) { struct babel_route *r = NULL; uint rts = 0, srcs = 0; @@ -2207,6 +2214,7 @@ babel_show_entries_(struct babel_proto *p, struct fib *rtable) e->n.addr, "<none>", "-", "-", rts, srcs); } FIB_WALK_END; + rtable_unlock(rtable); } void @@ -2230,11 +2238,12 @@ babel_show_entries(struct proto *P) } static void -babel_show_routes_(struct babel_proto *p, struct fib *rtable) +babel_show_routes_(struct babel_proto *p, struct babel_rtable *rtable) { int width = babel_sadr_enabled(p) ? -54 : -24; - FIB_WALK(rtable, struct babel_entry, e) + rtable_lock(rtable); + FIB_WALK(&rtable->fib, struct babel_entry, e) { struct babel_route *r; WALK_LIST(r, e->routes) @@ -2247,6 +2256,7 @@ babel_show_routes_(struct babel_proto *p, struct fib *rtable) } } FIB_WALK_END; + rtable_unlock(rtable); } void @@ -2446,9 +2456,9 @@ babel_start(struct proto *P) struct babel_config *cf = (void *) P->cf; u8 ip6_type = cf->ip6_channel ? cf->ip6_channel->net_type : NET_IP6; - fib_init(&p->ip4_rtable, P->pool, NET_IP4, sizeof(struct babel_entry), + fib_init(&p->ip4_rtable.fib, P->pool, NET_IP4, sizeof(struct babel_entry), OFFSETOF(struct babel_entry, n), 0, babel_init_entry); - fib_init(&p->ip6_rtable, P->pool, ip6_type, sizeof(struct babel_entry), + fib_init(&p->ip6_rtable.fib, P->pool, ip6_type, sizeof(struct babel_entry), OFFSETOF(struct babel_entry, n), 0, babel_init_entry); init_list(&p->interfaces); @@ -2508,7 +2518,7 @@ babel_reconfigure(struct proto *P, struct proto_config *CF) TRACE(D_EVENTS, "Reconfiguring"); - if (p->ip6_rtable.addr_type != ip6_type) + if (p->ip6_rtable.fib.addr_type != ip6_type) return 0; if (!proto_configure_channel(P, &p->ip4_channel, new->ip4_channel) || diff --git a/proto/babel/babel.h b/proto/babel/babel.h index da8386b3..e55523ed 100644 --- a/proto/babel/babel.h +++ b/proto/babel/babel.h @@ -158,8 +158,10 @@ struct babel_iface_config { struct babel_proto { struct proto p; timer *timer; - struct fib ip4_rtable; - struct fib ip6_rtable; + struct babel_rtable { + struct fib fib; + u8 lock; /* Ensure no changes during FIB_ITERATE */ + } ip4_rtable, ip6_rtable; struct channel *ip4_channel; struct channel *ip6_channel; @@ -408,7 +410,7 @@ struct babel_msg_auth { }; static inline int babel_sadr_enabled(struct babel_proto *p) -{ return p->ip6_rtable.addr_type == NET_IP6_SADR; } +{ return p->ip6_rtable.fib.addr_type == NET_IP6_SADR; } /* babel.c */ void babel_handle_ack_req(union babel_msg *msg, struct babel_iface *ifa); -- 2.30.2

1 1

BGP Route Aggregation - latest status ???
by Foo Weng Chan 30 Jan '23

30 Jan '23

Hi All, I'm using latest BIRD 2.0.12 but still not seeing availability of BGP Route Aggregation feature. May I know any update on this feature since the most recent post I can find per below : https://bird.network.cz/pipermail/bird-users/2021-February/015203.html My setup has a BGP border router receives multiple /32 prefixes from few internal IBGP peers. When advertise it our to EBGP peers, I need to aggregate it into a single /24 prefix as the upstream ISP does not accept any prefix smaller than /24. Also, when all IBGP peer stop announcing /32 prefixes, I shall stop announcing /24 prefix to EBGP as well. Basically this is exactly what Cisco IOS router do with the following BGP command : aggregate-address 103.1035.59.0 255.255.255.0 summary-only Is that anyway to implement the above with BIRD ? Thanks & rgds, Chan

2 1

[PATCH] feature to keep protocol's state while configuring
by Alexander Zubkov 29 Jan '23

29 Jan '23

Hello. I have created a patch (attached) with new protocol option: disabled keep on|off. To keep the protocol's state while loading new config. It is useful when protocols disabled manually in the runtime, but we want to keep that state when loading new config. Patch is attached. I have made it against the current int-new branch.

3 16

ABR sets E-bit (and B-bit) in router LSA
by Kenth Eriksson 27 Jan '23

27 Jan '23

I have a setup as in the attached drawing. I can see that the bird ABR node (R2) sets the E-bit and the B-bit in the router LSA. The B-bit seems correct as it is the ABR, but it is not an ASBR. Below is a tcpdump captured on R1 Frame 11347: 124 bytes on wire (992 bits), 124 bytes captured (992 bits) Linux cooked capture v2 PPP-over-Ethernet Session Point-to-Point Protocol Internet Protocol Version 4, Src: 10.210.138.69, Dst: 224.0.0.5 Open Shortest Path First OSPF Header Version: 2 Message Type: LS Update (4) Packet Length: 76 Source OSPF Router: 10.210.138.69 Area ID: 0.0.0.0 (Backbone) Checksum: 0x9d61 [correct] Auth Type: Null (0) Auth Data (none): 0000000000000000 LS Update Packet Number of LSAs: 1 LSA-type 1 (Router-LSA), len 48 .000 0000 0000 0001 = LS Age (seconds): 1 0... .... .... .... = Do Not Age Flag: 0 Options: 0x42, O, (E) External Routing 0... .... = DN: Not set .1.. .... = O: Set ..0. .... = (DC) Demand Circuits: Not supported ...0 .... = (L) LLS Data block: Not Present .... 0... = (N) NSSA: Not supported .... .0.. = (MC) Multicast: Not capable .... ..1. = (E) External Routing: Capable .... ...0 = (MT) Multi-Topology Routing: No LS Type: Router-LSA (1) Link State ID: 10.210.138.69 Advertising Router: 10.210.138.69 Sequence Number: 0x80000075 Checksum: 0x180f Length: 48 Flags: 0x03, (E) AS boundary router, (B) Area border router 0... .... = (H) flag: No ...0 .... = (N) flag: No .... 0... = (W) Wild-card multicast receiver: No .... .0.. = (V) Virtual link endpoint: No .... ..1. = (E) AS boundary router: Yes .... ...1 = (B) Area border router: Yes Number of Links: 2 Type: Stub ID: 10.210.138.69 Data: 255.255.255.255 Metric: 0 Type: PTP ID: 10.210.138.66 Data: 10.210.138.69 Metric: 10 The Cisco router sees these bird routers as ASBR routers as well R3-Cisco>show ip ospf border-routers OSPF Router with ID (10.210.138.65) (Process ID 1) Base Topology (MTID 0) Internal Router Routing Table Codes: i - Intra-area route, I - Inter-area route i 10.210.138.66 [1] via 10.210.138.66, GigabitEthernet0/0/1, ASBR, Area 0.0.0.0, SPF 77 i 10.210.138.69 [11] via 10.210.138.66, GigabitEthernet0/0/1, ABR/ASBR, Area 0.0.0.0, SPF 77 I 10.210.138.73 [21] via 10.210.138.66, GigabitEthernet0/0/1, ASBR, Area 0.0.0.0, SPF 77 R3-Cisco> R3-Cisco>show ip ospf database OSPF Router with ID (10.210.138.65) (Process ID 1) Router Link States (Area 0.0.0.0) Link ID ADV Router Age Seq# Checksum Link count 10.210.138.65 10.210.138.65 870 0x800000DE 0x0091B0 2 10.210.138.66 10.210.138.66 828 0x800000AC 0x00DBB2 3 10.210.138.69 10.210.138.69 828 0x8000009F 0x00C339 2 Net Link States (Area 0.0.0.0) Link ID ADV Router Age Seq# Checksum 10.210.138.65 10.210.138.65 870 0x80000035 0x003F26 Summary Net Link States (Area 0.0.0.0) Link ID ADV Router Age Seq# Checksum 10.210.138.73 10.210.138.69 591 0x8000002D 0x002465 Summary ASB Link States (Area 0.0.0.0) Link ID ADV Router Age Seq# Checksum 10.210.138.73 10.210.138.69 591 0x8000002D 0x001672 Type-5 AS External Link States Link ID ADV Router Age Seq# Checksum Tag 0.0.0.0 10.210.138.65 1650 0x80000034 0x004EA1 1 R3-Cisco>

2 2

SYM_MAX_LEN
by Alexander Zubkov 27 Jan '23

27 Jan '23

Hi, If I do not mistake, cf_new_symbol() has incorrect check of symbol length. In other places where SYM_MAX_LEN is used, it is expected that leading zero is counted in it. But the check in cf_new_symbol() allows symbol length equal to SYM_MAX_LEN. This does not cause a problem (as I unederstand), because the space is allocated anyway and this string is not copied later to fixed size arrays. I attached a patch with the fix, there is also a couple of bsprintf replaced with safer bsnprintf calls.

1 0

rename symbols
by Alexander Zubkov 25 Jan '23

25 Jan '23

Hi all, Some weird idea. I'm not sure it needs to be in the mainstream version, but somebody might find it helpful. For example I may want to refactor the naming scheme for protocols/tables in my bird config. But when I apply the new config with the new names, such renamed protocols will be recreated or restarted, which may be undesired. So if I could rename protocols/tables in advance and then load the new config, I can hope than no changes would be found and the there would be no interruptions. The attached patch solves the problem, by introducing such changes: To rename some symbol one can use cli command: rename <old_symbol> "<new_name>" The new name is in the form of the string, because symbol form requires symbol to be created. I tried to use CF_SYM_UNDEFINED for the second parameter. It works somehow, but leaves duplicate symbols in the table. If there is some way to clean them after it, it could be more visually pleasing option. The other problem is that a symbol has the fixed buffer for the name bound by its length. And one would not be able to rename it to a new name that is longer. But to overcome that, I add a field to a symbol to remember the length of the allocated buffer and allow the buffer to be bigger. This can be controlled by config option: symbols min <len> Which sets minum length that will fit the buffer. But as symbols are allocated while reading the config, you need to place this configuration option to the top of your config, i.e. before all the symbols you want to rename. So you can load the old config with the old names and this option added, it will allocate bigger buffers for the symbols. Then you can rename your symbols to the new ones. And finally load the new config with the new names. Of course you need the bird version with this patch applied in advace to do the trick. :)

3 9

Question: ROA verification does not work properly on bird 2.0.11
by haima 23 Jan '23

23 Jan '23

Hello dear community members, I am configuring RPKI verification for my network, but I have encountered a strange syntax error problem. My configuration is as follows: roa4 table roa_table4; roa6 table roa_table6; protocol rpki Cloudflare_RPKI { roa4 { table roa_table4; }; roa6 { table roa_table6; }; remote "172.65.0.2" port 8282; retry keep 90; refresh keep 900; expire keep 172800; } function is_rpki_invalid () { } if roa_check(roa_table4, net, bgp_path.last) = ROA_INVALID then return true if roa_check(roa_table6, net, bgp_path.last) = ROA_INVALID then return true; return false; } bird will return the following error: /etc/bird/function.conf:59:22 Syntax error, unexpected CF_SYM_UNDEFINED, expecting CF_SYM_KNOWN This error is also returned by the example configuration provided in the documentation. PS: RPKI session placed in bird.conf PS: Function placed in function.conf Regards, Haima MoeBee Network

3 4

回覆: 回覆: Question: ROA verification does not work properly on bird 2.0.11
by haima 23 Jan '23

23 Jan '23

Hi Maria, This is not an empty Funciton, it is complete as follows: function is_rpki_invalid() { if roa_check(roa_table4, net, bgp_path.last) = ROA_INVALID then return true; if roa_check(roa_table6, net, bgp_path.last) = ROA_INVALID then return true; return false; } Thank you for your reply Haima MoeBee Network 寄件者: Maria Matejka 已傳送: 星期一, 2023 年 1 月 23 日 23:55 收件者: haima; bird-users(a)network.cz 主旨: Re: 回覆: Question: ROA verification does not work properly on bird 2.0.11 Oh, looking at your previous post, I've spotted that on the previous line, you have this: function is_rpki_invalid() { } The ending brace creates an empty function and the following line is then probably misinterpreted as something strange. Maria On 1/23/23 16:50, haima wrote: > Hi, Maria, Thanks for your reply, > > Line 59 reads as follows: > > if roa_check(roa_table4, net, bgp_path.last) = ROA_INVALID then return true; > > > Thanks, > > Haima > MoeBee Network > > > > 寄件者: Bird-users 代表 Maria Matejka via Bird-users > 已傳送: 星期一, 2023 年 1 月 23 日 23:38 > 收件者: bird-users(a)network.cz > 主旨: Re: Question: ROA verification does not work properly on bird 2.0.11 > > > > > Hello! > >> bird will return the following error: /etc/bird/function.conf:59:22 Syntax error, unexpected CF_SYM_UNDEFINED, expecting CF_SYM_KNOWN > > > > The numbers 59:22 are actually the line:char index in that file. Could > > you please disclose what is in /etc/bird/function.conf around line 59 to > > let us help you find out what's the case? > > > > Thanks > > > > Maria >

1 0

RE: 回覆: Question: ROA verification does not work properly on bird 2.0.11
by haima 23 Jan '23

23 Jan '23

Hi Maria, This is not an empty Funciton, it is complete as follows: function is_rpki_invalid() { if roa_check(roa_table4, net, bgp_path.last) = ROA_INVALID then return true; if roa_check(roa_table6, net, bgp_path.last) = ROA_INVALID then return true; return false; } Thank you for your reply Haima MoeBee Network 寄件者: Maria Matejka 已傳送: 星期一, 2023 年 1 月 23 日 23:55 收件者: haima; bird-users(a)network.cz 主旨: Re: 回覆: Question: ROA verification does not work properly on bird 2.0.11 Oh, looking at your previous post, I've spotted that on the previous line, you have this: function is_rpki_invalid() { } The ending brace creates an empty function and the following line is then probably misinterpreted as something strange. Maria On 1/23/23 16:50, haima wrote: > Hi, Maria, Thanks for your reply, > > Line 59 reads as follows: > > if roa_check(roa_table4, net, bgp_path.last) = ROA_INVALID then return true; > > > Thanks, > > Haima > MoeBee Network > > > > 寄件者: Bird-users 代表 Maria Matejka via Bird-users > 已傳送: 星期一, 2023 年 1 月 23 日 23:38 > 收件者: bird-users(a)network.cz > 主旨: Re: Question: ROA verification does not work properly on bird 2.0.11 > > > > > Hello! > >> bird will return the following error: /etc/bird/function.conf:59:22 Syntax error, unexpected CF_SYM_UNDEFINED, expecting CF_SYM_KNOWN > > > > The numbers 59:22 are actually the line:char index in that file. Could > > you please disclose what is in /etc/bird/function.conf around line 59 to > > let us help you find out what's the case? > > > > Thanks > > > > Maria >

1 0

回覆: Question: ROA verification does not work properly on bird 2.0.11
by haima 23 Jan '23

23 Jan '23

Hi, Maria, Thanks for your reply, Line 59 reads as follows: if roa_check(roa_table4, net, bgp_path.last) = ROA_INVALID then return true; Thanks, Haima MoeBee Network 寄件者: Bird-users 代表 Maria Matejka via Bird-users 已傳送: 星期一, 2023 年 1 月 23 日 23:38 收件者: bird-users(a)network.cz 主旨: Re: Question: ROA verification does not work properly on bird 2.0.11 Hello! > bird will return the following error: /etc/bird/function.conf:59:22 Syntax error, unexpected CF_SYM_UNDEFINED, expecting CF_SYM_KNOWN The numbers 59:22 are actually the line:char index in that file. Could you please disclose what is in /etc/bird/function.conf around line 59 to let us help you find out what's the case? Thanks Maria

2 1