]> git.puffer.fish Git - matthieu/frr.git/log
matthieu/frr.git
5 years agoFRRouting Release 7.3 frr-7.3
Martin Winter [Fri, 14 Feb 2020 14:03:09 +0000 (15:03 +0100)]
FRRouting Release 7.3

BGPd
   EVPN PIP Support
   Route Aggregation code speed ups
   BGP Vector I/O speed ups
   New CLI: `set distance XXX`
   New CLI: `aggregate-address A.B.C.D/M route-map WORD`
   New CLI: `bgp reject-as-sets`
   New CLI: `advertise pip ...`
   New CLI: `match evpn rd ASN:NN_OR_IP-ADDRESS:NN`
   New CLI: `show bgp l2vpn evpn community|large-community X`
   New CLI: `show bgp l2vpn evpn A.B.C.D`
   Auto-completion for clear bgp command
   Add ability to set tcp socket buffer size
OSPFd
   Partial MPLS TE support
PBRd
   New CLI: `set vrf unchanged|NAME`
BFDd
   VRF Support
   New CLI: 'show bfd peers brief'
   New CLI: 'clear bfd peer ...'
PIMd
   Significant Speedups in accessing Internal Data for higher scale
   Support for joining any-source Multicast
   Updated CLI: 'show ip pim upstream-join-desired'
   New CLI: 'show ip pim channel'
   Debug Cleanup
   MLAG experimental support
VRRPd
   VRF Support
   Northbound Conversion- NHRPd
vtysh
   New CLI: `banner motd line LINE...`
yangx
   New CLI: `show yang operational-data XPATH`
   New CLI: `debug northbound`
Zebra
   Nexthop Group support
   New CLI: 'debug zebra nexthop [detail]'
   New CLI: 'show router-id'
   MLAG experimental support
watchfrr
   Additional status messages of system state to systemd
   New CLI: `watchfrr ignore DAEMON`
Others
   As always all daemons have received too many bug fixes to fully list
   There has been a significant focus on increasing test coverage
Change in Behavior:
   ISISd
      All areas created default automatically to level-1-2
   Zebra
      Nexthop Group Installation in Kernel is turned on by default
      if the kernel supports-    New CLI: 'show nexthop-group rib [singleton]'
   Man Pages
      Renamed to frr-* to remove collision with other packages

Signed-off-by: Martin Winter <mwinter@opensourcerouting.org>
5 years agoMerge pull request #5782 from donaldsharp/bgp_73
Russ White [Tue, 11 Feb 2020 16:27:29 +0000 (11:27 -0500)]
Merge pull request #5782 from donaldsharp/bgp_73

[7.3]bgpd: Remove prefix pointer creation

5 years agoMerge pull request #5784 from donaldsharp/dc_73
Mark Stapp [Mon, 10 Feb 2020 15:49:44 +0000 (10:49 -0500)]
Merge pull request #5784 from donaldsharp/dc_73

[7.3] Double commit of nexthop cli changes to get this in.

5 years agodoc: Update doc to reflect changes in `show nexthop-group rib` command
Donald Sharp [Wed, 15 Jan 2020 13:28:22 +0000 (08:28 -0500)]
doc: Update doc to reflect changes in `show nexthop-group rib` command

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
5 years agozebra: nexthop groups vrf's are only a function of namespaces
Donald Sharp [Mon, 13 Jan 2020 21:11:46 +0000 (16:11 -0500)]
zebra: nexthop groups vrf's are only a function of namespaces

Nexthop groups as a whole do not make sense to have a vrf'ness
As that you can have a arbitrary number of nexthops that point
to separate vrf's.

Modify the code to make this distinction, by clearly delineating
the line between the nhg and the nexthop a bit better.
Nexthop groups having a vrf_id only make sense if you are using
network namespaces to represent them.

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
5 years agozebra: Modify 'show nexthop-group rib ip|ipv6'
Donald Sharp [Mon, 13 Jan 2020 21:00:33 +0000 (16:00 -0500)]
zebra: Modify 'show nexthop-group rib ip|ipv6'

The zebra implementation of nexthop groups has
two types of nexthops groups currently.  Singleton
objects which have afi's and combined nexthop groups
that do not.  Specifically call this out in the code
to make this distinction.

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
5 years agobgpd: Remove prefix pointer creation
Donald Sharp [Thu, 6 Feb 2020 02:02:25 +0000 (21:02 -0500)]
bgpd: Remove prefix pointer creation

The creation of a prefix pointer is unnecessary.  Save the
prefix as part of the actual data structure.  This will
reduce the data needed by 8 bytes per nexthop stored.

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
5 years agoMerge pull request #5769 from Spantik/bugs
Donald Sharp [Fri, 7 Feb 2020 14:20:28 +0000 (09:20 -0500)]
Merge pull request #5769 from Spantik/bugs

OSPF: Multi instance broken

5 years agoOSPF: Multi instance broken
Santosh P K [Wed, 5 Feb 2020 17:40:00 +0000 (09:40 -0800)]
OSPF: Multi instance broken

Multi instance ospf support was broken due to PR #4564.
Adding fix back and extra checks to support multi instance
OSPF.

Fixes issues #5343 & #5741

Signed-off-by: Santosh P K <sapk@vmware.com>
5 years agoMerge pull request #5735 from chiragshah6/73_evpn
Donatas Abraitis [Sun, 2 Feb 2020 16:59:05 +0000 (18:59 +0200)]
Merge pull request #5735 from chiragshah6/73_evpn

[7.3] bgpd: fix evpn route json memory leaks

5 years agoMerge pull request #5736 from opensourcerouting/move_rpm_to_python3_73
Donatas Abraitis [Wed, 29 Jan 2020 07:37:42 +0000 (09:37 +0200)]
Merge pull request #5736 from opensourcerouting/move_rpm_to_python3_73

[7.3] Move rpm to python3

5 years agobgpd: fix memory leak in evpn json outpus II
Chirag Shah [Mon, 27 Jan 2020 18:41:22 +0000 (10:41 -0800)]
bgpd: fix memory leak in evpn json outpus II

Two of the evpn show commands with json option has memory leak.
1) show bgp l2vpn evpn route vni all json
2) show bgp l2vpn evpn route esi json

Before fix:
----------
Executed 'show bgp l2vpn evpn route vni all json' multiple times
used ordinary blocks continue to increase.

Note at the time of show command capture there were 22 evpn routes
in vni evpn route table.

Memory statistics for bgpd:
System allocator statistics:
  Total heap allocated:  9152 KiB
  Holding block headers: 0 bytes
  Used small blocks:     0 bytes
  Used ordinary blocks:  7300 KiB
  Free small blocks:     1760 bytes
  Free ordinary blocks:  1852 KiB
  Ordinary blocks:       880
  Small blocks:          51
  Holding blocks:        0

Ticket:CM-27920
Reviewed By:
Testing Done:

After fix:
---------
Executed 'show bgp l2vpn evpn route vni all json' multiple times
Used ordinary blocks remains low.

Memory statistics for bgpd:
System allocator statistics:
  Total heap allocated:  8356 KiB
  Holding block headers: 0 bytes
  Used small blocks:     0 bytes
  Used ordinary blocks:  6492 KiB
  Free small blocks:     1840 bytes
  Free ordinary blocks:  1864 KiB
  Ordinary blocks:       939
  Small blocks:          52
  Holding blocks:        0

Signed-off-by: Chirag Shah <chirag@cumulusnetworks.com>
5 years agobgpd: fix memory leak in evpn json outputs
Chirag Shah [Wed, 22 Jan 2020 20:22:27 +0000 (12:22 -0800)]
bgpd: fix memory leak in evpn json outputs

Found memory leak in json output of evpn's route
commands.

After executing 'show bgp l2vpn evpn route type prefix json'
and 'show bgp l2vpn evpn route type macip json' few times
(6 times) with more than 600 routes in total seeing
memory footprint for bgpd continue to grow.

Memory statistics for bgpd:
System allocator statistics:
  Total heap allocated:  12 MiB
  Holding block headers: 0 bytes
  Used small blocks:     0 bytes
  Used ordinary blocks:  8390 KiB
  Free small blocks:     1760 bytes
  Free ordinary blocks:  3762 KiB
  Ordinary blocks:       1161
  Small blocks:          51
  Holding blocks:        0

Ticket:CM-27920
Testing Done:

After fix:
excute few times,
'show bgp l2vpn evpn route type prefix json'
and 'show bgp l2vpn evpn route type macip json'
commands where used ordinary blocks (uordblks) is
in steady state.

Memory statistics for bgpd:
System allocator statistics:
  Total heap allocated:  9968 KiB
  Holding block headers: 0 bytes
  Used small blocks:     0 bytes
  Used ordinary blocks:  6486 KiB
  Free small blocks:     1984 bytes
  Free ordinary blocks:  3482 KiB
  Ordinary blocks:       1110
  Small blocks:          54
  Holding blocks:        0

Memory statistics for bgpd:
System allocator statistics:
  Total heap allocated:  10100 KiB
  Holding block headers: 0 bytes
  Used small blocks:     0 bytes
  Used ordinary blocks:  6488 KiB
  Free small blocks:     1984 bytes
  Free ordinary blocks:  3612 KiB
  Ordinary blocks:       1113
  Small blocks:          54
  Holding blocks:        0

Signed-off-by: Chirag Shah <chirag@cumulusnetworks.com>
5 years agodoc: Update RedHat packaging description to use Python 3
Martin Winter [Sat, 25 Jan 2020 22:00:47 +0000 (23:00 +0100)]
doc: Update RedHat packaging description to use Python 3

Signed-off-by: Martin Winter <mwinter@opensourcerouting.org>
5 years agoredhat: Update frr.spec.in to move all systems to Python3 except CentOS 6
Martin Winter [Fri, 24 Jan 2020 23:44:34 +0000 (00:44 +0100)]
redhat: Update frr.spec.in to move all systems to Python3 except CentOS 6

Signed-off-by: Martin Winter <mwinter@opensourcerouting.org>
5 years agotools: Update generate_support_bundle.py to support Python 3
Martin Winter [Fri, 24 Jan 2020 23:43:20 +0000 (00:43 +0100)]
tools: Update generate_support_bundle.py to support Python 3

Signed-off-by: Martin Winter <mwinter@opensourcerouting.org>
5 years agoMerge pull request #5730 from opensourcerouting/73_fix_centos6
Donatas Abraitis [Sat, 25 Jan 2020 03:02:22 +0000 (05:02 +0200)]
Merge pull request #5730 from opensourcerouting/73_fix_centos6

lib: Fix missing __be16 typedef on CentOS6

5 years agolib: Fix missing __be16 typedef on CentOS6
Martin Winter [Mon, 20 Jan 2020 14:40:49 +0000 (15:40 +0100)]
lib: Fix missing __be16 typedef on CentOS6

Need to include linux/types.h on older Linux

Signed-off-by: Martin Winter <mwinter@opensourcerouting.org>
5 years agoMerge pull request #5723 from donaldsharp/73_onlink_loss
Donatas Abraitis [Fri, 24 Jan 2020 16:24:08 +0000 (18:24 +0200)]
Merge pull request #5723 from donaldsharp/73_onlink_loss

73 onlink loss

5 years agodoc: Update ospf unnumbered documentation
Donald Sharp [Thu, 23 Jan 2020 02:46:46 +0000 (21:46 -0500)]
doc: Update ospf unnumbered documentation

Update the ospf unnumbered documentation to reflect how
to get it working under linux.

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
5 years agotests: Test ospf unnumbered behavior and ensure that it works
Donald Sharp [Mon, 20 Jan 2020 19:49:03 +0000 (14:49 -0500)]
tests: Test ospf unnumbered behavior and ensure that it works

Recent commit: 0eb97b860dc94329cf9add9f8f3d3a2c7f539568

Broke onlink behavior and as a result ospf unnumbered failed
to work.  This commit adds a small test to create 2 ospf routers,
connect them through ospf unlinked behavior and then ensure
that the routes are installed into the kernel as expected.

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
5 years agozebra: Re-add onlink flag due to loss in earlier commit
Donald Sharp [Mon, 20 Jan 2020 21:53:34 +0000 (16:53 -0500)]
zebra: Re-add onlink flag due to loss in earlier commit

commit: 0eb97b860dc94329cf9add9f8f3d3a2c7f539568

Removed this chunk of code in zebra:
-       if (ifp)
-               if (connected_is_unnumbered(ifp))
-                       SET_FLAG(nexthop->flags, NEXTHOP_FLAG_ONLINK);

Effectively if we had a NEXTHOP_TYPE_IPV4_IFINDEX we would
auto set the onlink flag.  This commit dropped it for some reason.

Add it back in an intelligent manner.

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
5 years agoMerge pull request #5720 from mjstapp/fix_nh_debug_show_7_3
Donatas Abraitis [Thu, 23 Jan 2020 09:06:38 +0000 (11:06 +0200)]
Merge pull request #5720 from mjstapp/fix_nh_debug_show_7_3

zebra: [7.3] include zebra nexthop debug in show run

5 years agozebra: include zebra nexthop debug in show run
Mark Stapp [Wed, 22 Jan 2020 15:00:41 +0000 (10:00 -0500)]
zebra: include zebra nexthop debug in show run

[7.3 version] Add show output for 'debug zebra nexthop [detail]'
category.

Signed-off-by: Mark Stapp <mjs@voltanet.io>
5 years agoMerge pull request #5708 from donaldsharp/nexthop_encoding_73
Donatas Abraitis [Sun, 19 Jan 2020 07:13:33 +0000 (09:13 +0200)]
Merge pull request #5708 from donaldsharp/nexthop_encoding_73

[7.3]lib: Fix nexthop encoding

5 years agolib: Fix nexthop encoding
Donald Sharp [Sat, 18 Jan 2020 14:25:38 +0000 (09:25 -0500)]
lib: Fix nexthop encoding

Commit
68a02e06e5f103048d947262c08c569056f74d1c broke nexthop encoding
for nexthop tracking.

This code combined the different types of nexthop encoding
being done in the zapi protocol.  What was missed that
resolved nexthops of type NEXTHOP_TYPE_IPV4|6 have an ifindex
value that was not being reported.  This commit ensures
that we always send this data( even if it is 0).

The following test commit will ensure that this stays working
as is expected by an upper level protocol.

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
5 years agoMerge pull request #5690 from ton31337/fix/addpath_adj_out_look_compare_id_7.3
Donald Sharp [Thu, 16 Jan 2020 12:18:23 +0000 (07:18 -0500)]
Merge pull request #5690 from ton31337/fix/addpath_adj_out_look_compare_id_7.3

bgpd: [7.3] add addpath ID to adj_out tree sort

5 years agoMerge pull request #5688 from sworleys/dev-7.3-NHG-Fixes
David Lamparter [Thu, 16 Jan 2020 09:18:07 +0000 (10:18 +0100)]
Merge pull request #5688 from sworleys/dev-7.3-NHG-Fixes

[7.3] NHG Crash/Resolution Fixes

5 years agobgpd: add addpath ID to adj_out tree sort
Mitchell Skiba [Thu, 9 Jan 2020 19:46:13 +0000 (11:46 -0800)]
bgpd: add addpath ID to adj_out tree sort

When withdrawing addpaths, adj_lookup was called to find the path that
needed to be withdrawn. It would lookup in the RB tree based on subgroup
pointer alone, often find the path with the wrong addpath ID, and return
null.  Only the path highest in the tree sent to the subgroup could be
found, thus withdrawn.

Adding the addpath ID to the sort criteria for the RB tree allows us to
simplify the logic for adj_lookup, and address this problem. We are able
to remove the logic around non-addpath subgroups because the addpath ID
is consistently 0 for non-addpath adj_outs, so special logic to skip
matching the addpath ID isn't required.  (As a side note, addpath will
also never use ID 0, so there won't be any ambiguity when looking at the
structure content.)

Signed-off-by: Mitchell Skiba <mskiba@amazon.com>
5 years agozebra: can't improve efficiency for recursive depends
Stephen Worley [Tue, 31 Dec 2019 17:10:58 +0000 (12:10 -0500)]
zebra: can't improve efficiency for recursive depends

cb86eba3ab3d82f540bdb9ed5f65d361ca301ea8 was causing zebra to crash
when handling a nexthop group that had a nexthop which was recursively resolved.

Steps to recreate:

!
nexthop-group red
 nexthop 1.1.1.1
 nexthop 1.1.1.2
!

sharp install routes 8.8.8.1 nexthop-group red 1

=========================================
==11898== Invalid write of size 8
==11898==    at 0x48E53B4: _nexthop_add_sorted (nexthop_group.c:254)
==11898==    by 0x48E5336: nexthop_group_add_sorted (nexthop_group.c:296)
==11898==    by 0x453593: handle_recursive_depend (zebra_nhg.c:481)
==11898==    by 0x451CA8: zebra_nhg_find (zebra_nhg.c:572)
==11898==    by 0x4530FB: zebra_nhg_find_nexthop (zebra_nhg.c:597)
==11898==    by 0x4536B4: depends_find (zebra_nhg.c:1065)
==11898==    by 0x453526: depends_find_add (zebra_nhg.c:1087)
==11898==    by 0x451C4D: zebra_nhg_find (zebra_nhg.c:567)
==11898==    by 0x4519DE: zebra_nhg_rib_find (zebra_nhg.c:1126)
==11898==    by 0x452268: nexthop_active_update (zebra_nhg.c:1729)
==11898==    by 0x461517: rib_process (zebra_rib.c:1049)
==11898==    by 0x4610C8: process_subq_route (zebra_rib.c:1967)
==11898==  Address 0x0 is not stack'd, malloc'd or (recently) free'd

Zebra crashes because we weren't handling the case of the depend nexthop
being recursive.

For this case, we cannot make the function more efficient. A nexthop
could resolve to a group of any size, thus we need allocs/frees.

To solve this and retain the goal of the original patch, we separate out the
two cases so it will still be more efficient if the nexthop is not recursive.

Signed-off-by: Stephen Worley <sworley@cumulusnetworks.com>
(cherry picked from commit 0fff714efa1959f48c8e1d88e88968d15c1ffe78)

5 years agozebra: just set nexthop member in handle_recursive_depend()
Stephen Worley [Fri, 3 Jan 2020 17:35:15 +0000 (12:35 -0500)]
zebra: just set nexthop member in handle_recursive_depend()

With recent changes to the lib nexthop_group
APIs (e1f3a8eb193267da195088cc515b598ae5a92a12), we are making
new assumptions that this should be adding a single nexthop
to a group, not a list of nexthops.

This broke the case of a recursive nexthop resolving to a group:

```
D>  2.2.2.1/32 [150/0] via 1.1.1.1 (recursive), 00:00:09
  *                      via 1.1.1.1, dummy1 onlink, 00:00:09
                       via 1.1.1.2 (recursive), 00:00:09
  *                      via 1.1.1.2, dummy2 onlink, 00:00:09
D>  3.3.3.1/32 [150/0] via 2.2.2.1 (recursive), 00:00:04
  *                      via 1.1.1.1, dummy1 onlink, 00:00:04
K * 10.0.0.0/8 [0/1] via 172.27.227.148, tun0, 00:00:21
```

This group can instead just directly point to the nh that was passed.
Its only being used for a lookup (the memory gets copied and used
elsewhere if the nexthop is not found).

Signed-off-by: Stephen Worley <sworley@cumulusnetworks.com>
(cherry picked from commit 1d049aba721bb05ecf2f8b5978d96863330093b6)

5 years agoMerge pull request #5684 from opensourcerouting/7.3/manpage-rename
Donatas Abraitis [Wed, 15 Jan 2020 19:46:52 +0000 (21:46 +0200)]
Merge pull request #5684 from opensourcerouting/7.3/manpage-rename

[7.3] doc: manpage rename

5 years agoospfclient: don't install man page
David Lamparter [Wed, 15 Jan 2020 11:22:26 +0000 (12:22 +0100)]
ospfclient: don't install man page

... we're not installing ospfclient (it's a demo/example program), so
installing the man page is quite useless.

Signed-off-by: David Lamparter <equinox@diac24.net>
5 years agodoc: rename man pages to frr-*
David Lamparter [Tue, 14 Jan 2020 23:00:32 +0000 (00:00 +0100)]
doc: rename man pages to frr-*

The vrrpd one conflicts with the standalone vrrpd package; also we're
installing daemons to /usr/lib/frr on some systems so they're not on
PATH.

Signed-off-by: David Lamparter <equinox@diac24.net>
5 years agoMerge pull request #5683 from donaldsharp/bfd_msg_7.3
David Lamparter [Wed, 15 Jan 2020 16:08:09 +0000 (17:08 +0100)]
Merge pull request #5683 from donaldsharp/bfd_msg_7.3

[7.3]zebra: bfd message handling cleanup foo

5 years agozebra: bfd message handling cleanup foo
Quentin Young [Tue, 14 Jan 2020 18:55:55 +0000 (13:55 -0500)]
zebra: bfd message handling cleanup foo

Previous patches introduced various issues:
- Removal of stream_free() to fix double free caused memleak
- Patch for memleak was incomplete

This should fix it hopefully.

Signed-off-by: Quentin Young <qlyoung@cumulusnetworks.com>
5 years agoMerge pull request #5663 from donaldsharp/nhg_topotests_fixes base_7.3
Mark Stapp [Fri, 10 Jan 2020 23:19:23 +0000 (18:19 -0500)]
Merge pull request #5663 from donaldsharp/nhg_topotests_fixes

Nhg topotests fixes

5 years agoMerge pull request #5662 from qlyoung/fix-ptm-bfd-deregister-memleak
Mark Stapp [Fri, 10 Jan 2020 21:59:20 +0000 (16:59 -0500)]
Merge pull request #5662 from qlyoung/fix-ptm-bfd-deregister-memleak

zebra: fix bfd deregister message memleak

5 years agozebra: Actually add the NLA_F_NESTED flag to our code
Donald Sharp [Fri, 10 Jan 2020 20:13:36 +0000 (15:13 -0500)]
zebra: Actually add the NLA_F_NESTED flag to our code

The existing usage of the rta_nest and addattr_nest
functions were not adding the NLA_F_NESTED flag
to the type.  As such the new nexthop functionality was
actually looking for this flag, while apparently older
code did not.

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
5 years agoMerge pull request #5661 from ton31337/fix/doc_for_redhat
Quentin Young [Fri, 10 Jan 2020 18:44:21 +0000 (13:44 -0500)]
Merge pull request #5661 from ton31337/fix/doc_for_redhat

doc: Replace wrong paths for centos/fedora source build instructions

5 years agotests: ospf6-topo1 did not work properly with nhg's and 5.3 kernels
Donald Sharp [Fri, 10 Jan 2020 13:57:18 +0000 (08:57 -0500)]
tests: ospf6-topo1 did not work properly with nhg's and 5.3 kernels

Fix the ospf6-topo1 test to understand nhg's and what happens
when they are installed into a kernel that can support them.

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
5 years agoMerge pull request #5609 from kooky/fix_log
Quentin Young [Fri, 10 Jan 2020 01:55:05 +0000 (20:55 -0500)]
Merge pull request #5609 from kooky/fix_log

Fix logrotate in debian for bfdd, pbrd and vrrpd.

5 years agodebian: Fix logrotate in debian for bfdd, pbrd and vrrpd.
Tim Bray [Thu, 2 Jan 2020 20:00:07 +0000 (20:00 +0000)]
debian: Fix logrotate in debian for bfdd, pbrd and vrrpd.

Signed-off-by: Tim Bray <tim@kooky.org>
5 years agozebra: fix bfd deregister message memleak
Quentin Young [Thu, 9 Jan 2020 23:50:18 +0000 (18:50 -0500)]
zebra: fix bfd deregister message memleak

Removing double frees accidentally introduced a memleak

Signed-off-by: Quentin Young <qlyoung@cumulusnetworks.com>
5 years agodoc: Replace wrong paths for centos/fedora source build instructions
Donatas Abraitis [Thu, 9 Jan 2020 22:11:09 +0000 (00:11 +0200)]
doc: Replace wrong paths for centos/fedora source build instructions

Signed-off-by: Donatas Abraitis <donatas.abraitis@gmail.com>
5 years agoMerge pull request #5410 from ton31337/feature/bgp_default-route_with_route-map_set
Donald Sharp [Thu, 9 Jan 2020 13:39:32 +0000 (08:39 -0500)]
Merge pull request #5410 from ton31337/feature/bgp_default-route_with_route-map_set

bgpd: An ability to set attributes for default-originate via route-map

5 years agoMerge pull request #5560 from sworleys/Pim-Vrf-Hang-3
Mark Stapp [Wed, 8 Jan 2020 20:14:40 +0000 (15:14 -0500)]
Merge pull request #5560 from sworleys/Pim-Vrf-Hang-3

lib,zebra: add zapi msg top level error handling

5 years agoMerge pull request #5418 from qlyoung/fix-bgp-prefix-sid-missing-boundscheck
Donatas Abraitis [Wed, 8 Jan 2020 19:59:07 +0000 (21:59 +0200)]
Merge pull request #5418 from qlyoung/fix-bgp-prefix-sid-missing-boundscheck

bgpd: fix missing bounds checks for psid attr

5 years agopimd: lookup nh using vrf_id we checked before
Stephen Worley [Mon, 16 Dec 2019 22:40:41 +0000 (17:40 -0500)]
pimd: lookup nh using vrf_id we checked before

Update zclient_lookup_nexthop_once() to create the zapi
header using the vrf_id on the pim->vrf struct.

This is the one we do a check on a couple lines before, so
we should be using it when we actually create the header as
well.

Signed-off-by: Stephen Worley <sworley@cumulusnetworks.com>
5 years agopimd: allow pimd to handle nexthop_lookup zapi error
Stephen Worley [Fri, 13 Dec 2019 01:14:51 +0000 (20:14 -0500)]
pimd: allow pimd to handle nexthop_lookup zapi error

Allow pimd to stop the lookup if zebra tells pimd that the
lookup failed due to a zapi error. Otherwise, it will keep
waiting for a nexthop message that will never come.

Signed-off-by: Stephen Worley <sworley@cumulusnetworks.com>
5 years agolib,zebra: add zapi msg top level error handling
Stephen Worley [Tue, 17 Dec 2019 22:00:52 +0000 (17:00 -0500)]
lib,zebra: add zapi msg top level error handling

Add error handling for top level failures (not able to
execute command, unable to find vrf for command, etc.)

With this error handling we add a new zapi message type
of ZEBRA_ERROR used when we are unable to properly handle
a zapi command and pass it down into the lower level code.

In the event of this, we reply with a message of type
enum zebra_error_types containing the error type.

The sent packet will look like so:

 0                   1                   2                   3
 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1
+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
|             Length            |     Marker    |    Version    |
+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
|                             VRF ID                            |
+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
|            Command            |
+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
|            ERROR TYPE         |
+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+

Also add appropriate hooks for clients to subscribe to for
handling these types of errors.

Signed-off-by: Stephen Worley <sworley@cumulusnetworks.com>
5 years agoMerge pull request #5551 from mjstapp/fix_zebra_show_nhg
Donald Sharp [Wed, 8 Jan 2020 16:54:01 +0000 (11:54 -0500)]
Merge pull request #5551 from mjstapp/fix_zebra_show_nhg

zebra: make current show nexthop-group cli zebra-specific

5 years agozebra: make current show nexthop-group cli zebra-specific
Mark Stapp [Tue, 17 Dec 2019 16:31:17 +0000 (11:31 -0500)]
zebra: make current show nexthop-group cli zebra-specific

There's confusion between the nexthop-group configuration and a
zebra-specific show command. For now, make the zebra show
command string RIB-specific until we're able to unify these
paths.

Signed-off-by: Mark Stapp <mjs@voltanet.io>
5 years agoMerge pull request #5260 from donaldsharp/evpn_mac_daddy
Donatas Abraitis [Wed, 8 Jan 2020 06:59:51 +0000 (08:59 +0200)]
Merge pull request #5260 from donaldsharp/evpn_mac_daddy

bgpd: Prevent usage after free in bgp_mac.c

5 years agoMerge pull request #5314 from qlyoung/yang-vrrp
Renato Westphal [Wed, 8 Jan 2020 00:36:46 +0000 (21:36 -0300)]
Merge pull request #5314 from qlyoung/yang-vrrp

VRRP northbound conversion

5 years agoMerge pull request #5650 from qlyoung/fix-cast-malloc
Mark Stapp [Tue, 7 Jan 2020 21:46:29 +0000 (16:46 -0500)]
Merge pull request #5650 from qlyoung/fix-cast-malloc

zebra: remove cast from l3vni XMALLOC

5 years agoMerge pull request #5624 from qlyoung/fix-zebra-ptm-buffer-overrun
Rafael Zalamena [Tue, 7 Jan 2020 20:02:07 +0000 (17:02 -0300)]
Merge pull request #5624 from qlyoung/fix-zebra-ptm-buffer-overrun

Fix PTM ZAPI stream parsing

5 years agoMerge pull request #5646 from Spantik/bgp_unalign
Donald Sharp [Tue, 7 Jan 2020 19:35:59 +0000 (14:35 -0500)]
Merge pull request #5646 from Spantik/bgp_unalign

bgpd: fix unaligned access to addpath id

5 years agozebra: remove cast from l3vni XMALLOC
Quentin Young [Tue, 7 Jan 2020 18:54:04 +0000 (13:54 -0500)]
zebra: remove cast from l3vni XMALLOC

Signed-off-by: Quentin Young <qlyoung@cumulusnetworks.com>
5 years agoMerge pull request #5617 from donaldsharp/zebra_bites
Mark Stapp [Tue, 7 Jan 2020 18:41:03 +0000 (13:41 -0500)]
Merge pull request #5617 from donaldsharp/zebra_bites

zebra: misc zebra cleanups

5 years agoMerge pull request #5639 from qlyoung/fix-zebra-ptm-double-free
Mark Stapp [Tue, 7 Jan 2020 16:20:22 +0000 (11:20 -0500)]
Merge pull request #5639 from qlyoung/fix-zebra-ptm-double-free

zebra: fix ptm heap double free

5 years agoMerge pull request #5628 from donaldsharp/rtm_getneigh
Russ White [Tue, 7 Jan 2020 15:47:50 +0000 (10:47 -0500)]
Merge pull request #5628 from donaldsharp/rtm_getneigh

zebra: Ignore RTM_GETNEIGH messages from the linux kernel

5 years agobgpd: fix unaligned access to addpath id
Santosh P K [Tue, 7 Jan 2020 15:47:13 +0000 (07:47 -0800)]
bgpd: fix unaligned access to addpath id

uint8_t * cannot be cast to uint32_t * unless the
pointed-to address is aligned according to uint32_t's
alignment rules. And it usually is not.

Signed-off-by: Santosh P K <sapk@vmware.com>
5 years agoMerge pull request #5634 from chiragshah6/evpn_dev2
Russ White [Tue, 7 Jan 2020 15:45:30 +0000 (10:45 -0500)]
Merge pull request #5634 from chiragshah6/evpn_dev2

bgpd: fix advertise pip running config

5 years agoMerge pull request #5644 from donaldsharp/more_pim_doc
Russ White [Tue, 7 Jan 2020 15:34:01 +0000 (10:34 -0500)]
Merge pull request #5644 from donaldsharp/more_pim_doc

doc: Clarify what is supported directly in PIM documentation

5 years agodoc: Clarify what is supported directly in PIM documentation
Donald Sharp [Tue, 7 Jan 2020 14:03:08 +0000 (09:03 -0500)]
doc: Clarify what is supported directly in PIM documentation

The FRR community keeps getting asked about what is supported or not.
Try to clarify in an additional spot what is and what is not supported.
Where people interested in using PIM might have a chance at actually
seeing the notification.

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
5 years agoMerge pull request #5638 from qlyoung/fix-bgp-cluster-list-null-memcmp
Donatas Abraitis [Tue, 7 Jan 2020 08:54:31 +0000 (10:54 +0200)]
Merge pull request #5638 from qlyoung/fix-bgp-cluster-list-null-memcmp

bgpd: avoid memcmp(NULL, NULL)

5 years agoMerge pull request #5635 from donaldsharp/debian_build
Donatas Abraitis [Tue, 7 Jan 2020 08:47:41 +0000 (10:47 +0200)]
Merge pull request #5635 from donaldsharp/debian_build

debian: Fix spelling error

5 years agoMerge pull request #5636 from qlyoung/fix-bgp-unaligned-addpath-id-pointer
Donatas Abraitis [Tue, 7 Jan 2020 08:47:16 +0000 (10:47 +0200)]
Merge pull request #5636 from qlyoung/fix-bgp-unaligned-addpath-id-pointer

bgpd: fix unaligned access to addpath id

5 years agobgpd: An ability to set attributes for default-originate via route-map
Donatas Abraitis [Wed, 27 Nov 2019 20:50:33 +0000 (22:50 +0200)]
bgpd: An ability to set attributes for default-originate via route-map

With this change, we are able to set attributes via route-map to the default
route. It's useful in cases where we have two or more spines and we want to
prefer one router over others for leaves. This simplifies configuration instead
of using 'network 0.0.0.0/0' or 'ip route 0.0.0.0/0 ...' and 'redistribute
static' combination.

Signed-off-by: Donatas Abraitis <donatas.abraitis@gmail.com>
5 years agotests: Add a test for 'neighbor <neighbor> default-originate route-map <rm>'
Donatas Abraitis [Wed, 27 Nov 2019 20:50:21 +0000 (22:50 +0200)]
tests: Add a test for 'neighbor <neighbor> default-originate route-map <rm>'

Signed-off-by: Donatas Abraitis <donatas.abraitis@gmail.com>
5 years agobgpd: avoid memcmp(NULL, NULL)
Quentin Young [Tue, 7 Jan 2020 05:51:35 +0000 (00:51 -0500)]
bgpd: avoid memcmp(NULL, NULL)

Undefined behavior

Signed-off-by: Quentin Young <qlyoung@cumulusnetworks.com>
5 years agoMerge pull request #5623 from qlyoung/fix-zebra-rtadv-interval-overflow
Renato Westphal [Tue, 7 Jan 2020 02:51:44 +0000 (23:51 -0300)]
Merge pull request #5623 from qlyoung/fix-zebra-rtadv-interval-overflow

zebra: disallow negative rtadv intvl, fix overflow

5 years agoMerge pull request #5625 from qlyoung/fix-zapi-ipset-name-nullterm
Renato Westphal [Tue, 7 Jan 2020 02:47:41 +0000 (23:47 -0300)]
Merge pull request #5625 from qlyoung/fix-zapi-ipset-name-nullterm

zebra: ensure ipset name is null terminated

5 years agoMerge pull request #5614 from qlyoung/fix-zebra-zapi-crashes
Renato Westphal [Tue, 7 Jan 2020 02:45:49 +0000 (23:45 -0300)]
Merge pull request #5614 from qlyoung/fix-zebra-zapi-crashes

Fix zebra zapi crashes

5 years agoMerge pull request #5580 from mjstapp/zebra_nhg_debug_category
Renato Westphal [Tue, 7 Jan 2020 02:44:23 +0000 (23:44 -0300)]
Merge pull request #5580 from mjstapp/zebra_nhg_debug_category

zebra: add a debug category for nexthops

5 years agoMerge pull request #5550 from manuhalo/fix_isis_def_level
Renato Westphal [Tue, 7 Jan 2020 02:43:07 +0000 (23:43 -0300)]
Merge pull request #5550 from manuhalo/fix_isis_def_level

isisd, yang: set default is-type to level-1-2

5 years agodebian: Fix spelling error
Donald Sharp [Tue, 7 Jan 2020 01:36:13 +0000 (20:36 -0500)]
debian: Fix spelling error

Spelling error pointed out by debian build.

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
5 years agoMerge pull request #5546 from mjstapp/fix_notify_nht
Donald Sharp [Tue, 7 Jan 2020 01:34:24 +0000 (20:34 -0500)]
Merge pull request #5546 from mjstapp/fix_notify_nht

zebra: route changes via notify path should trigger nht

5 years agoMerge pull request #5553 from slankdev/slankdev-fix-kernel-route-deletion-on-vrf
Donald Sharp [Tue, 7 Jan 2020 01:32:16 +0000 (20:32 -0500)]
Merge pull request #5553 from slankdev/slankdev-fix-kernel-route-deletion-on-vrf

zebra: fix kernel-route's deletion on vrf

5 years agozebra: Handle crash when backpointer does not exist
Donald Sharp [Fri, 3 Jan 2020 19:35:10 +0000 (14:35 -0500)]
zebra: Handle crash when backpointer does not exist

=================================================================
==3058==ERROR: AddressSanitizer: SEGV on unknown address 0x000000000010 (pc 0x7f5bf3ef7477 bp 0x7ffdfaa20d40 sp 0x7ffdfaa204c8 T0)
==3058==The signal is caused by a READ memory access.
==3058==Hint: address points to the zero page.
    #0 0x7f5bf3ef7476 in memcpy /build/glibc-OTsEL5/glibc-2.27/string/../sysdeps/x86_64/multiarch/memmove-vec-unaligned-erms.S:134
    #1 0x4d158a in __asan_memcpy (/usr/lib/frr/zebra+0x4d158a)
    #2 0x7f5bf58da8ad in stream_put /home/qlyoung/frr/lib/stream.c:605:3
    #3 0x67d428 in zsend_ipset_entry_notify_owner /home/qlyoung/frr/zebra/zapi_msg.c:851:2
    #4 0x5c70b3 in zebra_pbr_add_ipset_entry /home/qlyoung/frr/zebra/zebra_pbr.c
    #5 0x68e1bb in zread_ipset_entry /home/qlyoung/frr/zebra/zapi_msg.c:2465:4
    #6 0x68f958 in zserv_handle_commands /home/qlyoung/frr/zebra/zapi_msg.c:2611:3
    #7 0x55666d in main /home/qlyoung/frr/zebra/main.c:309:2
    #8 0x7f5bf3e5db96 in __libc_start_main /build/glibc-OTsEL5/glibc-2.27/csu/../csu/libc-start.c:310
    #9 0x4311d9 in _start (/usr/lib/frr/zebra+0x4311d9)

the ipset->backpointer was NULL as that the hash lookup failed to find
anything.  Prevent this crash from happening.

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
5 years agozebra: Refactor _add and _del to use a common function
Donald Sharp [Fri, 3 Jan 2020 18:30:37 +0000 (13:30 -0500)]
zebra: Refactor _add and _del to use a common function

The decoding of _add and _del functions is practically identical
do a bit of work and make them so.

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
5 years agozebra: Prevent zebra vxlan remote macip del buffer overflow
Donald Sharp [Fri, 3 Jan 2020 17:55:09 +0000 (12:55 -0500)]
zebra: Prevent zebra vxlan remote macip del buffer overflow

=================================================================
==13611==ERROR: AddressSanitizer: stack-buffer-overflow on address 0x7ffe9e5c8694 at pc 0x0000004d18ac bp 0x7ffe9e5c8330 sp 0x7ffe9e5c7ae0
WRITE of size 17 at 0x7ffe9e5c8694 thread T0
    #0 0x4d18ab in __asan_memcpy (/usr/lib/frr/zebra+0x4d18ab)
    #1 0x7f16f04bd97f in stream_get2 /home/qlyoung/frr/lib/stream.c:277:2
    #2 0x6410ec in zebra_vxlan_remote_macip_del /home/qlyoung/frr/zebra/zebra_vxlan.c:7718:4
    #3 0x68fa98 in zserv_handle_commands /home/qlyoung/frr/zebra/zapi_msg.c:2611:3
    #4 0x556add in main /home/qlyoung/frr/zebra/main.c:309:2
    #5 0x7f16eea3bb96 in __libc_start_main /build/glibc-OTsEL5/glibc-2.27/csu/../csu/libc-start.c:310
    #6 0x431249 in _start (/usr/lib/frr/zebra+0x431249)

This decode is the result of a buffer overflow because we are
not checking ipa_len.

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
5 years agobgpd: fix unaligned access to addpath id
Quentin Young [Tue, 7 Jan 2020 01:09:23 +0000 (20:09 -0500)]
bgpd: fix unaligned access to addpath id

uint8_t * cannot be cast to uint32_t * unless the pointed-to address is
aligned according to uint32_t's alignment rules. And it usually is not.

Signed-off-by: Quentin Young <qlyoung@cumulusnetworks.com>
5 years agobgpd: fix advertise pip running config
Chirag Shah [Mon, 6 Jan 2020 22:48:57 +0000 (14:48 -0800)]
bgpd: fix advertise pip running config

advertise pip running configuration should
display ip followed by mac parameters value as defined
in cli signature.

advertise-pip is enabled by default, when displaying the
running configuration, there is '\n' added after
ip and mac parameters which was not guarded around
the non-default parameters.

Currently, for every bgp vrf instance it ends up
displaying l2vpn address-family section due to
unguarded newline.

running config:
router bgp 6004 vrf vrf1
 !
 address-family l2vpn evpn
 exit-address-family
!

Ticket:CM-26964
Testing Done:

With fix when only 'router bgp 6004 vrf vrf1' configured,
running config looks like:

!
router bgp 6004 vrf vrf1
!

Signed-off-by: Chirag Shah <chirag@cumulusnetworks.com>
5 years agozebra: fix ptm heap double free
Quentin Young [Tue, 7 Jan 2020 00:48:08 +0000 (19:48 -0500)]
zebra: fix ptm heap double free

Don't need to free these, they're freed by the caller.

Signed-off-by: Quentin Young <qlyoung@cumulusnetworks.com>
5 years agoMerge pull request #5621 from qlyoung/fix-zclient-excess-nexthop-decode
Mark Stapp [Mon, 6 Jan 2020 21:00:35 +0000 (16:00 -0500)]
Merge pull request #5621 from qlyoung/fix-zclient-excess-nexthop-decode

lib: dont decode more nexthops than we can handle

5 years agoMerge pull request #5626 from qlyoung/fix-zapi-pbr-foo
Mark Stapp [Mon, 6 Jan 2020 19:59:07 +0000 (14:59 -0500)]
Merge pull request #5626 from qlyoung/fix-zapi-pbr-foo

zebra: Fix zapi pbr foo, pseudowire ifname termination

5 years agoMerge pull request #5622 from qlyoung/fix-iface-ifindex-compare
Mark Stapp [Mon, 6 Jan 2020 19:04:33 +0000 (14:04 -0500)]
Merge pull request #5622 from qlyoung/fix-iface-ifindex-compare

lib: fix ifindex comparison overflow

5 years agolib: dont decode more nexthops than we can handle
Quentin Young [Sat, 4 Jan 2020 00:07:25 +0000 (19:07 -0500)]
lib: dont decode more nexthops than we can handle

If someone provides us more nexthops than our configured multipath
setting, drop the rest of them

Signed-off-by: Quentin Young <qlyoung@cumulusnetworks.com>
5 years agoMerge pull request #5607 from ton31337/fix/deprecate_bgpTimerUp
Quentin Young [Mon, 6 Jan 2020 17:28:52 +0000 (12:28 -0500)]
Merge pull request #5607 from ton31337/fix/deprecate_bgpTimerUp

bgpd: Time to deprecate bgpTimerUp

5 years agoMerge pull request #5606 from ton31337/fix/docker_centos8_image_name
Jafar Al-Gharaibeh [Mon, 6 Jan 2020 17:24:15 +0000 (11:24 -0600)]
Merge pull request #5606 from ton31337/fix/docker_centos8_image_name

docker: Use proper container name when creating CentOS 8 container

5 years agoMerge pull request #5632 from ton31337/fix/dont_use_pipes
Jafar Al-Gharaibeh [Mon, 6 Jan 2020 17:19:42 +0000 (11:19 -0600)]
Merge pull request #5632 from ton31337/fix/dont_use_pipes

packaging: Redirect stderr to /dev/null in %post action (frr.spec.in)

5 years agozebra: free ptm message on error
Quentin Young [Mon, 6 Jan 2020 17:09:23 +0000 (12:09 -0500)]
zebra: free ptm message on error

Signed-off-by: Quentin Young <qlyoung@cumulusnetworks.com>
5 years agoMerge pull request #5545 from ton31337/feature/show_bgp_json_regexp
Jafar Al-Gharaibeh [Mon, 6 Jan 2020 17:03:55 +0000 (11:03 -0600)]
Merge pull request #5545 from ton31337/feature/show_bgp_json_regexp

bgpd: Print json output for show_ip_bgp_regexp_cmd

5 years agozebra: route changes via notify path trigger nht and mpls
Mark Stapp [Tue, 17 Dec 2019 14:21:21 +0000 (09:21 -0500)]
zebra: route changes via notify path trigger nht and mpls

Changes to a route via the dataplane notify path should
trigger nht and mpls lsp processing.

Signed-off-by: Mark Stapp <mjs@voltanet.io>
5 years agoMerge pull request #5618 from qlyoung/fix-san-flags-additive
Rafael Zalamena [Mon, 6 Jan 2020 14:51:02 +0000 (11:51 -0300)]
Merge pull request #5618 from qlyoung/fix-san-flags-additive

configure.ac: make msan & ubsan flags additive

5 years agoMerge pull request #5619 from qlyoung/fix-zebra-netlink-undefined-bitshift
Mark Stapp [Mon, 6 Jan 2020 13:59:49 +0000 (08:59 -0500)]
Merge pull request #5619 from qlyoung/fix-zebra-netlink-undefined-bitshift

zebra: fix undefined bitshifts in netlink stuff

5 years agoMerge pull request #5630 from slankdev/slankdev-bgpd-fix-large-rd
Donatas Abraitis [Mon, 6 Jan 2020 11:15:07 +0000 (13:15 +0200)]
Merge pull request #5630 from slankdev/slankdev-bgpd-fix-large-rd

bgpd: fix large route-distinguisher's format

5 years agobgpd: fix large route-distinguisher's format
Hiroki Shirokura [Sun, 5 Jan 2020 13:56:14 +0000 (22:56 +0900)]
bgpd: fix large route-distinguisher's format

This commit is about #5629 's issue.
Before this commit, bgpd creates format string of
bgp-route-distinguisher as int32, but correctly format
is uint32. current bgpd's sh-run-cli generate int32 rd,
so if user sets the rd as 1:4294967295(0x1:0xffffffff),
sh-run cli generates 1: -1 as running-config. This
commit fix that issue.

Signed-off-by: Hiroki Shirokura <slank.dev@gmail.com>