]> git.puffer.fish Git - mirror/frr.git/log
mirror/frr.git
3 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

3 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

3 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

3 years agolib: Update hash.h documentation to warn of a possible crash 10161/head
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>
3 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>
3 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

3 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

3 years agodoc: Update `show zebra` command 10501/head
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>
3 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>
3 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>
3 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>
3 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>
3 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>
3 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>
3 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>
3 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>
3 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>
3 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>
3 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>
3 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

3 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.

3 years agoospfd: Core in ospf_if_down during shutdown. 10473/head
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>
3 years agodoc: complete area id for ospf's "range" command 10495/head
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>
3 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

3 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

3 years agobgpd: strncmp -> strcmp in community hash foo 10485/head
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>
3 years agodebian, redhat: updating changelog for new release 10470/head
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>
3 years agodoc: Correcting the documentation for pimd 10481/head
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>
3 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

3 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

3 years agobfdd: fix broken FSM in passive mode 10388/head
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>
3 years agozebra: reduce incoming netlink messages for dplane thread 10469/head
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>
3 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

3 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

3 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

3 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

3 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

3 years agotopotests: fix typo about bgp_dont_capability folder name 10464/head
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>
3 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

3 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

3 years agozebra: fix cleanup of meta queues on vrf disable 10409/head
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>
3 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

3 years agobgpd: Add bgp_check_selected() helper for abstraction 10430/head
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>
3 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>
3 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

3 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

3 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

3 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

3 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

3 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

3 years agobuild: FRR 8.3 development version frr-8.3-dev
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>
3 years agobgpd: Fix expected type from format string to unsigned int 10322/head
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>
3 years agoospfd: remove extra space 10459/head
ckishimo [Mon, 31 Jan 2022 23:34:34 +0000 (00:34 +0100)]
ospfd: remove extra space

Signed-off-by: ckishimo <carles.kishimoto@gmail.com>
3 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>
3 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>
3 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>
3 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>
3 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>
3 years agoMerge pull request #10451 from donaldsharp/route_tag_ntohl base_8.2
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

3 years agobgpd,pimd,isisd,nhrpd: Convert to vty_json() 10449/head
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>
3 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`

3 years agoospfd: Convert output to host order from network order for route_tag 10451/head
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>
3 years agoospf6d: Fix memory leak for `show ipv6 ospf6 zebra json` 10448/head
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>
3 years agozebra: name the route_entry opaque struct more specifically 10443/head
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>
3 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>
3 years agostaticd: small cleanup 10446/head
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>
3 years agotests: Topotest for checking ECMP inter-area nexthop handling 10391/head
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>
3 years agoospfd: adjust type of "aggr_delay_interval" 10373/head
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>
3 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>
3 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>
3 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>
3 years agobgpd: Reuse bgp_path_info_extra_get() for allocating new bgp path info 10442/head
Donatas Abraitis [Fri, 28 Jan 2022 19:11:12 +0000 (21:11 +0200)]
bgpd: Reuse bgp_path_info_extra_get() for allocating new bgp path info

Signed-off-by: Donatas Abraitis <donatas.abraitis@gmail.com>
3 years agoMerge pull request #9869 from leonshaw/fix/evpn-queue
Mark Stapp [Fri, 28 Jan 2022 16:58:43 +0000 (11:58 -0500)]
Merge pull request #9869 from leonshaw/fix/evpn-queue

zebra: Fix EVPN route nexthop config order

3 years agoMerge pull request #10357 from ton31337/fix/peer_address_self_check_relax
Russ White [Fri, 28 Jan 2022 16:12:45 +0000 (11:12 -0500)]
Merge pull request #10357 from ton31337/fix/peer_address_self_check_relax

bgpd: Relax peer to be on the same host

3 years agozebra: Make Router Advertisement warnings show up once every 6 hours 10401/head
Donald Sharp [Fri, 21 Jan 2022 17:03:04 +0000 (12:03 -0500)]
zebra: Make Router Advertisement warnings show up once every 6 hours

RA packets are pretty chatty and when there is a warning from
a missconfiguration on the network, the log file gets filed
up with warnings.  Modify the code in rtadv.c to only spit
out the warning in these cases at most every 6 hours.

Signed-off-by: Donald Sharp <sharpd@nvidia.com>
3 years agoospf6d: print administrative distance in show ipv6 ospf 10435/head
ckishimo [Wed, 26 Jan 2022 21:46:44 +0000 (22:46 +0100)]
ospf6d: print administrative distance in show ipv6 ospf

Signed-off-by: ckishimo <carles.kishimoto@gmail.com>
3 years agoospf6d: restart spf when distance is updated
ckishimo [Wed, 26 Jan 2022 21:41:36 +0000 (22:41 +0100)]
ospf6d: restart spf when distance is updated

if r1 has a route received from a neighbor and the same route
configured as static, the administrative distance will determine
which route to use

r1(config)# ipv6 route 1:1::1/128 Null0 70

r1# sh 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, F - PBR,
       f - OpenFabric,
       > - selected route, * - FIB route, q - queued, r - rejected, b - backup
       t - trapped, o - offload failure

S>* 1:1::1/128 [70/0] unreachable (blackhole), weight 1, 00:00:12
O   1:1::1/128 [110/20] via fe80::1833:c9ff:fe7b:3e43, r1-r2-eth0, weight 1, 00:00:49

The static route is selected. If we now change the administrative distance
in ospf6, the OSPF route should be selected

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

r1# sh 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, F - PBR,
       f - OpenFabric,
       > - selected route, * - FIB route, q - queued, r - rejected, b - backup
       t - trapped, o - offload failure

S>* 1:1::1/128 [70/0] unreachable (blackhole), weight 1, 00:00:39
O   1:1::1/128 [110/20] via fe80::1833:c9ff:fe7b:3e43, r1-r2-eth0, weight 1, 00:01:16

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

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

r1# sh 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, F - PBR,
       f - OpenFabric,
       > - selected route, * - FIB route, q - queued, r - rejected, b - backup
       t - trapped, o - offload failure

O>* 1:1::1/128 [50/20] via fe80::8cb7:e6ff:fef5:2344, r1-r2-eth0, weight 1, 00:00:03
S   1:1::1/128 [70/0] unreachable (blackhole), weight 1, 00:00:19

Signed-off-by: ckishimo <carles.kishimoto@gmail.com>
3 years agozebra: Fix EVPN route nexthop config order 9869/head
Xiao Liang [Fri, 22 Oct 2021 07:45:33 +0000 (15:45 +0800)]
zebra: Fix EVPN route nexthop config order

EVPN route add should be queued to preserve the config order.
In particular, against deletion in rib_delete().

Signed-off-by: Xiao Liang <shaw.leon@gmail.com>
3 years agoMerge pull request #10408 from idryzhov/no-opaque-by-default
Donatas Abraitis [Fri, 28 Jan 2022 10:54:16 +0000 (12:54 +0200)]
Merge pull request #10408 from idryzhov/no-opaque-by-default

*: do not send opaque data to zebra by default

3 years agoMerge pull request #10159 from taspelund/retain-peer-asn
Donatas Abraitis [Fri, 28 Jan 2022 07:22:06 +0000 (09:22 +0200)]
Merge pull request #10159 from taspelund/retain-peer-asn

bgpd: retain peer asn even with remove-private-AS

3 years agoMerge pull request #10389 from gromit1811/bugfix_9720_ecmp_inter_area
Donatas Abraitis [Fri, 28 Jan 2022 07:09:51 +0000 (09:09 +0200)]
Merge pull request #10389 from gromit1811/bugfix_9720_ecmp_inter_area

ospf6d: Fix ECMP inter-area route nexthop update

3 years agoMerge pull request #10420 from donaldsharp/zebra_multicast_vrf_cleanup
Donatas Abraitis [Fri, 28 Jan 2022 06:55:12 +0000 (08:55 +0200)]
Merge pull request #10420 from donaldsharp/zebra_multicast_vrf_cleanup

zebra: Actually delete the table we are looking for

3 years agoMerge pull request #10433 from idryzhov/vrrp-ip-addr-is-zero
Quentin Young [Thu, 27 Jan 2022 21:08:15 +0000 (16:08 -0500)]
Merge pull request #10433 from idryzhov/vrrp-ip-addr-is-zero

3 years agoMerge pull request #10434 from idryzhov/isis-attached-bit
Mark Stapp [Thu, 27 Jan 2022 20:54:59 +0000 (15:54 -0500)]
Merge pull request #10434 from idryzhov/isis-attached-bit

isisd: remove deprecated command

3 years agoisisd: remove deprecated command 10434/head
Igor Ryzhov [Thu, 27 Jan 2022 18:12:22 +0000 (21:12 +0300)]
isisd: remove deprecated command

Signed-off-by: Igor Ryzhov <iryzhov@nfware.com>
3 years agovrrpd: use ipaddr_is_zero when needed 10433/head
Igor Ryzhov [Thu, 27 Jan 2022 18:05:40 +0000 (21:05 +0300)]
vrrpd: use ipaddr_is_zero when needed

Replace custom implementation or call to ipaddr_isset with a call to
ipaddr_is_zero.

ipaddr_isset is not fully correct, because it's fine to have some
non-zero bytes at the end of the struct in case of IPv4 and the function
doesn't allow that.

Signed-off-by: Igor Ryzhov <iryzhov@nfware.com>
3 years agobgpd: Handle TCP connection errors with connection callbacks for RPKI 10431/head
Donatas Abraitis [Thu, 27 Jan 2022 09:14:11 +0000 (11:14 +0200)]
bgpd: Handle TCP connection errors with connection callbacks for RPKI

Before this patch, if the first server crashed or was terminated, RPKI
connection keeps _active_ forever.

With this patch, if we catch connection problem (FATAL), we reset RPKI, to
switch to another available RTR-Server by using configured preference.

Signed-off-by: Donatas Abraitis <donatas.abraitis@gmail.com>
3 years agoMerge pull request #9880 from louis-oui/maximum-prefix-out
Donatas Abraitis [Thu, 27 Jan 2022 06:49:31 +0000 (08:49 +0200)]
Merge pull request #9880 from louis-oui/maximum-prefix-out

bgpd: fixes maximum prefix out

3 years agobgpd: Move out ipv6_ecommunity struct from attr to attr_extra 10428/head
Donatas Abraitis [Wed, 26 Jan 2022 19:40:29 +0000 (21:40 +0200)]
bgpd: Move out ipv6_ecommunity struct from attr to attr_extra

This is the initial work to move all non IPv4/IPv6 AFI related
attributes/structs to attr->extra to avoid unnecesarry allocations.

Signed-off-by: Donatas Abraitis <donatas.abraitis@gmail.com>
3 years agotopotests: set bgp peer-group with maximum-prefix-out 9880/head
Louis Scalbert [Mon, 25 Oct 2021 11:25:35 +0000 (13:25 +0200)]
topotests: set bgp peer-group with maximum-prefix-out

Set different combinations of bgp peer-group with a maximum-prefix-out
value.

Signed-off-by: Louis Scalbert <louis.scalbert@6wind.com>
3 years agobgpd: fix peer-group with maximum-prefix-out
Louis Scalbert [Mon, 25 Oct 2021 11:25:19 +0000 (13:25 +0200)]
bgpd: fix peer-group with maximum-prefix-out

When setting maximum-prefix-out on peer-group, the applied value on
member is 0.

Fix usage of maximum-prefix-out on peer-group.

The peer_maximum_prefix_out_(un)set functions are derived from
peer_maximum_prefix_(un)set.

Fixes: fde246e8353a ("bgpd: Add an option to limit outgoing prefixes")
Signed-off-by: Louis Scalbert <louis.scalbert@6wind.com>
3 years agotopotests: bgp no neighbor X.X.X.X maximum-prefix-out Y
Louis Scalbert [Mon, 25 Oct 2021 11:24:09 +0000 (13:24 +0200)]
topotests: bgp no neighbor X.X.X.X maximum-prefix-out Y

Test the ability to use the following configure command with a Y value:

no neighbor X.X.X.X maximum-prefix-out Y

Signed-off-by: Louis Scalbert <louis.scalbert@6wind.com>
3 years agobgpd: allow no neighbor X.X.X.X maximum-prefix-out [(1-4294967295)]
Louis Scalbert [Mon, 25 Oct 2021 11:23:38 +0000 (13:23 +0200)]
bgpd: allow no neighbor X.X.X.X maximum-prefix-out [(1-4294967295)]

Specifying a number is not possible with command no neighbor X.X.X.X
maximum-prefix-out

> frr(config-router-af)# no neighbor 192.168.1.2 maximum-prefix-out 1
> % Unknown command: no neighbor 192.168.1.2 maximum-prefix-out 1

This patch allows it.

Signed-off-by: Louis Scalbert <louis.scalbert@6wind.com>
3 years agoMerge pull request #10425 from ckishimo/ospf6d_nssa
Donald Sharp [Wed, 26 Jan 2022 14:56:34 +0000 (09:56 -0500)]
Merge pull request #10425 from ckishimo/ospf6d_nssa

ospf6d: show if area is NSSA

3 years agozebra: Don't double delete the table we are cleaning up 10420/head
Donald Sharp [Mon, 24 Jan 2022 20:37:54 +0000 (15:37 -0500)]
zebra: Don't double delete the table we are cleaning up

vrf_disable is always called first before
vrf_delete.  The rnh_table and rnh_table_multicast tables
are already deleted as part of vrf_disable.  No need
to do it again.

Signed-off-by: Donald Sharp <sharpd@nvidia.com>
3 years agoospf6d: show if area is NSSA 10425/head
ckishimo [Tue, 25 Jan 2022 17:49:27 +0000 (18:49 +0100)]
ospf6d: show if area is NSSA

This PR will include if the area is NSSA in the output of "show ipv6 ospf"

    r2# show ipv6 ospf
     ...
     Area 0.0.0.0
         Number of Area scoped LSAs is 8
         Interface attached to this area: r2-eth1
         SPF last executed 20.46717s ago
     Area 0.0.0.1[Stub]
         Number of Area scoped LSAs is 9
         Interface attached to this area: r2-eth0
         SPF last executed 20.46911s ago
     Area 0.0.0.2[NSSA]
         Number of Area scoped LSAs is 14
         Interface attached to this area: r2-eth2
         SPF last executed 20.46801s ago

Signed-off-by: ckishimo <carles.kishimoto@gmail.com>
3 years agoospf6d: fix indentation in show ipv6 ospf area
ckishimo [Tue, 25 Jan 2022 17:47:47 +0000 (18:47 +0100)]
ospf6d: fix indentation in show ipv6 ospf area

Signed-off-by: ckishimo <carles.kishimoto@gmail.com>
3 years agoMerge pull request #10410 from idryzhov/pim-memleaks
Quentin Young [Tue, 25 Jan 2022 16:41:09 +0000 (11:41 -0500)]
Merge pull request #10410 from idryzhov/pim-memleaks

3 years agoMerge pull request #10411 from idryzhov/if-config-vrf-name
Russ White [Tue, 25 Jan 2022 16:34:59 +0000 (11:34 -0500)]
Merge pull request #10411 from idryzhov/if-config-vrf-name

*: do not print vrf name for interface config when using vrf-lite

3 years agoMerge pull request #10395 from qlyoung/fix-pim-xpath-buffer-sizes
David Lamparter [Tue, 25 Jan 2022 16:22:39 +0000 (17:22 +0100)]
Merge pull request #10395 from qlyoung/fix-pim-xpath-buffer-sizes