]> git.proxmox.com Git - mirror_frr.git/log
mirror_frr.git
2 years agozebra: Abstract nhg deletion to reduce code duplication
Donald Sharp [Thu, 22 Jul 2021 13:21:15 +0000 (09:21 -0400)]
zebra: Abstract nhg deletion to reduce code duplication

Reduce code duplication when we are cleaning up nexthop
groups.

Signed-off-by: Donald Sharp <sharpd@nvidia.com>
2 years agozebra: Fix ships in the night issue
Donald Sharp [Thu, 24 Jun 2021 16:23:33 +0000 (12:23 -0400)]
zebra: Fix ships in the night issue

When using wait for install there exists situations where
zebra will issue several route change operations to the kernel
but end up in a state where we shouldn't be at the end
due to extra data being received.  Example:

a) zebra receives from bgp a route change, installs sends the
route to the kernel.
b) zebra receives a route deletion from bgp, removes the
struct route entry and then sends to the kernel a deletion.
c) zebra receives an asynchronous notification that (a) succeeded
but we treat this as a new route.

This is the ships in the night problem.  In this case if we receive
notification from the kernel about a route that we know nothing
about and we are not in startup and we are doing asic offload
then we can ignore this update.

Ticket: #2563300
Signed-off-by: Donald Sharp <sharpd@nvidia.com>
2 years agoMerge pull request #10518 from donaldsharp/af_unspec
Igor Ryzhov [Mon, 7 Feb 2022 20:29:33 +0000 (23:29 +0300)]
Merge pull request #10518 from donaldsharp/af_unspec

Af unspec

2 years agoMerge pull request #10441 from donaldsharp/pim_bsr_warning_remove
Russ White [Mon, 7 Feb 2022 19:03:53 +0000 (14:03 -0500)]
Merge pull request #10441 from donaldsharp/pim_bsr_warning_remove

pimd: Only remove bsr NHT if we actually have tracked something

2 years agobfdd: Use AF_UNSPEC instead of comparing to 0
Donald Sharp [Mon, 7 Feb 2022 18:25:21 +0000 (13:25 -0500)]
bfdd: Use AF_UNSPEC instead of comparing to 0

Signed-off-by: Donald Sharp <sharpd@nvidia.com>
2 years agozebra: Use AF_UNSPEC instead of setting to 0
Donald Sharp [Mon, 7 Feb 2022 18:22:41 +0000 (13:22 -0500)]
zebra: Use AF_UNSPEC instead of setting to 0

Signed-off-by: Donald Sharp <sharpd@nvidia.com>
2 years agolib: Use AF_UNSPEC intead of setting to 0
Donald Sharp [Mon, 7 Feb 2022 18:21:55 +0000 (13:21 -0500)]
lib: Use AF_UNSPEC intead of setting to 0

Signed-off-by: Donald Sharp <sharpd@nvidia.com>
2 years agoospfd: Use AF_UNSPEC instead of setting to 0
Donald Sharp [Mon, 7 Feb 2022 18:20:43 +0000 (13:20 -0500)]
ospfd:  Use AF_UNSPEC instead of setting to 0

Signed-off-by: Donald Sharp <sharpd@nvidia.com>
2 years agobgpd: Use AF_UNSPEC instead of setting to 0
Donald Sharp [Mon, 7 Feb 2022 18:16:59 +0000 (13:16 -0500)]
bgpd: Use AF_UNSPEC instead of setting to 0

Signed-off-by: Donald Sharp <sharpd@nvidia.com>
2 years agoMerge pull request #10510 from ton31337/fix/rmap_dummy_attr_flush
Igor Ryzhov [Mon, 7 Feb 2022 14:40:13 +0000 (17:40 +0300)]
Merge pull request #10510 from ton31337/fix/rmap_dummy_attr_flush

bgpd: Flush temporary attributes after route-map apply

2 years agobgpd: Print route-map name for filtred outgoing prefixes
Donatas Abraitis [Mon, 7 Feb 2022 10:04:10 +0000 (12:04 +0200)]
bgpd: Print route-map name for filtred outgoing prefixes

Signed-off-by: Donatas Abraitis <donatas.abraitis@gmail.com>
2 years agobgpd: Flush temporary attributes after route-map apply
Donatas Abraitis [Mon, 7 Feb 2022 08:50:33 +0000 (10:50 +0200)]
bgpd: Flush temporary attributes after route-map apply

Fixes crash:

```
Received signal 6 at 1644222173 (si_addr 0x6f000012d2, PC 0x7f79274cbfb7); aborting...
/usr/lib/x86_64-linux-gnu/frr/libfrr.so.0(zlog_backtrace_sigsafe+0x6d) [0x7f79282e079d]
/usr/lib/x86_64-linux-gnu/frr/libfrr.so.0(zlog_signal+0xf3) [0x7f79282e0993]
/usr/lib/x86_64-linux-gnu/frr/libfrr.so.0(+0xbd881) [0x7f792830b881]
/lib/x86_64-linux-gnu/libpthread.so.0(+0x12980) [0x7f7927890980]
/lib/x86_64-linux-gnu/libc.so.6(gsignal+0xc7) [0x7f79274cbfb7]
/lib/x86_64-linux-gnu/libc.so.6(abort+0x141) [0x7f79274cd921]
/lib/x86_64-linux-gnu/libc.so.6(+0x89967) [0x7f7927516967]
/lib/x86_64-linux-gnu/libc.so.6(+0x909da) [0x7f792751d9da]
/lib/x86_64-linux-gnu/libc.so.6(cfree+0x620) [0x7f7927525050]
/usr/lib/frr/bgpd(+0x1e7c1c) [0x55b5c53b1c1c]
/usr/lib/frr/bgpd(aspath_free+0x28) [0x55b5c53b1c78]
/usr/lib/frr/bgpd(bgp_attr_flush+0x245) [0x55b5c52abc15]
/usr/lib/frr/bgpd(subgroup_announce_check+0x1137) [0x55b5c530c5d7]
```

Signed-off-by: Donatas Abraitis <donatas.abraitis@gmail.com>
2 years agoMerge pull request #10432 from sworleys/PBR-Fix
Jafar Al-Gharaibeh [Sun, 6 Feb 2022 21:18:22 +0000 (15:18 -0600)]
Merge pull request #10432 from sworleys/PBR-Fix

pbrd: pbr route maps get addr family of nhgs

2 years agoMerge pull request #10471 from ton31337/fix/release_candidate_procedure
Jafar Al-Gharaibeh [Sun, 6 Feb 2022 21:06:16 +0000 (15:06 -0600)]
Merge pull request #10471 from ton31337/fix/release_candidate_procedure

doc: Add a commands snippet to workflow about what to do in RC1 phase

2 years agoMerge pull request #10323 from opensourcerouting/ospf6-lsa-stats
Igor Ryzhov [Sun, 6 Feb 2022 18:46:13 +0000 (21:46 +0300)]
Merge pull request #10323 from opensourcerouting/ospf6-lsa-stats

ospf6d: LSA statistics

2 years agoMerge pull request #10475 from ton31337/fix/coverity_bgpd
Igor Ryzhov [Sun, 6 Feb 2022 18:06:15 +0000 (21:06 +0300)]
Merge pull request #10475 from ton31337/fix/coverity_bgpd

bgpd: Coverity fixes

2 years agoMerge pull request #10494 from whichbug/fix#10487
Igor Ryzhov [Sun, 6 Feb 2022 17:55:26 +0000 (20:55 +0300)]
Merge pull request #10494 from whichbug/fix#10487

babeld: add a check for truncated packets

2 years agodoc: Add a commands snippet to workflow about what to do in the 1st phase
Donatas Abraitis [Tue, 1 Feb 2022 20:25:22 +0000 (22:25 +0200)]
doc: Add a commands snippet to workflow about what to do in the 1st phase

What we should do when creating stabilization branch from the master.

Signed-off-by: Donatas Abraitis <donatas.abraitis@gmail.com>
2 years agoMerge pull request #10472 from ton31337/fix/no_need_to_decorate
Jafar Al-Gharaibeh [Sat, 5 Feb 2022 01:41:43 +0000 (19:41 -0600)]
Merge pull request #10472 from ton31337/fix/no_need_to_decorate

tools: Skip decorating commits with references (branch name, remote)

2 years agoMerge pull request #9926 from donaldsharp/update_issues
Jafar Al-Gharaibeh [Sat, 5 Feb 2022 01:40:55 +0000 (19:40 -0600)]
Merge pull request #9926 from donaldsharp/update_issues

zebra: Fix v6 route replace failure turned into success

2 years agotools: Skip decorating commits with references (branch name, remote)
Donatas Abraitis [Tue, 1 Feb 2022 20:42:10 +0000 (22:42 +0200)]
tools: Skip decorating commits with references (branch name, remote)

I think we don't care about this in release notes.

bgpd,pimd,isisd,nhrpd: Convert to vty_json() (origin/fix/vty_json)
ospf6d: Fix memory leak for `show ipv6 ospf6 zebra json` (origin/fix/zebra_ospf6d_json_leak)

Signed-off-by: Donatas Abraitis <donatas.abraitis@gmail.com>
2 years agoMerge pull request #10501 from donaldsharp/more_zebra_show
Jafar Al-Gharaibeh [Fri, 4 Feb 2022 21:13:45 +0000 (15:13 -0600)]
Merge pull request #10501 from donaldsharp/more_zebra_show

More zebra show

2 years agobabeld: fix #10487 by adding a check on packet length
whichbug [Thu, 3 Feb 2022 17:01:31 +0000 (12:01 -0500)]
babeld: fix #10487 by adding a check on packet length

The body length of a packet should satisfy the condition:
packetlen >= bodylen + 4. Otherwise, heap overflows may happen.

Signed-off-by: whichbug <whichbug@github.com>
2 years agoMerge pull request #10470 from ton31337/fix/advance_packaging_version_for_development
Jafar Al-Gharaibeh [Fri, 4 Feb 2022 20:38:12 +0000 (14:38 -0600)]
Merge pull request #10470 from ton31337/fix/advance_packaging_version_for_development

debian, redhat: updating changelog for new release

2 years agozebra: Fix v6 route replace failure turned into success
Donald Sharp [Wed, 10 Nov 2021 21:58:58 +0000 (16:58 -0500)]
zebra: Fix v6 route replace failure turned into success

Currently when we have a route replace operation for v6 routes
with a new nexthop group the order of kernel installation is this:

a) New nexthop group insertion seq  1
b) Route delete operation seq 3
c) Route insertion operation seq 2

Currently the code in nl_batch_read_resp is attempting
to handle this situation by skipping the delete operation.
*BUT* it is enqueuing the context into the zebra dplane
queue before we read the response.  Since we create the ctx
with an implied success, success is being reported to the
upper level dplane and the zebra rib thinks the route has
been properly handled.

This is showing up in the zebra_seg6_route test code because
the test code is installing a seg6 route w/ sharpd and it
is failing to install because the route's nexthop is rejected:

First installation:

2021/10/29 09:28:10.218 ZEBRA: [JGWSB-SMNVE] dplane: incoming new work counter: 2
2021/10/29 09:28:10.218 ZEBRA: [Q52A7-211QJ] dplane enqueues 2 new work to provider 'Kernel'
2021/10/29 09:28:10.218 ZEBRA: [JVY1P-93VFY] dplane provider 'Kernel': processing
2021/10/29 09:28:10.218 ZEBRA: [TX9N0-9JKDF] ID (9) Dplane nexthop update ctx 0x56125390a820 op NH_INSTALL
2021/10/29 09:28:10.218 ZEBRA: [PM9ZJ-07RCP] 0:1::1/128 Dplane route update ctx 0x56125390add0 op ROUTE_INSTALL
2021/10/29 09:28:10.218 ZEBRA: [TJ327-ET8HE] netlink_send_msg: >> netlink message dump [sent]
2021/10/29 09:28:10.218 ZEBRA: [JAS4D-NCWGP] nlmsghdr [len=104 type=(104) NEWNEXTHOP flags=(0x0501) {REQUEST,DUMP,(ROOT|REPLACE|CAPPED),(ATOMIC|CREATE)} seq=9 pid=3539131282]
2021/10/29 09:28:10.218 ZEBRA: [WCX94-SW894]   nhm [family=(10) AF_INET6 scope=(0) UNIVERSE protocol=(11) ZEBRA flags=0x00000000 {}]
2021/10/29 09:28:10.218 ZEBRA: [KFBSR-XYJV1]     rta [len=8 (payload=4) type=(1) ID]
2021/10/29 09:28:10.218 ZEBRA: [Z4E9C-GD9EP]       9
2021/10/29 09:28:10.218 ZEBRA: [KFBSR-XYJV1]     rta [len=20 (payload=16) type=(6) GATEWAY]
2021/10/29 09:28:10.218 ZEBRA: [STTSM-27M81]       2001::1
2021/10/29 09:28:10.218 ZEBRA: [KFBSR-XYJV1]     rta [len=8 (payload=4) type=(5) OIF]
2021/10/29 09:28:10.218 ZEBRA: [JR4EA-BKPTA]       6
2021/10/29 09:28:10.218 ZEBRA: [KFBSR-XYJV1]     rta [len=6 (payload=2) type=(7) ENCAP_TYPE]
2021/10/29 09:28:10.218 ZEBRA: [JR4EA-BKPTA]       5
2021/10/29 09:28:10.218 ZEBRA: [KFBSR-XYJV1]     rta [len=36 (payload=32) type=(32776) UNKNOWN]
2021/10/29 09:28:10.218 ZEBRA: [JAS4D-NCWGP] nlmsghdr [len=64 type=(24) NEWROUTE flags=(0x0401) {REQUEST,(ATOMIC|CREATE)} seq=10 pid=3539131282]
2021/10/29 09:28:10.218 ZEBRA: [GCEGC-W8YBF]   rtmsg [family=(10) AF_INET6 dstlen=128 srclen=0 tos=0 table=254 protocol=(194) UNKNOWN scope=(0) UNIVERSE type=(1) UNICAST flags=0x0000 {}]
2021/10/29 09:28:10.218 ZEBRA: [KFBSR-XYJV1]     rta [len=20 (payload=16) type=(1) DST]
2021/10/29 09:28:10.218 ZEBRA: [STTSM-27M81]       1::1
2021/10/29 09:28:10.218 ZEBRA: [KFBSR-XYJV1]     rta [len=8 (payload=4) type=(6) PRIORITY]
2021/10/29 09:28:10.218 ZEBRA: [Z4E9C-GD9EP]       20
2021/10/29 09:28:10.218 ZEBRA: [KFBSR-XYJV1]     rta [len=8 (payload=4) type=(30) NH_ID]
2021/10/29 09:28:10.218 ZEBRA: [Z4E9C-GD9EP]       9
2021/10/29 09:28:10.218 ZEBRA: [V8KNF-8EXH8] netlink_recv_msg: << netlink message dump [recv]
2021/10/29 09:28:10.218 ZEBRA: [JAS4D-NCWGP] nlmsghdr [len=76 type=(2) ERROR flags=(0x0300) {DUMP,(ROOT|REPLACE|CAPPED),(MATCH|EXCLUDE|ACK_TLVS)} seq=9 pid=3539131282]
2021/10/29 09:28:10.218 ZEBRA: [KWP1C-6CSXF]   nlmsgerr [error=(-22) Invalid argument]
2021/10/29 09:28:10.218 ZEBRA: [HSYZM-HV7HF] Extended Error: Gateway can not be a local address
2021/10/29 09:28:10.218 ZEBRA: [WVJCK-PPMGD][EC 4043309093] netlink-dp (NS 0) error: Invalid argument, type=RTM_NEWNEXTHOP(104), seq=9, pid=3539131282
2021/10/29 09:28:10.218 ZEBRA: [V8KNF-8EXH8] netlink_recv_msg: << netlink message dump [recv]
2021/10/29 09:28:10.218 ZEBRA: [JAS4D-NCWGP] nlmsghdr [len=68 type=(2) ERROR flags=(0x0300) {DUMP,(ROOT|REPLACE|CAPPED),(MATCH|EXCLUDE|ACK_TLVS)} seq=10 pid=3539131282]
2021/10/29 09:28:10.218 ZEBRA: [KWP1C-6CSXF]   nlmsgerr [error=(-22) Invalid argument]
2021/10/29 09:28:10.218 ZEBRA: [HSYZM-HV7HF] Extended Error: Nexthop id does not exist
2021/10/29 09:28:10.218 ZEBRA: [WVJCK-PPMGD][EC 4043309093] netlink-dp (NS 0) error: Invalid argument, type=RTM_NEWROUTE(24), seq=10, pid=3539131282
2021/10/29 09:28:10.218 ZEBRA: [VCDW6-A7ZF1] dplane dequeues 2 completed work from provider Kernel
2021/10/29 09:28:10.218 ZEBRA: [JTWAB-1MH4Y] dplane has 2 completed, 0 errors, for zebra main
2021/10/29 09:28:10.218 ZEBRA: [J7K9Z-9M7DT] Nexthop dplane ctx 0x56125390a820, op NH_INSTALL, nexthop ID (9), result FAILURE
2021/10/29 09:28:10.218 ZEBRA: [P2XBZ-RAFQ5][EC 4043309074] Failed to install Nexthop ID (9) into the kernel
2021/10/29 09:28:10.218 ZEBRA: [RMK34-61HV5] default(0:254):1::1/128 Processing dplane result ctx 0x56125390add0, op ROUTE_INSTALL result FAILURE

Note the last line `op ROUTE_INSTALL result FAILURE` because we are attempting to use a
a gw nexthop that is local.  This is the result.

Then the test code was installing the route again:

2021/10/29 09:30:00.493 ZEBRA: [JGWSB-SMNVE] dplane: incoming new work counter: 2
2021/10/29 09:30:00.493 ZEBRA: [Q52A7-211QJ] dplane enqueues 2 new work to provider 'Kernel'
2021/10/29 09:30:00.493 ZEBRA: [JVY1P-93VFY] dplane provider 'Kernel': processing
2021/10/29 09:30:00.493 ZEBRA: [TX9N0-9JKDF] ID (9) Dplane nexthop update ctx 0x561253916a00 op NH_INSTALL
2021/10/29 09:30:00.493 ZEBRA: [PM9ZJ-07RCP] 0:1::1/128 Dplane route update ctx 0x561253915f40 op ROUTE_UPDATE
2021/10/29 09:30:00.493 ZEBRA: [TJ327-ET8HE] netlink_send_msg: >> netlink message dump [sent]
2021/10/29 09:30:00.493 ZEBRA: [JAS4D-NCWGP] nlmsghdr [len=104 type=(104) NEWNEXTHOP flags=(0x0501) {REQUEST,DUMP,(ROOT|REPLACE|CAPPED),(ATOMIC|CREATE)} seq=11 pid=3539131282]
2021/10/29 09:30:00.493 ZEBRA: [WCX94-SW894]   nhm [family=(10) AF_INET6 scope=(0) UNIVERSE protocol=(11) ZEBRA flags=0x00000000 {}]
2021/10/29 09:30:00.493 ZEBRA: [KFBSR-XYJV1]     rta [len=8 (payload=4) type=(1) ID]
2021/10/29 09:30:00.493 ZEBRA: [Z4E9C-GD9EP]       9
2021/10/29 09:30:00.493 ZEBRA: [KFBSR-XYJV1]     rta [len=20 (payload=16) type=(6) GATEWAY]
2021/10/29 09:30:00.493 ZEBRA: [STTSM-27M81]       2001::1
2021/10/29 09:30:00.493 ZEBRA: [KFBSR-XYJV1]     rta [len=8 (payload=4) type=(5) OIF]
2021/10/29 09:30:00.493 ZEBRA: [JR4EA-BKPTA]       6
2021/10/29 09:30:00.493 ZEBRA: [KFBSR-XYJV1]     rta [len=6 (payload=2) type=(7) ENCAP_TYPE]
2021/10/29 09:30:00.493 ZEBRA: [JR4EA-BKPTA]       5
2021/10/29 09:30:00.493 ZEBRA: [KFBSR-XYJV1]     rta [len=36 (payload=32) type=(32776) UNKNOWN]
2021/10/29 09:30:00.493 ZEBRA: [JAS4D-NCWGP] nlmsghdr [len=56 type=(25) DELROUTE flags=(0x0401) {REQUEST,(ATOMIC|CREATE)} seq=13 pid=3539131282]
2021/10/29 09:30:00.493 ZEBRA: [GCEGC-W8YBF]   rtmsg [family=(10) AF_INET6 dstlen=128 srclen=0 tos=0 table=254 protocol=(194) UNKNOWN scope=(0) UNIVERSE type=(0) UNSPEC flags=0x0000 {}]
2021/10/29 09:30:00.493 ZEBRA: [KFBSR-XYJV1]     rta [len=20 (payload=16) type=(1) DST]
2021/10/29 09:30:00.493 ZEBRA: [STTSM-27M81]       1::1
2021/10/29 09:30:00.493 ZEBRA: [KFBSR-XYJV1]     rta [len=8 (payload=4) type=(6) PRIORITY]
2021/10/29 09:30:00.493 ZEBRA: [Z4E9C-GD9EP]       20
2021/10/29 09:30:00.493 ZEBRA: [JAS4D-NCWGP] nlmsghdr [len=64 type=(24) NEWROUTE flags=(0x0401) {REQUEST,(ATOMIC|CREATE)} seq=12 pid=3539131282]
2021/10/29 09:30:00.493 ZEBRA: [GCEGC-W8YBF]   rtmsg [family=(10) AF_INET6 dstlen=128 srclen=0 tos=0 table=254 protocol=(194) UNKNOWN scope=(0) UNIVERSE type=(1) UNICAST flags=0x0000 {}]
2021/10/29 09:30:00.493 ZEBRA: [KFBSR-XYJV1]     rta [len=20 (payload=16) type=(1) DST]
2021/10/29 09:30:00.493 ZEBRA: [STTSM-27M81]       1::1
2021/10/29 09:30:00.493 ZEBRA: [KFBSR-XYJV1]     rta [len=8 (payload=4) type=(6) PRIORITY]
2021/10/29 09:30:00.493 ZEBRA: [Z4E9C-GD9EP]       20
2021/10/29 09:30:00.493 ZEBRA: [KFBSR-XYJV1]     rta [len=8 (payload=4) type=(30) NH_ID]
2021/10/29 09:30:00.493 ZEBRA: [Z4E9C-GD9EP]       9
2021/10/29 09:30:00.493 ZEBRA: [V8KNF-8EXH8] netlink_recv_msg: << netlink message dump [recv]
2021/10/29 09:30:00.493 ZEBRA: [JAS4D-NCWGP] nlmsghdr [len=76 type=(2) ERROR flags=(0x0300) {DUMP,(ROOT|REPLACE|CAPPED),(MATCH|EXCLUDE|ACK_TLVS)} seq=11 pid=3539131282]
2021/10/29 09:30:00.493 ZEBRA: [KWP1C-6CSXF]   nlmsgerr [error=(-22) Invalid argument]
2021/10/29 09:30:00.493 ZEBRA: [HSYZM-HV7HF] Extended Error: Gateway can not be a local address
2021/10/29 09:30:00.493 ZEBRA: [WVJCK-PPMGD][EC 4043309093] netlink-dp (NS 0) error: Invalid argument, type=RTM_NEWNEXTHOP(104), seq=11, pid=3539131282
2021/10/29 09:30:00.493 ZEBRA: [V8KNF-8EXH8] netlink_recv_msg: << netlink message dump [recv]
2021/10/29 09:30:00.493 ZEBRA: [JAS4D-NCWGP] nlmsghdr [len=36 type=(2) ERROR flags=(0x0100) {DUMP,(ROOT|REPLACE|CAPPED)} seq=13 pid=3539131282]
2021/10/29 09:30:00.493 ZEBRA: [KWP1C-6CSXF]   nlmsgerr [error=(-3) No such process]
2021/10/29 09:30:00.493 ZEBRA: [V8KNF-8EXH8] netlink_recv_msg: << netlink message dump [recv]
2021/10/29 09:30:00.493 ZEBRA: [JAS4D-NCWGP] nlmsghdr [len=68 type=(2) ERROR flags=(0x0300) {DUMP,(ROOT|REPLACE|CAPPED),(MATCH|EXCLUDE|ACK_TLVS)} seq=12 pid=3539131282]
2021/10/29 09:30:00.493 ZEBRA: [KWP1C-6CSXF]   nlmsgerr [error=(-22) Invalid argument]
2021/10/29 09:30:00.493 ZEBRA: [VCDW6-A7ZF1] dplane dequeues 2 completed work from provider Kernel
2021/10/29 09:30:00.493 ZEBRA: [JTWAB-1MH4Y] dplane has 2 completed, 0 errors, for zebra main
2021/10/29 09:30:00.493 ZEBRA: [J7K9Z-9M7DT] Nexthop dplane ctx 0x561253916a00, op NH_INSTALL, nexthop ID (9), result FAILURE
2021/10/29 09:30:00.493 ZEBRA: [P2XBZ-RAFQ5][EC 4043309074] Failed to install Nexthop ID (9) into the kernel
2021/10/29 09:30:00.493 ZEBRA: [RMK34-61HV5] default(0:254):1::1/128 Processing dplane result ctx 0x561253915f40, op ROUTE_UPDATE result SUCCESS

Note that this time we do these three operations

a) nexthop installation seq 11
b) route delete seq 13
c) route add seq 12

Note the last line, we report the install as a success but it clearly failed from the seq=12 decode.
When we look at the v6 rib it thinks it is installed:

unet> r1 show ipv6 route
Codes: K - kernel route, C - connected, S - static, R - RIPng,
       O - OSPFv3, I - IS-IS, B - BGP, N - NHRP, T - Table,
       v - VNC, V - VNC-Direct, A - Babel, D - SHARP, F - PBR,
       f - OpenFabric,
       > - selected route, * - FIB route, q - queued, r - rejected, b - backup
       t - trapped, o - offload failure

D>* 1::1/128 [150/0] via 2001::1, dum0, seg6local unspec unknown(seg6local_context2str), seg6 a::, weight 1, 00:00:17

So let's modify nl_batch_read_resp to not dequeue/enqueue the context until we are sure we have
the right one.  This fixes the test code to do the right thing on the second installation.

Signed-off-by: Donald Sharp <sharpd@nvidia.com>
2 years agozebra: set zd_is_update in 1 spot
Donald Sharp [Wed, 10 Nov 2021 20:09:37 +0000 (15:09 -0500)]
zebra: set zd_is_update in 1 spot

The ctx->zd_is_update is being set in various
spots based upon the same value that we are
passing into dplane_ctx_ns_init.  Let's just
consolidate all this into the dplane_ctx_ns_init
so that the zd_is_udpate value is set at the
same time that we increment the sequence numbers
to use.

As a note for future me's reading this.  The sequence
number choosen for the seq number passed to the
kernel is that each context gets a copy of the
appropriate nlsock to use.  Since it's a copy
at a point in time, we know we have a unique sequence
number value.

Signed-off-by: Donald Sharp <sharpd@nvidia.com>
2 years agozebra: When we get an implicit or ack or full failure mark status
Donald Sharp [Wed, 10 Nov 2021 19:12:39 +0000 (14:12 -0500)]
zebra: When we get an implicit or ack or full failure mark status

When nl_batch_read_resp gets a full on failure -1 or an implicit
ack 0 from the kernel for a batch of code.  Let's immediately
mark all of those in the batch pass/fail as needed.  Instead
of having them marked else where.

Signed-off-by: Donald Sharp <sharpd@nvidia.com>
2 years agoMerge pull request #10161 from donaldsharp/hash_crash
Jafar Al-Gharaibeh [Fri, 4 Feb 2022 20:18:03 +0000 (14:18 -0600)]
Merge pull request #10161 from donaldsharp/hash_crash

zebra: Fix improper usage of hash_iterate that caused crashes

2 years agolib: Update hash.h documentation to warn of a possible crash
Donald Sharp [Wed, 1 Dec 2021 22:03:38 +0000 (17:03 -0500)]
lib: Update hash.h documentation to warn of a possible crash

Multiple deletions from the hash_walk or hash_iteration calls
during a single invocation of the passed in function can and
will cause the program to crash.  Warn against doing such a
thing.

Signed-off-by: Donald Sharp <sharpd@nvidia.com>
2 years agozebra: Ensure zebra_nhg_sweep_table accounts for double deletes
Donald Sharp [Wed, 1 Dec 2021 21:28:42 +0000 (16:28 -0500)]
zebra: Ensure zebra_nhg_sweep_table accounts for double deletes

I'm seeing this crash in various forms:
Program terminated with signal SIGSEGV, Segmentation fault.
50 ../sysdeps/unix/sysv/linux/raise.c: No such file or directory.
[Current thread is 1 (Thread 0x7f418efbc7c0 (LWP 3580253))]
(gdb) bt
(gdb) f 4
267 (*func)(hb, arg);
(gdb) p hb
$1 = (struct hash_bucket *) 0x558cdaafb250
(gdb) p *hb
$2 = {len = 0, next = 0x0, key = 0, data = 0x0}
(gdb)

I've also seen a crash where data is 0x03.

My suspicion is that hash_iterate is calling zebra_nhg_sweep_entry which
does delete the particular entry we are looking at as well as possibly other
entries when the ref count for those entries gets set to 0 as well.

Then we have this loop in hash_iterate.c:

   for (i = 0; i < hash->size; i++)
            for (hb = hash->index[i]; hb; hb = hbnext) {
                    /* get pointer to next hash bucket here, in case (*func)
                     * decides to delete hb by calling hash_release
                     */
                    hbnext = hb->next;
                    (*func)(hb, arg);
            }
Suppose in the previous loop hbnext is set to hb->next and we call
zebra_nhg_sweep_entry. This deletes the previous entry and also
happens to cause the hbnext entry to be deleted as well, because of nhg
refcounts. At this point in time the memory pointed to by hbnext is
not owned by the pthread anymore and we can end up on a state where
it's overwritten by another pthread in zebra with data for other incoming events.

What to do?  Let's change the sweep function to a hash_walk and have
it stop iterating and to start over if there is a possible double
delete operation.

Signed-off-by: Donald Sharp <sharpd@nvidia.com>
2 years agopim: Use INADDR_ANY for current_bsr checking is valid yet
Donald Sharp [Fri, 4 Feb 2022 13:49:39 +0000 (08:49 -0500)]
pim: Use INADDR_ANY for current_bsr checking is valid yet

In all places that pim_nht_bsr_del is called, the code
needs to not unregister if the current_bsr is INADDR_ANY.

Signed-off-by: Donald Sharp <sharpd@nvidia.com>
2 years agoMerge pull request #10401 from donaldsharp/donot_agree
Russ White [Fri, 4 Feb 2022 15:55:00 +0000 (10:55 -0500)]
Merge pull request #10401 from donaldsharp/donot_agree

zebra: Make Router Advertisement warnings show up once every 6 hours

2 years agopimd: Only remove bsr NHT if we actually have tracked something
Donald Sharp [Fri, 28 Jan 2022 16:17:53 +0000 (11:17 -0500)]
pimd: Only remove bsr NHT if we actually have tracked something

I'm now seeing in my log file:

2022/01/28 11:20:05 PIM: [Q0PZ7-QBBN3] attempting to delete nonexistent NHT BSR entry 0.0.0.0
2022/01/28 11:20:05 PIM: [Q0PZ7-QBBN3] attempting to delete nonexistent NHT BSR entry 0.0.0.0
2022/01/28 11:20:06 PIM: [Q0PZ7-QBBN3] attempting to delete nonexistent NHT BSR entry 0.0.0.0

When I run pimd.  Looking at the code there are 3 places where pim_bsm.c removes the
NHT BSR tracking.  In 2 of them the code ensures that the address is already setup
in 1 place it is not.  Fix.

Signed-off-by: Donald Sharp <sharpd@nvidia.com>
2 years agoMerge pull request #10469 from mjstapp/fix_dplane_netlink_groups
Donatas Abraitis [Fri, 4 Feb 2022 15:51:31 +0000 (17:51 +0200)]
Merge pull request #10469 from mjstapp/fix_dplane_netlink_groups

zebra: reduce incoming netlink messages for dplane thread

2 years agodoc: Update `show zebra` command
Donald Sharp [Fri, 4 Feb 2022 13:44:36 +0000 (08:44 -0500)]
doc: Update `show zebra` command

Update the `show zebra` command documentation to
show what it is doing now.

Signed-off-by: Donald Sharp <sharpd@nvidia.com>
2 years agozebra: Convert some `show zebra` output to a table
Donald Sharp [Fri, 4 Feb 2022 13:42:07 +0000 (08:42 -0500)]
zebra: Convert some `show zebra` output to a table

Make the output a bit easier to interpret and use by
converting to usage of a table.

Signed-off-by: Donald Sharp <sharpd@nvidia.com>
2 years agozebra: Add knowledge about RA and RFC 5549 to `show zebra`
Donald Sharp [Fri, 4 Feb 2022 13:04:23 +0000 (08:04 -0500)]
zebra: Add knowledge about RA and RFC 5549 to `show zebra`

Add to `show zebra` whether or not RA is compiled into FRR
and whether or not BGP is using RFC 5549 at the moment.

Signed-off-by: Donald Sharp <sharpd@nvidia.com>
2 years agozebra: Add evpn status to `show zebra`
Donald Sharp [Sat, 22 Jan 2022 13:31:50 +0000 (08:31 -0500)]
zebra: Add evpn status to `show zebra`

Signed-off-by: Donald Sharp <sharpd@nvidia.com>
2 years agozebra: Add os and version to `show zebra`
Donald Sharp [Sat, 22 Jan 2022 13:21:34 +0000 (08:21 -0500)]
zebra: Add os and version to `show zebra`

Signed-off-by: Donald Sharp <sharpd@nvidia.com>
2 years agozebra: Add kernel nexthop group support to `show zebra`
Donald Sharp [Sat, 22 Jan 2022 12:53:24 +0000 (07:53 -0500)]
zebra: Add kernel nexthop group support to `show zebra`

Signed-off-by: Donald Sharp <sharpd@nvidia.com>
2 years agozebra: Add MPLS status to `show zebra`
Donald Sharp [Fri, 21 Jan 2022 18:20:17 +0000 (13:20 -0500)]
zebra: Add MPLS status to `show zebra`

Signed-off-by: Donald Sharp <sharpd@nvidia.com>
2 years agozebra: Add if v4/v6 forwarding is turned on/off to `show zebra`
Donald Sharp [Fri, 21 Jan 2022 18:14:39 +0000 (13:14 -0500)]
zebra: Add if v4/v6 forwarding is turned on/off to `show zebra`

Signed-off-by: Donald Sharp <sharpd@nvidia.com>
2 years agozebra: Add to `show zebra` the type of vrf devices being used
Donald Sharp [Fri, 21 Jan 2022 18:05:35 +0000 (13:05 -0500)]
zebra: Add to `show zebra` the type of vrf devices being used

Signed-off-by: Donald Sharp <sharpd@nvidia.com>
2 years agozebra: Add ability to know when FRR is not asic offloaded
Donald Sharp [Fri, 21 Jan 2022 17:51:11 +0000 (12:51 -0500)]
zebra: Add ability to know when FRR is not asic offloaded

Signed-off-by: Donald Sharp <sharpd@nvidia.com>
2 years agolib: Add more information to `show version`
Donald Sharp [Sat, 22 Jan 2022 13:15:42 +0000 (08:15 -0500)]
lib: Add more information to `show version`

Add to lib/command.c the ability to remember the
release/version/system information and to allow
`show version` to dump some of it.

Signed-off-by: Donald Sharp <sharpd@nvidia.com>
2 years agobgpd: Prevent use after variable goes out of scope
Donald Sharp [Mon, 24 Jan 2022 12:02:37 +0000 (07:02 -0500)]
bgpd: Prevent use after variable goes out of scope

`struct prefix p` was declared inside an if statement
where we assign the address of to a pointer that is
then passed to a sub function.  This will eventually
leave us in a bad state.

Signed-off-by: Donald Sharp <sharpd@nvidia.com>
2 years agoMerge pull request #10495 from anlancs/doc-ospf-range
Igor Ryzhov [Fri, 4 Feb 2022 12:28:38 +0000 (15:28 +0300)]
Merge pull request #10495 from anlancs/doc-ospf-range

doc: complete area id for ospf's "range" command

2 years agoMerge pull request #10473 from tlsalmin/master
Igor Ryzhov [Fri, 4 Feb 2022 12:23:20 +0000 (15:23 +0300)]
Merge pull request #10473 from tlsalmin/master

ospfd: Core in ospf_if_down during shutdown.

2 years agoospfd: Core in ospf_if_down during shutdown.
Tomi Salminen [Wed, 2 Feb 2022 09:19:09 +0000 (11:19 +0200)]
ospfd: Core in ospf_if_down during shutdown.

Skip marking routes as changed in ospf_if_down if there's now
new_table present, which might be the case when the instance is
being finished

The backtrace for the core was:

  raise (sig=sig@entry=11) at ../sysdeps/unix/sysv/linux/raise.c:50
  core_handler (signo=11, siginfo=0x7fffffffe170, context=<optimized out>) at lib/sigevent.c:262
  <signal handler called>
  route_top (table=0x0) at lib/table.c:401
  ospf_if_down (oi=oi@entry=0x555555999090) at ospfd/ospf_interface.c:849
  ospf_if_free (oi=0x555555999090) at ospfd/ospf_interface.c:339
  ospf_finish_final (ospf=0x55555599c830) at ospfd/ospfd.c:749
  ospf_deferred_shutdown_finish (ospf=0x55555599c830) at ospfd/ospfd.c:578
  ospf_deferred_shutdown_check (ospf=<optimized out>) at ospfd/ospfd.c:627
  ospf_finish (ospf=<optimized out>) at ospfd/ospfd.c:683
  ospf_terminate () at ospfd/ospfd.c:653
  sigint () at ospfd/ospf_main.c:109
  quagga_sigevent_process () at lib/sigevent.c:130
  thread_fetch (m=m@entry=0x5555556e45e0, fetch=fetch@entry=0x7fffffffe9b0) at lib/thread.c:1709
  frr_run (master=0x5555556e45e0) at lib/libfrr.c:1174
  main (argc=9, argv=0x7fffffffecb8) at ospfd/ospf_main.c:254

Signed-off-by: Tomi Salminen <tsalminen@forcepoint.com>
2 years agodoc: complete area id for ospf's "range" command
anlan_cs [Fri, 4 Feb 2022 02:09:45 +0000 (10:09 +0800)]
doc: complete area id for ospf's "range" command

Like other commands, just complete area id.
Additonally replace `IPV4_PREFIX` with generic `A.B.C.D/M`.

Signed-off-by: anlan_cs <vic.lan@pica8.com>
2 years agoMerge pull request #10481 from mobash-rasool/pim-doc
Donatas Abraitis [Thu, 3 Feb 2022 06:47:45 +0000 (08:47 +0200)]
Merge pull request #10481 from mobash-rasool/pim-doc

doc: Correcting the documentation for pimd

2 years agoMerge pull request #10485 from qlyoung/strnccncncncncmppp
Donatas Abraitis [Thu, 3 Feb 2022 06:01:56 +0000 (08:01 +0200)]
Merge pull request #10485 from qlyoung/strnccncncncncmppp

bgpd: strncmp -> strcmp in community hash foo

2 years agobgpd: strncmp -> strcmp in community hash foo
Quentin Young [Wed, 2 Feb 2022 21:34:03 +0000 (16:34 -0500)]
bgpd: strncmp -> strcmp in community hash foo

buffers are null terminated

Signed-off-by: Quentin Young <qlyoung@nvidia.com>
2 years agodebian, redhat: updating changelog for new release
Donatas Abraitis [Tue, 1 Feb 2022 20:00:33 +0000 (22:00 +0200)]
debian, redhat: updating changelog for new release

Signed-off-by: Donatas Abraitis <donatas.abraitis@gmail.com>
2 years agodoc: Correcting the documentation for pimd
Mobashshera Rasool [Wed, 2 Feb 2022 18:07:34 +0000 (10:07 -0800)]
doc: Correcting the documentation for pimd

While going through the doc, found some commands are missing in the doc.
Also correcting few mistakes.

Signed-off-by: Mobashshera Rasool <mrasool@vmware.com>
2 years agobgpd: Pass struct pfx_record to sizeof
Donatas Abraitis [Wed, 2 Feb 2022 11:30:52 +0000 (13:30 +0200)]
bgpd: Pass struct pfx_record to sizeof

Passing argument "&rec" of type "struct pfx_record *" and argument
"1UL" to function "read" is suspicious because
"sizeof (struct pfx_record) /*40*/" is expected.

Signed-off-by: Donatas Abraitis <donatas.abraitis@gmail.com>
2 years agoMerge pull request #10409 from idryzhov/zebra-mq-clean-crash
Mark Stapp [Wed, 2 Feb 2022 13:35:00 +0000 (08:35 -0500)]
Merge pull request #10409 from idryzhov/zebra-mq-clean-crash

zebra: fix cleanup of meta queues on vrf disable

2 years agobgpd: Do not check for status from str2sockunion()
Donatas Abraitis [Wed, 2 Feb 2022 11:28:26 +0000 (13:28 +0200)]
bgpd: Do not check for status from str2sockunion()

Coverity pass.

Signed-off-by: Donatas Abraitis <donatas.abraitis@gmail.com>
2 years agoMerge pull request #10388 from anlancs/bfd-fsm-passive
Igor Ryzhov [Wed, 2 Feb 2022 10:06:11 +0000 (13:06 +0300)]
Merge pull request #10388 from anlancs/bfd-fsm-passive

bfdd: fix broken FSM in passive mode

2 years agobfdd: fix broken FSM in passive mode
anlan_cs [Wed, 19 Jan 2022 07:10:18 +0000 (02:10 -0500)]
bfdd: fix broken FSM in passive mode

Problem:
One is with active mode, the other is with passive mode. Sometimes
the one with active mode is in `Down` stauts, but the other one
with passive mode is unluckily stuck in `Init` status:
It doesn't answer its peer with any packets, even receiving continuous
`Down` packets.

Root Cause:
bfdd with passive mode answers its peer only *one* packet in `Down` status,
then it enters into `Init` status and ignores subsequent `Down` packets.
Unluckily that *one* answered packet is lost, at that moment its peer
with active mode can only have to send `Down` packets.

Fix:
1) With passive mode, bfdd should start xmittimer after received `Down` packet.
Refer to RFC5880:
"A system taking the Passive role MUST NOT begin sending BFD packets for
a particular session until it has received a BFD packet for that session, and
thus has learned the remote system's discriminator value."

2) Currently this added xmittimer for passive mode can be safely removed
except receiving `AdminDown` packet:
    - `bfd_session_enable/bfd_set_passive_mode` doesn't start xmittimer
    - `ptm_bfd_sess_dn/bfd_set_shutdown` can remove xmittimer
Per RFC5880, receiving `AdminDown` packet should be also regarded as `Down`,
so just call `ptm_bfd_sess_dn`, which will safely remove the added xmittimer
for passive mode. In summary, call `ptm_bfd_sess_dn` for two status changes
on receiving `AdminDown`: `Init`->`Down` and `Up`->`Down`.

Signed-off-by: anlan_cs <vic.lan@pica8.com>
2 years agozebra: reduce incoming netlink messages for dplane thread
Mark Stapp [Tue, 1 Feb 2022 18:41:17 +0000 (13:41 -0500)]
zebra: reduce incoming netlink messages for dplane thread

The dataplane pthread only processes a limited set of incoming
netlink notifications: only register for that set of events,
reducing duplicate incoming netlink messages.

Signed-off-by: Mark Stapp <mstapp@nvidia.com>
2 years agoMerge pull request #10464 from pguibert6WIND/negogiate
Mark Stapp [Tue, 1 Feb 2022 18:00:54 +0000 (13:00 -0500)]
Merge pull request #10464 from pguibert6WIND/negogiate

topotests: fix typo about bgp_dont_capability folder name

2 years agoMerge pull request #10428 from ton31337/fix/attr_extra_ipv6_ecommunity
Russ White [Tue, 1 Feb 2022 16:38:39 +0000 (11:38 -0500)]
Merge pull request #10428 from ton31337/fix/attr_extra_ipv6_ecommunity

bgpd: Move out ipv6_ecommunity struct from attr to attr_extra

2 years agoMerge pull request #10413 from anlancs/bfd-with-check
Russ White [Tue, 1 Feb 2022 16:18:52 +0000 (11:18 -0500)]
Merge pull request #10413 from anlancs/bfd-with-check

bfdd,doc,yang: a few minor commits for bfdd

2 years agoMerge pull request #10373 from anlancs/ospf-add-asbr
Igor Ryzhov [Tue, 1 Feb 2022 16:04:33 +0000 (19:04 +0300)]
Merge pull request #10373 from anlancs/ospf-add-asbr

ospfd: fix missing "aggregation timer" in running configuration

2 years agoMerge pull request #10391 from gromit1811/bug_9720_ecmp_inter_area_topotest_3paths
Russ White [Tue, 1 Feb 2022 15:55:13 +0000 (10:55 -0500)]
Merge pull request #10391 from gromit1811/bug_9720_ecmp_inter_area_topotest_3paths

tests: Topotest for checking ECMP inter-area nexthop handling

2 years agotopotests: fix typo about bgp_dont_capability folder name
Philippe Guibert [Tue, 1 Feb 2022 15:52:20 +0000 (16:52 +0100)]
topotests: fix typo about bgp_dont_capability folder name

The folder bgp_dont_capability.. was wrong. Use negotiate
instead of negogiate.

Signed-off-by: Philippe Guibert <philippe.guibert@6wind.com>
2 years agoMerge pull request #10431 from ton31337/fix/rpki
Russ White [Tue, 1 Feb 2022 15:48:58 +0000 (10:48 -0500)]
Merge pull request #10431 from ton31337/fix/rpki

bgpd: Handle TCP connection errors with connection callbacks for RPKI

2 years agoMerge pull request #10430 from ton31337/fix/addpath_maximum-prefix-out
Igor Ryzhov [Tue, 1 Feb 2022 15:38:57 +0000 (18:38 +0300)]
Merge pull request #10430 from ton31337/fix/addpath_maximum-prefix-out

bgpd: Add bgp_check_selected() helper and just consistency changes

2 years agozebra: fix cleanup of meta queues on vrf disable
Igor Ryzhov [Sun, 23 Jan 2022 17:22:42 +0000 (20:22 +0300)]
zebra: fix cleanup of meta queues on vrf disable

Current code treats all metaqueues as lists of route_node structures.
However, some queues contain other structures that need to be cleaned up
differently. Casting the elements of those queues to struct route_node
and dereferencing them leads to a crash. The crash may be seen when
executing bgp_multi_vrf_topo2.

Fix the code by using the proper list element types.

Signed-off-by: Igor Ryzhov <iryzhov@nfware.com>
2 years agoMerge pull request #10322 from iqras23/coverity
Igor Ryzhov [Tue, 1 Feb 2022 13:27:04 +0000 (16:27 +0300)]
Merge pull request #10322 from iqras23/coverity

bgpd: Addressing few coverity issues

2 years agobgpd: Add bgp_check_selected() helper for abstraction
Donatas Abraitis [Thu, 27 Jan 2022 08:12:59 +0000 (10:12 +0200)]
bgpd: Add bgp_check_selected() helper for abstraction

Just check if the path is selected to be advertised: best path or addpath
capable.

Signed-off-by: Donatas Abraitis <donatas.abraitis@gmail.com>
2 years agobgpd: Convert bgp_addpath_encode_[tr]x() to bool from int
Donatas Abraitis [Thu, 27 Jan 2022 07:51:59 +0000 (09:51 +0200)]
bgpd: Convert bgp_addpath_encode_[tr]x() to bool from int

Rename addpath_encode[d] to addpath_capable to be consistent.

Signed-off-by: Donatas Abraitis <donatas.abraitis@gmail.com>
2 years agoMerge pull request #10446 from anlancs/staticd-cleanup
Igor Ryzhov [Tue, 1 Feb 2022 10:33:13 +0000 (13:33 +0300)]
Merge pull request #10446 from anlancs/staticd-cleanup

staticd: small cleanup

2 years agoMerge pull request #10435 from ckishimo/ospf6d_distance
Igor Ryzhov [Tue, 1 Feb 2022 10:28:44 +0000 (13:28 +0300)]
Merge pull request #10435 from ckishimo/ospf6d_distance

ospf6d: fix distance not applied

2 years agoMerge pull request #10459 from ckishimo/ospfd_distance
Igor Ryzhov [Tue, 1 Feb 2022 10:28:33 +0000 (13:28 +0300)]
Merge pull request #10459 from ckishimo/ospfd_distance

ospfd: fix distance not applied

2 years agoMerge pull request #10442 from ton31337/fix/reuse_bgp_path_info_extra_get
Igor Ryzhov [Tue, 1 Feb 2022 09:19:23 +0000 (12:19 +0300)]
Merge pull request #10442 from ton31337/fix/reuse_bgp_path_info_extra_get

bgpd: Reuse bgp_path_info_extra_get() for allocating new bgp path info

2 years agoMerge pull request #10443 from mjstapp/zebra_re_opaque
Igor Ryzhov [Tue, 1 Feb 2022 09:19:11 +0000 (12:19 +0300)]
Merge pull request #10443 from mjstapp/zebra_re_opaque

zebra: name the route_entry opaque struct more specifically

2 years agoMerge pull request #10449 from ton31337/fix/vty_json
Igor Ryzhov [Tue, 1 Feb 2022 09:18:48 +0000 (12:18 +0300)]
Merge pull request #10449 from ton31337/fix/vty_json

*: Missing vty_json conversions

2 years agobuild: FRR 8.3 development version
Donatas Abraitis [Tue, 1 Feb 2022 09:02:03 +0000 (11:02 +0200)]
build: FRR 8.3 development version

Signed-off-by: Donatas Abraitis <donatas.abraitis@gmail.com>
2 years agobgpd: Fix expected type from format string to unsigned int
Iqra Siddiqui [Wed, 19 Jan 2022 07:25:21 +0000 (23:25 -0800)]
bgpd: Fix expected type from format string to unsigned int

Co-authored-by: Kantesh Mundaragi <kmundaragi@vmware.com>
Signed-off-by: Iqra Siddiqui <imujeebsiddi@vmware.com>
2 years agoospfd: remove extra space
ckishimo [Mon, 31 Jan 2022 23:34:34 +0000 (00:34 +0100)]
ospfd: remove extra space

Signed-off-by: ckishimo <carles.kishimoto@gmail.com>
2 years agoospfd: print maximum paths in show ip ospf json
ckishimo [Mon, 31 Jan 2022 23:11:47 +0000 (00:11 +0100)]
ospfd: print maximum paths in show ip ospf json

Signed-off-by: ckishimo <carles.kishimoto@gmail.com>
2 years agoospfd: print administrative distance in show ip ospf
ckishimo [Mon, 31 Jan 2022 23:08:54 +0000 (00:08 +0100)]
ospfd: print administrative distance in show ip ospf

Signed-off-by: ckishimo <carles.kishimoto@gmail.com>
2 years agoospfd: restart spf when distance is updated
ckishimo [Mon, 31 Jan 2022 22:58:14 +0000 (23:58 +0100)]
ospfd: restart spf when distance is updated

if r1 has a route received from a neighbor with the default administrative
distance configured

    r1# sh ip route
    Codes: K - kernel route, C - connected, S - static, R - RIP,
           O - OSPF, I - IS-IS, B - BGP, E - EIGRP, N - NHRP,
           T - Table, v - VNC, V - VNC-Direct, A - Babel, F - PBR,
           f - OpenFabric,
           > - selected route, * - FIB route, q - queued, r - rejected, b - backup
           t - trapped, o - offload failure

    O>* 1.1.1.1/32 [110/20] via 10.0.12.2, r1-r2-eth0, weight 1, 00:00:41

if we change the administrative distance

    r1(config)# router ospf
    r1(config-router)# distance 50

this is not applied as there are no changes in the routing table

    r1# sh ip route
    Codes: K - kernel route, C - connected, S - static, R - RIP,
           O - OSPF, I - IS-IS, B - BGP, E - EIGRP, N - NHRP,
           T - Table, v - VNC, V - VNC-Direct, A - Babel, F - PBR,
           f - OpenFabric,
           > - selected route, * - FIB route, q - queued, r - rejected, b - backup
           t - trapped, o - offload failure

    O>* 1.1.1.1/32 [110/20] via 10.0.12.2, r1-r2-eth0, weight 1, 00:00:13

This commit will force the update of the routing table with the new configured distance

    r1# sh ip route
    Codes: K - kernel route, C - connected, S - static, R - RIP,
           O - OSPF, I - IS-IS, B - BGP, E - EIGRP, N - NHRP,
           T - Table, v - VNC, V - VNC-Direct, A - Babel, F - PBR,
           f - OpenFabric,
           > - selected route, * - FIB route, q - queued, r - rejected, b - backup
           t - trapped, o - offload failure

    O>* 1.1.1.1/32 [50/20] via 10.0.12.2, r1-r2-eth0, weight 1, 00:00:14

Signed-off-by: ckishimo <carles.kishimoto@gmail.com>
2 years agobgpd: Fixing dead code
Iqra Siddiqui [Wed, 19 Jan 2022 07:14:03 +0000 (23:14 -0800)]
bgpd: Fixing dead code

Description:
-Removing break statements which will never be executed.
-Adding missing 'cmd' variable.

Co-authored-by: Kantesh Mundaragi <kmundaragi@vmware.com>
Signed-off-by: Iqra Siddiqui <imujeebsiddi@vmware.com>
2 years agobgpd: Fixing memcmp to avoid coverity issue
Iqra Siddiqui [Tue, 18 Jan 2022 08:36:13 +0000 (00:36 -0800)]
bgpd: Fixing memcmp to avoid coverity issue

Description:
Replacing memcmp at certain places,
to avoid the coverity issues caused by it.

Co-authored-by: Kantesh Mundargi <kmundaragi@vmware.com>
Signed-off-by: Iqra Siddiqui <imujeebsiddi@vmware.com>
2 years agoMerge pull request #10451 from donaldsharp/route_tag_ntohl
Igor Ryzhov [Mon, 31 Jan 2022 19:50:48 +0000 (22:50 +0300)]
Merge pull request #10451 from donaldsharp/route_tag_ntohl

ospfd: Convert output to host order from network order for route_tag

2 years agobgpd,pimd,isisd,nhrpd: Convert to vty_json()
Donatas Abraitis [Mon, 31 Jan 2022 19:20:41 +0000 (21:20 +0200)]
bgpd,pimd,isisd,nhrpd: Convert to vty_json()

Signed-off-by: Donatas Abraitis <donatas.abraitis@gmail.com>
2 years agoMerge pull request #10448 from ton31337/fix/zebra_ospf6d_json_leak
Donald Sharp [Mon, 31 Jan 2022 17:58:19 +0000 (12:58 -0500)]
Merge pull request #10448 from ton31337/fix/zebra_ospf6d_json_leak

ospf6d: Fix memory leak for `show ipv6 ospf6 zebra json`

2 years agoospfd: Convert output to host order from network order for route_tag
Donald Sharp [Mon, 31 Jan 2022 17:49:55 +0000 (12:49 -0500)]
ospfd: Convert output to host order from network order for route_tag

FRR stores the route_tag in network byte order.  Bug filed indicates
that the `show ip ospf route` command shows the correct value.
Every place route_tag is dumped in ospf_vty.c the ntohl function
is used first.

Fixes: #10450
Signed-off-by: Donald Sharp <sharpd@nvidia.com>
2 years agoospf6d: Fix memory leak for `show ipv6 ospf6 zebra json`
Donatas Abraitis [Mon, 31 Jan 2022 13:56:56 +0000 (15:56 +0200)]
ospf6d: Fix memory leak for `show ipv6 ospf6 zebra json`

$ for x in $(seq 1 10000); do vtysh -c 'show ipv6 ospf6 zebra json' >/dev/null; done

Before:
```
$ vtysh -c 'show memory ospf6d' | grep 'Total heap allocated'
  Total heap allocated:  26 MiB
```

After:
```
$ vtysh -c 'show memory ospf6d' | grep 'Total heap allocated'
  Total heap allocated:  2256 KiB
```

Signed-off-by: Donatas Abraitis <donatas.abraitis@gmail.com>
2 years agozebra: name the route_entry opaque struct more specifically
Mark Stapp [Tue, 9 Nov 2021 14:35:54 +0000 (09:35 -0500)]
zebra: name the route_entry opaque struct more specifically

The name 'opaque' is a little general - call the route_entry
struct 're_opaque' to make it more specific.

Signed-off-by: Mark Stapp <mstapp@nvidia.com>
2 years agotools: Handle new lines for json_object_to_json_string_ext()
Donatas Abraitis [Mon, 31 Jan 2022 13:34:24 +0000 (15:34 +0200)]
tools: Handle new lines for json_object_to_json_string_ext()

Just to handle %s and %s\n.

Signed-off-by: Donatas Abraitis <donatas.abraitis@gmail.com>
2 years agostaticd: small cleanup
anlan_cs [Mon, 31 Jan 2022 06:16:07 +0000 (14:16 +0800)]
staticd: small cleanup

Two small cleanups, just remove duplication.

Signed-off-by: anlan_cs <vic.lan@pica8.com>
2 years agotests: Topotest for checking ECMP inter-area nexthop handling
Martin Buck [Sun, 3 Oct 2021 12:39:15 +0000 (14:39 +0200)]
tests: Topotest for checking ECMP inter-area nexthop handling

Used to reproduce #9720 and may also serve as a regression test in the
future.

Signed-off-by: Martin Buck <mb-tmp-tvguho.pbz@gromit.dyndns.org>
2 years agoospfd: adjust type of "aggr_delay_interval"
anlan_cs [Fri, 28 Jan 2022 14:01:54 +0000 (09:01 -0500)]
ospfd: adjust type of "aggr_delay_interval"

Adjust type of "aggr_delay_interval":
Just replace `unsigned int` with `uint16_t` for range is (50..1800).

Signed-off-by: anlan_cs <vic.lan@pica8.com>
2 years agoospf6d: adjust type of "aggr_delay_interval"
anlan_cs [Thu, 20 Jan 2022 08:05:11 +0000 (03:05 -0500)]
ospf6d: adjust type of "aggr_delay_interval"

Adjust type of "aggr_delay_interval":
Just replace `unsigned int` with `uint16_t` for range is (50..1800).

Signed-off-by: anlan_cs <vic.lan@pica8.com>
2 years agoospfd: fix missing "aggregation timer" in running configuration
anlan_cs [Wed, 19 Jan 2022 13:42:02 +0000 (08:42 -0500)]
ospfd: fix missing "aggregation timer" in running configuration

Signed-off-by: anlan_cs <vic.lan@pica8.com>
2 years agoospfd: a few minor fixes on ospfd cli
anlan_cs [Wed, 19 Jan 2022 12:24:50 +0000 (07:24 -0500)]
ospfd: a few minor fixes on ospfd cli

Two minor fixes:
    - remove redundant "(a.b.c.d/m)" in "prefix" description
    - remove some annoying space in "summary-address" and "tag"

Signed-off-by: anlan_cs <vic.lan@pica8.com>