frr (8.1-1) [PTS] [DDPO]
OLD: VCS is behind the version in the archive: 7.3.1-1 < 8.1-1.Hint: This git repository uses http. You might need to run git update-server-info to update the auxiliary info files.
- Git: https://github.com/FRRouting/frr.git -b debian/master
- Branch: debian/master
- Path: debian/changelog
- Browser: https://github.com/FRRouting/frr/tree/debian/master
- Last scan: 2022-08-13 07:25:22+00
- Next scan: 2022-08-14 08:34:00+00
- Debian changelog in Git:
frr (7.3.1-1) unstable; urgency=medium [ David Lamparter ] * allow cross-compile with sbuild --host [ Ondřej Surý ] * Add myself to Uploaders * Add d/gbp.conf * Update changelog for 7.3.1-1~1.gbp2292a4 release * Change the source format from git to quilt to use git-buildpackage * Don't install frr-doc texinfo images, they are gone (Closes: #955067) * Bump the dh_compat to 10 -- Ondřej Surý <ondrej@debian.org> Mon, 01 Jun 2020 08:41:03 +0200
- This branch is 623 commits ahead of tag frr-7.2.1
- Git log:
commit dd9387fc72b43a7c03af74a45808a1052f83dd3b Merge: 19d883663 b4cdd635b Author: David Lamparter <equinox@opensourcerouting.org> Date: Wed Jul 15 20:30:30 2020 +0200 Merge pull request #6673 from oerdnj/debian/master commit b4cdd635b54d7230cad47df7a70ed8035f795f42 Author: Ondřej Surý <ondrej@sury.org> Date: Fri Jul 3 12:46:45 2020 +0200 Make lsb-base a hard dependency Directly depend on lsb-base in Debian, so we the shims are only used on systems without LSB. Signed-off-by: Ondřej Surý <ondrej@sury.org> commit 2010cec08ed2e64f0b841537d70d3df3c7d2149a Author: Ondřej Surý <ondrej@sury.org> Date: Fri Jul 3 12:46:51 2020 +0200 Remove mention of pkg.frr.snmp build profile from debian/README.Debian The pkg.frr.snmp build profile is no longer present in the Debian build scripts, so this just cleans up the old documentation that mentions it. Signed-off-by: Ondřej Surý <ondrej@sury.org> commit 1ab0d9785a7e71cf56c89feef0d2cd1e38662c58 Author: Ondřej Surý <ondrej@sury.org> Date: Fri Jul 3 12:46:49 2020 +0200 Add missing lsof dependency The logrotate script for frr uses lsof, but the package didn't depend on the it. Signed-off-by: Ondřej Surý <ondrej@sury.org> commit 4b82120ace75f283dbd93762bb7413c1e5e1e1c3 Author: Ondřej Surý <ondrej@sury.org> Date: Fri Jul 3 12:46:48 2020 +0200 Remove unused debian/watchfrr.rc file The debian/watchfrr.rc file was not install, so we just remove the cruft. Signed-off-by: Ondřej Surý <ondrej@sury.org> commit 071a3c3fc5e8cc2aadd9c3a989a154f3540b3fbf Author: Ondřej Surý <ondrej@sury.org> Date: Fri Jul 3 12:46:46 2020 +0200 Use dh_installinit capabilities to install frr.tmpfile The debian/frr.conf was manually installed as systemd-tmpfiles configuration, but the dh_installinit now has capability to install it automatically if named debian/frr.tmpfile. Signed-off-by: Ondřej Surý <ondrej@sury.org> commit 19d88366346ccbfa1c6539e5056cca129782da70 Merge: d1312e009 649529592 Author: David Lamparter <equinox@opensourcerouting.org> Date: Mon Jun 1 14:09:44 2020 +0200 Merge pull request #6492 from oerdnj/debian/master commit 649529592533affa1c5d4f4b155d1396a52e9da9 Author: Ondřej Surý <Ondřej Surý ondrej@debian.org> Date: Mon Jun 1 08:41:07 2020 +0200 Update changelog for 7.3.1-1 release commit 5cb2b3c6f2fdadf8956349497b0544c3c5703544 Author: Ondřej Surý <Ondřej Surý ondrej@debian.org> Date: Mon Jun 1 08:41:00 2020 +0200 Bump the dh_compat to 10 commit cfde41c5da2b9b9402e7467e91f091d7ef0c0506 Author: Ondřej Surý <Ondřej Surý ondrej@debian.org> Date: Sun May 31 18:27:13 2020 +0200 Don't install frr-doc texinfo images, they are gone (Closes: #955067) commit c7707ca4298b4d50a7c8f2112ca37b9a8d67102f Author: Ondřej Surý <Ondřej Surý ondrej@debian.org> Date: Sun May 31 18:02:49 2020 +0200 Change the source format from git to quilt to use git-buildpackage commit b1d8018cd89e3bc9bfbf44a8f93a4108e16cdb17 Author: Ondřej Surý <Ondřej Surý ondrej@debian.org> Date: Sun May 31 17:46:50 2020 +0200 Update changelog for 7.3.1-1~1.gbp2292a4 release commit 2292a486bca61a8a444bdb3643a62e9d2852162b Author: Ondřej Surý <Ondřej Surý ondrej@debian.org> Date: Sun May 31 17:46:35 2020 +0200 Add d/gbp.conf commit cd900a5ebd47cfaca60bbeadab3102a3f0e5b99b Author: Ondřej Surý <Ondřej Surý ondrej@debian.org> Date: Sun May 31 17:44:28 2020 +0200 Add myself to Uploaders commit ae6480dbea5b025318329ee5ad00ec680a56cc03 Merge: d1312e009 a87315ebd Author: Ondřej Surý <Ondřej Surý ondrej@debian.org> Date: Sun May 31 17:42:18 2020 +0200 Merge tag 'frr-7.3.1' into debian/master FRRouting Release 7.3.1 commit a87315ebda4d4efc369cda93464b110138a6145b Author: David Lamparter <equinox@diac24.net> Date: Wed May 6 13:44:20 2020 +0200 FRRouting release 7.3.1 Maintenance/bugfix release. Signed-off-by: David Lamparter <equinox@opensourcerouting.org> commit d7ed2f10e4ab70f5e534972e088c76bebb571c03 Merge: e87417f78 5beee2a1c Author: David Lamparter <equinox@opensourcerouting.org> Date: Wed May 6 13:36:52 2020 +0200 Merge pull request #6353 from ton31337/fix/communities_bgpd_crash_7.3 commit 5beee2a1ce35f823942f4bf5e41e82be910e4fc2 Author: Josh Cox <josh.cox@pureport.com> Date: Tue May 5 13:09:14 2020 -0400 bgpd: Check to ensure community attributes exist before freeing them Community attributes might have been removed by an inbound route map, so we should check to ensure they still exist before trying to free them. This fixes a segfault described in issue #6345. Signed-off-by: Josh Cox <josh.cox@pureport.com> commit e87417f782d562060cd7ea41a32c30d56b17c5ac Merge: a83267463 0a33678aa Author: Quentin Young <qlyoung@users.noreply.github.com> Date: Tue May 5 00:42:48 2020 -0400 Merge pull request #6338 from ton31337/fix/FALSE_TRUE_7.3 bgpd: [7.3] bools use `true/false` not `TRUE/FALSE` commit 0a33678aa266a83627b9bfb421b68320f0e2f8de Author: Donald Sharp <sharpd@cumulusnetworks.com> Date: Mon Apr 13 08:08:48 2020 -0400 bgpd: bools use `true/false` not `TRUE/FALSE` Who knows where these values were coming from. Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com> commit a832674633449f8280765459cc2b46fee9b29b87 Merge: bbe70a299 582ba9e54 Author: Mark Stapp <mjs@voltanet.io> Date: Mon May 4 12:36:34 2020 -0400 Merge pull request #6336 from sworleys/No-NHG-Install-With-VRFns_7.3 [7.3] zebra: force off kernel NHG install with netns VRFs commit 582ba9e54728effccc5ce8b85ce5327915e83f91 Author: Stephen Worley <sworley@cumulusnetworks.com> Date: Fri May 1 12:34:43 2020 -0400 zebra: force off kernel NHG install with netns VRFs Force off kernel NHG install with netns-based VRFs for now. There is not really a good solution for allowing kernel nexthop groups in namespaced based vrfs. Signed-off-by: Stephen Worley <sworley@cumulusnetworks.com> (cherry picked from commit d982012a0e7e77814b25381f634b64034d80c1ad) commit bbe70a2995d21194d00b592bf7459918768f662a Merge: 682ab5128 f822435cf Author: Renato Westphal <renato@opensourcerouting.org> Date: Wed Apr 29 22:46:44 2020 -0300 Merge pull request #6315 from ton31337/fix/access-list_deletion_7.3 lib: [7.3] Delete the entire access-list only if there are no more entries commit f822435cf52d6548e1c4b1adad37de4d9d024061 Author: Donatas Abraitis <donatas.abraitis@gmail.com> Date: Mon Apr 27 12:13:48 2020 +0300 lib: Delete the entire access-list only if there are no more entries When you enter the access-list with the same sequence number but with a different prefix AND access-list has only a single entry, then the entry is deleted and the whole access-list is deleted. That means that "replace entry" never be re-inserted. With fix: ``` ~# vtysh -c 'c' -c 'access-list 1 seq 10 permit 127.0.0.10/32' ~# vtysh -c 'sh run' | grep access-list access-list 1 seq 10 permit 127.0.0.10/32 ~# vtysh -c 'c' -c 'access-list 1 seq 10 permit 127.0.0.20/32' ~# vtysh -c 'sh run' | grep access-list access-list 1 seq 10 permit 127.0.0.20/32 ~# vtysh -c 'c' -c 'access-list 1 seq 11 permit 127.0.0.11/32' ~# vtysh -c 'sh run' | grep access-list access-list 1 seq 10 permit 127.0.0.20/32 access-list 1 seq 11 permit 127.0.0.11/32 ~# vtysh -c 'c' -c 'no access-list 1 seq 10 permit 127.0.0.20/32' ~# vtysh -c 'sh run' | grep access-list access-list 1 seq 11 permit 127.0.0.11/32 ~# ``` Signed-off-by: Donatas Abraitis <donatas.abraitis@gmail.com> commit f99bb6a0fe6a715920de208ff213aaeac88b23a7 Author: Donatas Abraitis <donatas.abraitis@gmail.com> Date: Mon Apr 27 12:13:04 2020 +0300 lib: Convert access_list_empty to bool Signed-off-by: Donatas Abraitis <donatas.abraitis@gmail.com> commit 682ab5128bebbea4a4f684359d4c44a545809d87 Merge: af15a1b1d d055ec247 Author: Sri Mohana Singamsetty <srimohans@gmail.com> Date: Tue Apr 28 15:40:57 2020 -0700 Merge pull request #6312 from donaldsharp/revert_73 [7.3]Revert "vtysh: fix searching commands in parent nodes" commit d055ec247f9e3f21bf6ca0fd2c26116d65d8e0ec Author: Donald Sharp <sharpd@cumulusnetworks.com> Date: Tue Apr 28 10:46:22 2020 -0400 Revert "vtysh: fix searching commands in parent nodes" This reverts commit d741915ecdcf8930ccb3bd23eec1da2f0d000483. This is because it breaks this behavior: router ospf6 <commands> ! int enp39s0 <more commands> ! This is a very legal set of commands and completely destroys the ability to do this. Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com> commit af15a1b1d7f171eb8c9f4c01538bc95f5962382f Merge: ef3b3f4b7 f7ecebc7b Author: Donald Sharp <sharpd@cumulusnetworks.com> Date: Fri Apr 24 08:07:08 2020 -0400 Merge pull request #6288 from ton31337/fix/allow_nhlen_32_with_empty_global_7.3 bgpd: [7.3] Do not discard an UPDATE if the global nexthop is set to :: commit ef3b3f4b7f1274fdede97ef894163bc875d368e5 Merge: 3aaf88d4a fef6ccc2a Author: Donald Sharp <sharpd@cumulusnetworks.com> Date: Fri Apr 24 08:06:54 2020 -0400 Merge pull request #6287 from ton31337/fix/show_bgp_hostname_7.3 bgpd: [7.3] Show hostname in `show [ip] bgp ...` only if nexthop is connected commit fef6ccc2a338c9b3eae16f932983c262fc664058 Author: Donatas Abraitis <donatas.abraitis@gmail.com> Date: Thu Apr 16 10:37:21 2020 +0300 tests: Check if the right next-hop is shown (bgp_show_ip_bgp_fqdn) Signed-off-by: Donatas Abraitis <donatas.abraitis@gmail.com> commit 3aaf88d4a5c21a7cf77db77867849e428e22133e Merge: a24eeb6de fc1f47237 Author: Donald Sharp <sharpd@cumulusnetworks.com> Date: Thu Apr 23 15:31:16 2020 -0400 Merge pull request #6283 from opensourcerouting/7.3/gcc-10 [7.3] backport gcc 10 fixes commit f7ecebc7bd14b4a7f80551198c2852dec4514a66 Author: Donatas Abraitis <donatas.abraitis@gmail.com> Date: Mon Apr 20 18:46:23 2020 +0300 bgpd: Do not discard an UPDATE if the global nexthop is set to :: When we receive an UPDATE with MP_NEXTHOP len as 32 bytes, we shouldn't check if the global (1st) nexthop is unspecified. Peering between bird and FRRouting we receive from Bird something like: ``` rcvd UPDATE w/ attr: , origin i, mp_nexthop ::(fe80::a00:27ff:fe09:f8a3) ``` The link-local (2nd) nexthop is valid and validated later in the code. Before it was marked: ``` IPv6 unicast -- DENIED due to: martian or self next-hop; ``` After it's a valid prefix: ``` spine1-debian-9# show bgp BGP table version is 0, local router ID is 2.2.2.2, vrf id 0 Default local pref 100, local AS 65002 Status codes: s suppressed, d damped, h history, * valid, > best, = multipath, i internal, r RIB-failure, S Stale, R Removed Nexthop codes: @NNN nexthop's vrf id, < announce-nh-self Origin codes: i - IGP, e - EGP, ? - incomplete Network Next Hop Metric LocPrf Weight Path 2a02:4780::/64 fe80::a00:27ff:fe09:f8a3 0 65001 i Displayed 1 routes and 1 total paths ``` Signed-off-by: Donatas Abraitis <donatas.abraitis@gmail.com> commit 73c0a1bb3a8e1a6d3ce9a9319547e55675cf1813 Author: Donatas Abraitis <donatas.abraitis@gmail.com> Date: Thu Apr 16 16:13:01 2020 +0300 bgpd: Add a sanitify check for bgp_nexthop_cache against NULL In real world sometimes happens that bgp_nexthop_cache is NULL. Avoid segfaulting when using `show [ip] bgp ...` CLI commands. Signed-off-by: Donatas Abraitis <donatas.abraitis@gmail.com> commit ba6f8d814d7530ef6ab112c51d33b601225898fa Author: Donatas Abraitis <donatas.abraitis@gmail.com> Date: Thu Apr 16 10:36:59 2020 +0300 bgpd: Show hostname in `show [ip] bgp ...` only if nexthop is connected The problem is when using kinda such topologies: (192.168.1.1/32) r1 <-- eBGP --> r2 <-- iBGP --> r3 Looking at r3's nexthop for 192.168.1.1/32 we have it as r2, but really it MUST be r1. Checking if the nexthop is connected solves the problem even for cases when route-reflectors are used. Signed-off-by: Donatas Abraitis <donatas.abraitis@gmail.com> commit fc1f472373939a0ababa936a2ae250f20b2caf39 Author: Ruben Kerkhof <ruben@rubenkerkhof.com> Date: Sat Mar 7 23:38:14 2020 +0100 vrrpd: fix build on Fedora Rawhide Fixes the following linker errors: make[1]: Entering directory '/home/ruben/src/frr' CCLD vrrpd/vrrpd /usr/bin/ld: vrrpd/libvrrp.a(vrrp.o):/home/ruben/src/frr/vrrpd/vrrp_debug.h:33: multiple definition of `vrrp_dbg_sock'; vrrpd/vrrp_main.o:/home/ruben/src/frr/vrrpd/vrrp_debug.h:33: first defined here /usr/bin/ld: vrrpd/libvrrp.a(vrrp.o):/home/ruben/src/frr/vrrpd/vrrp_debug.h:31: multiple definition of `vrrp_dbg_pkt'; vrrpd/vrrp_main.o:/home/ruben/src/frr/vrrpd/vrrp_debug.h:31: first defined here /usr/bin/ld: vrrpd/libvrrp.a(vrrp.o):/home/ruben/src/frr/vrrpd/vrrp_debug.h:32: multiple definition of `vrrp_dbg_proto'; vrrpd/vrrp_main.o:/home/ruben/src/frr/vrrpd/vrrp_debug.h:32: first defined here /usr/bin/ld: vrrpd/libvrrp.a(vrrp.o):/home/ruben/src/frr/vrrpd/vrrp_debug.h:34: multiple definition of `vrrp_dbg_zebra'; vrrpd/vrrp_main.o:/home/ruben/src/frr/vrrpd/vrrp_debug.h:34: first defined here /usr/bin/ld: vrrpd/libvrrp.a(vrrp.o):/home/ruben/src/frr/vrrpd/vrrp_debug.h:29: multiple definition of `vrrp_dbg_auto'; vrrpd/vrrp_main.o:/home/ruben/src/frr/vrrpd/vrrp_debug.h:29: first defined here /usr/bin/ld: vrrpd/libvrrp.a(vrrp.o):/home/ruben/src/frr/vrrpd/vrrp_debug.h:30: multiple definition of `vrrp_dbg_ndisc'; vrrpd/vrrp_main.o:/home/ruben/src/frr/vrrpd/vrrp_debug.h:30: first defined here /usr/bin/ld: vrrpd/libvrrp.a(vrrp.o):/home/ruben/src/frr/vrrpd/vrrp_debug.h:28: multiple definition of `vrrp_dbg_arp'; vrrpd/vrrp_main.o:/home/ruben/src/frr/vrrpd/vrrp_debug.h:28: first defined here /usr/bin/ld: vrrpd/libvrrp.a(vrrp_arp.o):/home/ruben/src/frr/vrrpd/vrrp_debug.h:28: multiple definition of `vrrp_dbg_arp'; vrrpd/vrrp_main.o:/home/ruben/src/frr/vrrpd/vrrp_debug.h:28: first defined here /usr/bin/ld: vrrpd/libvrrp.a(vrrp_arp.o):/home/ruben/src/frr/vrrpd/vrrp_debug.h:33: multiple definition of `vrrp_dbg_sock'; vrrpd/vrrp_main.o:/home/ruben/src/frr/vrrpd/vrrp_debug.h:33: first defined here /usr/bin/ld: vrrpd/libvrrp.a(vrrp_arp.o):/home/ruben/src/frr/vrrpd/vrrp_debug.h:34: multiple definition of `vrrp_dbg_zebra'; vrrpd/vrrp_main.o:/home/ruben/src/frr/vrrpd/vrrp_debug.h:34: first defined here /usr/bin/ld: vrrpd/libvrrp.a(vrrp_arp.o):/home/ruben/src/frr/vrrpd/vrrp_debug.h:32: multiple definition of `vrrp_dbg_proto'; vrrpd/vrrp_main.o:/home/ruben/src/frr/vrrpd/vrrp_debug.h:32: first defined here /usr/bin/ld: vrrpd/libvrrp.a(vrrp_arp.o):/home/ruben/src/frr/vrrpd/vrrp_debug.h:31: multiple definition of `vrrp_dbg_pkt'; vrrpd/vrrp_main.o:/home/ruben/src/frr/vrrpd/vrrp_debug.h:31: first defined here /usr/bin/ld: vrrpd/libvrrp.a(vrrp_arp.o):/home/ruben/src/frr/vrrpd/vrrp_debug.h:30: multiple definition of `vrrp_dbg_ndisc'; vrrpd/vrrp_main.o:/home/ruben/src/frr/vrrpd/vrrp_debug.h:30: first defined here /usr/bin/ld: vrrpd/libvrrp.a(vrrp_arp.o):/home/ruben/src/frr/vrrpd/vrrp_debug.h:29: multiple definition of `vrrp_dbg_auto'; vrrpd/vrrp_main.o:/home/ruben/src/frr/vrrpd/vrrp_debug.h:29: first defined here /usr/bin/ld: vrrpd/libvrrp.a(vrrp_debug.o):/home/ruben/src/frr/vrrpd/vrrp_debug.h:32: multiple definition of `vrrp_dbg_proto'; vrrpd/vrrp_main.o:/home/ruben/src/frr/vrrpd/vrrp_debug.h:32: first defined here /usr/bin/ld: vrrpd/libvrrp.a(vrrp_debug.o):/home/ruben/src/frr/vrrpd/vrrp_debug.h:29: multiple definition of `vrrp_dbg_auto'; vrrpd/vrrp_main.o:/home/ruben/src/frr/vrrpd/vrrp_debug.h:29: first defined here /usr/bin/ld: vrrpd/libvrrp.a(vrrp_debug.o):/home/ruben/src/frr/vrrpd/vrrp_debug.h:31: multiple definition of `vrrp_dbg_pkt'; vrrpd/vrrp_main.o:/home/ruben/src/frr/vrrpd/vrrp_debug.h:31: first defined here /usr/bin/ld: vrrpd/libvrrp.a(vrrp_debug.o):/home/ruben/src/frr/vrrpd/vrrp_debug.h:33: multiple definition of `vrrp_dbg_sock'; vrrpd/vrrp_main.o:/home/ruben/src/frr/vrrpd/vrrp_debug.h:33: first defined here /usr/bin/ld: vrrpd/libvrrp.a(vrrp_debug.o):/home/ruben/src/frr/vrrpd/vrrp_debug.h:30: multiple definition of `vrrp_dbg_ndisc'; vrrpd/vrrp_main.o:/home/ruben/src/frr/vrrpd/vrrp_debug.h:30: first defined here /usr/bin/ld: vrrpd/libvrrp.a(vrrp_debug.o):/home/ruben/src/frr/vrrpd/vrrp_debug.h:28: multiple definition of `vrrp_dbg_arp'; vrrpd/vrrp_main.o:/home/ruben/src/frr/vrrpd/vrrp_debug.h:28: first defined here /usr/bin/ld: vrrpd/libvrrp.a(vrrp_debug.o):/home/ruben/src/frr/vrrpd/vrrp_debug.h:34: multiple definition of `vrrp_dbg_zebra'; vrrpd/vrrp_main.o:/home/ruben/src/frr/vrrpd/vrrp_debug.h:34: first defined here /usr/bin/ld: vrrpd/libvrrp.a(vrrp_ndisc.o):/home/ruben/src/frr/vrrpd/vrrp_debug.h:30: multiple definition of `vrrp_dbg_ndisc'; vrrpd/vrrp_main.o:/home/ruben/src/frr/vrrpd/vrrp_debug.h:30: first defined here /usr/bin/ld: vrrpd/libvrrp.a(vrrp_ndisc.o):/home/ruben/src/frr/vrrpd/vrrp_debug.h:31: multiple definition of `vrrp_dbg_pkt'; vrrpd/vrrp_main.o:/home/ruben/src/frr/vrrpd/vrrp_debug.h:31: first defined here /usr/bin/ld: vrrpd/libvrrp.a(vrrp_ndisc.o):/home/ruben/src/frr/vrrpd/vrrp_debug.h:33: multiple definition of `vrrp_dbg_sock'; vrrpd/vrrp_main.o:/home/ruben/src/frr/vrrpd/vrrp_debug.h:33: first defined here /usr/bin/ld: vrrpd/libvrrp.a(vrrp_ndisc.o):/home/ruben/src/frr/vrrpd/vrrp_debug.h:34: multiple definition of `vrrp_dbg_zebra'; vrrpd/vrrp_main.o:/home/ruben/src/frr/vrrpd/vrrp_debug.h:34: first defined here /usr/bin/ld: vrrpd/libvrrp.a(vrrp_ndisc.o):/home/ruben/src/frr/vrrpd/vrrp_debug.h:32: multiple definition of `vrrp_dbg_proto'; vrrpd/vrrp_main.o:/home/ruben/src/frr/vrrpd/vrrp_debug.h:32: first defined here /usr/bin/ld: vrrpd/libvrrp.a(vrrp_ndisc.o):/home/ruben/src/frr/vrrpd/vrrp_debug.h:29: multiple definition of `vrrp_dbg_auto'; vrrpd/vrrp_main.o:/home/ruben/src/frr/vrrpd/vrrp_debug.h:29: first defined here /usr/bin/ld: vrrpd/libvrrp.a(vrrp_ndisc.o):/home/ruben/src/frr/vrrpd/vrrp_debug.h:28: multiple definition of `vrrp_dbg_arp'; vrrpd/vrrp_main.o:/home/ruben/src/frr/vrrpd/vrrp_debug.h:28: first defined here /usr/bin/ld: vrrpd/libvrrp.a(vrrp_packet.o):/home/ruben/src/frr/vrrpd/vrrp_debug.h:34: multiple definition of `vrrp_dbg_zebra'; vrrpd/vrrp_main.o:/home/ruben/src/frr/vrrpd/vrrp_debug.h:34: first defined here /usr/bin/ld: vrrpd/libvrrp.a(vrrp_packet.o):/home/ruben/src/frr/vrrpd/vrrp_debug.h:33: multiple definition of `vrrp_dbg_sock'; vrrpd/vrrp_main.o:/home/ruben/src/frr/vrrpd/vrrp_debug.h:33: first defined here /usr/bin/ld: vrrpd/libvrrp.a(vrrp_packet.o):/home/ruben/src/frr/vrrpd/vrrp_debug.h:32: multiple definition of `vrrp_dbg_proto'; vrrpd/vrrp_main.o:/home/ruben/src/frr/vrrpd/vrrp_debug.h:32: first defined here /usr/bin/ld: vrrpd/libvrrp.a(vrrp_packet.o):/home/ruben/src/frr/vrrpd/vrrp_debug.h:31: multiple definition of `vrrp_dbg_pkt'; vrrpd/vrrp_main.o:/home/ruben/src/frr/vrrpd/vrrp_debug.h:31: first defined here /usr/bin/ld: vrrpd/libvrrp.a(vrrp_packet.o):/home/ruben/src/frr/vrrpd/vrrp_debug.h:30: multiple definition of `vrrp_dbg_ndisc'; vrrpd/vrrp_main.o:/home/ruben/src/frr/vrrpd/vrrp_debug.h:30: first defined here /usr/bin/ld: vrrpd/libvrrp.a(vrrp_packet.o):/home/ruben/src/frr/vrrpd/vrrp_debug.h:29: multiple definition of `vrrp_dbg_auto'; vrrpd/vrrp_main.o:/home/ruben/src/frr/vrrpd/vrrp_debug.h:29: first defined here /usr/bin/ld: vrrpd/libvrrp.a(vrrp_packet.o):/home/ruben/src/frr/vrrpd/vrrp_debug.h:28: multiple definition of `vrrp_dbg_arp'; vrrpd/vrrp_main.o:/home/ruben/src/frr/vrrpd/vrrp_debug.h:28: first defined here /usr/bin/ld: vrrpd/libvrrp.a(vrrp_vty.o):/home/ruben/src/frr/vrrpd/vrrp_debug.h:34: multiple definition of `vrrp_dbg_zebra'; vrrpd/vrrp_main.o:/home/ruben/src/frr/vrrpd/vrrp_debug.h:34: first defined here /usr/bin/ld: vrrpd/libvrrp.a(vrrp_vty.o):/home/ruben/src/frr/vrrpd/vrrp_debug.h:33: multiple definition of `vrrp_dbg_sock'; vrrpd/vrrp_main.o:/home/ruben/src/frr/vrrpd/vrrp_debug.h:33: first defined here /usr/bin/ld: vrrpd/libvrrp.a(vrrp_vty.o):/home/ruben/src/frr/vrrpd/vrrp_debug.h:32: multiple definition of `vrrp_dbg_proto'; vrrpd/vrrp_main.o:/home/ruben/src/frr/vrrpd/vrrp_debug.h:32: first defined here /usr/bin/ld: vrrpd/libvrrp.a(vrrp_vty.o):/home/ruben/src/frr/vrrpd/vrrp_debug.h:31: multiple definition of `vrrp_dbg_pkt'; vrrpd/vrrp_main.o:/home/ruben/src/frr/vrrpd/vrrp_debug.h:31: first defined here /usr/bin/ld: vrrpd/libvrrp.a(vrrp_vty.o):/home/ruben/src/frr/vrrpd/vrrp_debug.h:30: multiple definition of `vrrp_dbg_ndisc'; vrrpd/vrrp_main.o:/home/ruben/src/frr/vrrpd/vrrp_debug.h:30: first defined here /usr/bin/ld: vrrpd/libvrrp.a(vrrp_vty.o):/home/ruben/src/frr/vrrpd/vrrp_debug.h:29: multiple definition of `vrrp_dbg_auto'; vrrpd/vrrp_main.o:/home/ruben/src/frr/vrrpd/vrrp_debug.h:29: first defined here /usr/bin/ld: vrrpd/libvrrp.a(vrrp_vty.o):/home/ruben/src/frr/vrrpd/vrrp_debug.h:28: multiple definition of `vrrp_dbg_arp'; vrrpd/vrrp_main.o:/home/ruben/src/frr/vrrpd/vrrp_debug.h:28: first defined here /usr/bin/ld: vrrpd/libvrrp.a(vrrp_zebra.o):/home/ruben/src/frr/vrrpd/vrrp_debug.h:34: multiple definition of `vrrp_dbg_zebra'; vrrpd/vrrp_main.o:/home/ruben/src/frr/vrrpd/vrrp_debug.h:34: first defined here /usr/bin/ld: vrrpd/libvrrp.a(vrrp_zebra.o):/home/ruben/src/frr/vrrpd/vrrp_debug.h:33: multiple definition of `vrrp_dbg_sock'; vrrpd/vrrp_main.o:/home/ruben/src/frr/vrrpd/vrrp_debug.h:33: first defined here /usr/bin/ld: vrrpd/libvrrp.a(vrrp_zebra.o):/home/ruben/src/frr/vrrpd/vrrp_debug.h:32: multiple definition of `vrrp_dbg_proto'; vrrpd/vrrp_main.o:/home/ruben/src/frr/vrrpd/vrrp_debug.h:32: first defined here /usr/bin/ld: vrrpd/libvrrp.a(vrrp_zebra.o):/home/ruben/src/frr/vrrpd/vrrp_debug.h:31: multiple definition of `vrrp_dbg_pkt'; vrrpd/vrrp_main.o:/home/ruben/src/frr/vrrpd/vrrp_debug.h:31: first defined here /usr/bin/ld: vrrpd/libvrrp.a(vrrp_zebra.o):/home/ruben/src/frr/vrrpd/vrrp_debug.h:30: multiple definition of `vrrp_dbg_ndisc'; vrrpd/vrrp_main.o:/home/ruben/src/frr/vrrpd/vrrp_debug.h:30: first defined here /usr/bin/ld: vrrpd/libvrrp.a(vrrp_zebra.o):/home/ruben/src/frr/vrrpd/vrrp_debug.h:29: multiple definition of `vrrp_dbg_auto'; vrrpd/vrrp_main.o:/home/ruben/src/frr/vrrpd/vrrp_debug.h:29: first defined here /usr/bin/ld: vrrpd/libvrrp.a(vrrp_zebra.o):/home/ruben/src/frr/vrrpd/vrrp_debug.h:28: multiple definition of `vrrp_dbg_arp'; vrrpd/vrrp_main.o:/home/ruben/src/frr/vrrpd/vrrp_debug.h:28: first defined here collect2: error: ld returned 1 exit status make[1]: *** [Makefile:6639: vrrpd/vrrpd] Error 1 make[1]: Leaving directory '/home/ruben/src/frr' make: *** [Makefile:4525: all] Error 2 Signed-off-by: Ruben Kerkhof <ruben@rubenkerkhof.com> (cherry picked from commit 744f2650c4e7b6dd5075c31dc8e1638269a6f601) commit e5ac962c4590e6477757eb6b319da8e3ffc80294 Author: Donald Sharp <sharpd@cumulusnetworks.com> Date: Thu Feb 13 08:44:40 2020 -0500 babeld: GCC complaining about no return in non-void function The babel_main_loop function did not have a return for a non-void function. For some reason gcc is starting to complain about this now. Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com> (cherry picked from commit be04d1487f975e4044c2c07089722dab7f5afbff) commit a970b26a97828ab4e668dcb8b91c4396c575f3f2 Author: Ruben Kerkhof <ruben@rubenkerkhof.com> Date: Sat Mar 7 23:51:34 2020 +0100 babeld: fix build on Fedora Rawhide Fixes the following linker errors: /usr/bin/ld: babeld/libbabel.a(babel_interface.o):/home/ruben/src/frr/babeld/util.h:125: multiple definition of `v4prefix'; babeld/babel_main.o:/home/ruben/src/frr/babeld/util.h:125: first defined here /usr/bin/ld: babeld/libbabel.a(babel_zebra.o):/home/ruben/src/frr/babeld/util.h:125: multiple definition of `v4prefix'; babeld/babel_main.o:/home/ruben/src/frr/babeld/util.h:125: first defined here /usr/bin/ld: babeld/libbabel.a(babeld.o):/home/ruben/src/frr/babeld/util.h:125: multiple definition of `v4prefix'; babeld/babel_main.o:/home/ruben/src/frr/babeld/util.h:125: first defined here /usr/bin/ld: babeld/libbabel.a(kernel.o):/home/ruben/src/frr/babeld/util.h:125: multiple definition of `v4prefix'; babeld/babel_main.o:/home/ruben/src/frr/babeld/util.h:125: first defined here /usr/bin/ld: babeld/libbabel.a(message.o):/home/ruben/src/frr/babeld/util.h:125: multiple definition of `v4prefix'; babeld/babel_main.o:/home/ruben/src/frr/babeld/util.h:125: first defined here /usr/bin/ld: babeld/libbabel.a(neighbour.o):/home/ruben/src/frr/babeld/util.h:125: multiple definition of `v4prefix'; babeld/babel_main.o:/home/ruben/src/frr/babeld/util.h:125: first defined here /usr/bin/ld: babeld/libbabel.a(net.o):/home/ruben/src/frr/babeld/util.h:125: multiple definition of `v4prefix'; babeld/babel_main.o:/home/ruben/src/frr/babeld/util.h:125: first defined here /usr/bin/ld: babeld/libbabel.a(resend.o):/home/ruben/src/frr/babeld/util.h:125: multiple definition of `v4prefix'; babeld/babel_main.o:/home/ruben/src/frr/babeld/util.h:125: first defined here /usr/bin/ld: babeld/libbabel.a(route.o):/home/ruben/src/frr/babeld/util.h:125: multiple definition of `v4prefix'; babeld/babel_main.o:/home/ruben/src/frr/babeld/util.h:125: first defined here /usr/bin/ld: babeld/libbabel.a(source.o):/home/ruben/src/frr/babeld/util.h:125: multiple definition of `v4prefix'; babeld/babel_main.o:/home/ruben/src/frr/babeld/util.h:125: first defined here /usr/bin/ld: babeld/libbabel.a(util.o):/home/ruben/src/frr/babeld/util.h:125: multiple definition of `v4prefix'; babeld/babel_main.o:/home/ruben/src/frr/babeld/util.h:125: first defined here /usr/bin/ld: babeld/libbabel.a(xroute.o):/home/ruben/src/frr/babeld/util.h:125: multiple definition of `v4prefix'; babeld/babel_main.o:/home/ruben/src/frr/babeld/util.h:125: first defined here /usr/bin/ld: babeld/libbabel.a(babel_filter.o):/home/ruben/src/frr/babeld/util.h:125: multiple definition of `v4prefix'; babeld/babel_main.o:/home/ruben/src/frr/babeld/util.h:125: first defined here collect2: error: ld returned 1 exit status make[1]: *** [Makefile:6015: babeld/babeld] Error 1 Signed-off-by: Ruben Kerkhof <ruben@rubenkerkhof.com> (cherry picked from commit b0ba81f81f5fff158e756ef52c91f8c6179872e6) commit 135f4adf8a28c2d6f6b54dadb5f22fc1f746d5bf Author: Ruben Kerkhof <ruben@rubenkerkhof.com> Date: Sat Mar 7 23:19:13 2020 +0100 bgpd: remove unused variable This fixes a linking issue on Fedora Rawhide: /usr/bin/ld: bgpd/libbgp.a(bgp_flowspec.o):/home/ruben/src/frr/./bgpd/bgp_attr_evpn.h:37: multiple definition of `eth_tag_id'; bgpd/bgp_btoa-bgp_btoa.o:/home/ruben/src/frr/./bgpd/bgp_attr_evpn.h:37: first defined here collect2: error: ld returned 1 exit status Signed-off-by: Ruben Kerkhof <ruben@rubenkerkhof.com> (cherry picked from commit 01feb0907f6e7f72fbd973dba1ea69489f11a9c7) commit 7a22c22be90849d322fee82905ad978eff14556a Author: Tomas Korbar <tkorbar@redhat.com> Date: Thu Feb 20 07:37:55 2020 +0100 pimd: Make frr able to be built by gcc 10 - Add extern modifier to some declarations in header file and move qpim_all_pim_routers_addr definition to pimd/pimd.c `GCC now defaults to -fno-common. As a result, global variable accesses are more efficient on various targets. In C, global variables with multiple tentative definitions now result in linker errors.` Taken from https://gcc.gnu.org/gcc-10/changes.html Signed-off-by: Tomas Korbar <tkorbar@redhat.com> (cherry picked from commit 403242d214b6cb919ed08f2149d7bee77a060947) commit 3340b7c6f4910cca7709d4fe741534b1c2ccebca Author: Ruben Kerkhof <ruben@rubenkerkhof.com> Date: Sun Mar 8 20:21:05 2020 +0100 ldpd: remove multiple definitions of thread_master This fixes the last issue compiling FRR with GCC 10 on Fedora Rawhide. Signed-off-by: Ruben Kerkhof <ruben@rubenkerkhof.com> (cherry picked from commit f3faea7fe3bf5f73991effe56290346e3f43728e) commit 414524aa4af5df09604877af93ab22144b78a791 Author: Ruben Kerkhof <ruben@rubenkerkhof.com> Date: Sun Mar 8 20:17:42 2020 +0100 ldpd: fix another linking issue with GCC-10 Signed-off-by: Ruben Kerkhof <ruben@rubenkerkhof.com> (cherry picked from commit 54ca644b6e20416587484011f8e649eeddf2cb15) commit b53995233991dbba38e1c2556eab8c811c07c322 Author: Ruben Kerkhof <ruben@rubenkerkhof.com> Date: Sun Mar 8 17:17:49 2020 +0100 tests: fix build with GCC 10 Signed-off-by: Ruben Kerkhof <ruben@rubenkerkhof.com> (cherry picked from commit 9635de6e9b8cbc35f5ec62d4d1dc8b6c72df8c45) commit 38f896d6198d3240261e2b759e28ffc33f894069 Author: Ruben Kerkhof <ruben@rubenkerkhof.com> Date: Sun Mar 8 15:34:40 2020 +0100 ldpd: Fix linking error on Fedora Rawhide with GCC 10 GCC 10 switched to -fno-common by default, see https://gcc.gnu.org/gcc-10/porting_to.html#common for details. Fixes: CCLD ldpd/ldpd /usr/bin/ld: ldpd/libldp.a(adjacency.o):/home/ruben/src/frr/ldpd/ldpe.h:294: multiple definition of `pkt_ptr'; ldpd/ldpd.o:/home/ruben/src/frr/ldpd/ldpe.h:294: first defined here Signed-off-by: Ruben Kerkhof <ruben@rubenkerkhof.com> (cherry picked from commit 56b7d7252f13f3c90c824287b2441f13e2b0defe) commit a24eeb6de761c9c2a059d53b40a33cc3a52f73ae Merge: 7babfd4a4 f74dd8652 Author: Donald Sharp <sharpd@cumulusnetworks.com> Date: Tue Apr 21 09:09:40 2020 -0400 Merge pull request #6148 from opensourcerouting/ldpd-broken-lsps-7.3 [7.3] ldpd: don't drop packets coming through a broken LSP commit 7babfd4a4eb8615ee77f72b9a37bbd8f374a1549 Merge: ab5ad3fdf 27eb7c35c Author: Russ White <russ@riw.us> Date: Tue Apr 14 11:29:47 2020 -0400 Merge pull request #6223 from dslicenc/ospf6d-brouter-loop-73 [7.3]ospf6d: stop looping thru same Inter-Area Router LSAs commit 27eb7c35c41b3dde3eba03d1f5bf92b006ba7060 Author: Don Slice <dslice@cumulusnetworks.com> Date: Thu Apr 2 20:17:33 2020 +0000 ospf6d: stop looping thru same Inter-Area Router LSAs Processing loop uncovered when there are multiple ABRs also acting as ASBRs into the same area in ospf6. The problem was that when looking thru the list of Inter-area router entries, if the current entry being processed matched, it still merged next-hops and re-initiated the process. In this fix, if the route/path matches and the next-hops also match, there is no need to re-initiate the examine process. Ticket: CM-28900 Signed-off-by: Don Slice <dslice@cumulusnetworks.com> commit f74dd865222febed5028d94eee173c341ed1879c Author: Renato Westphal <renato@opensourcerouting.org> Date: Fri Apr 3 14:42:25 2020 -0300 ldpd: don't drop packets coming through a broken LSP When the Independent Control mode is in use (the default one), each LDP speaker allocates labels independently, which can lead to broken LSPs when the LDP and IGP domains are not congruent. What we were doing in this case was to drop all packets coming through a broken LSP, which causes drastic side effects in the network like loss of IP connectivity between routers. We can however do a best-effort attempt to avoid packet loss by popping the top-level label of the incoming packets and forwarding them normally to their nexthops. This will be enough to guarantee that labeled IP packets will reach their final destination. The broken LSPs will still be unsuitable to tunnel labeled traffic, like VPN packets, but in this case there's nothing we can do about it. Cisco's IOS does something similar, called the "Untagged/No Label" operation, which removes the entire label stack and forward the packet unlabeled. We don't have such functionality available in the Linux kernel, but this shouldn't make any difference for practical purposes. Fixes #6127. Signed-off-by: Renato Westphal <renato@opensourcerouting.org> commit d1312e009b62331d39d0b9e77997b2f42be66f46 Author: David Lamparter <equinox@diac24.net> Date: Mon Apr 6 19:28:56 2020 +0200 debian: make cross-compile work This allows e.g. "sbuild --host=arm64" to build packages for other architectures on, say, fat amd64 servers. As a side effect, the Debian build uses a separate builddir, which helps noting issues on that front. Signed-off-by: David Lamparter <equinox@diac24.net> commit ab5ad3fdfe279845fbb87888b5bc558d49d6d466 Merge: 61cc86b1b 04152b957 Author: David Lamparter <equinox@opensourcerouting.org> Date: Mon Apr 6 18:04:16 2020 +0200 Merge pull request #6151 from sworleys/NHG-Backports_7.3 [7.3] NHG Backports commit 04152b957b855fbcb47dc905caf8dfc71b8aa718 Author: Stephen Worley <sworley@cumulusnetworks.com> Date: Tue Jan 21 15:03:52 2020 -0500 zebra: add null check before connecting recursive depend Add a null check in `handle_recursive_depend()` so it doesn't try to add a NULL pointer to the RB tree. This was found with clang SA. Signed-off-by: Stephen Worley <sworley@cumulusnetworks.com> (cherry picked from commit a7e1b02d4a6794a5caa475ab6e4bfc30fdc6b31b) commit 6982ed8fd53ae96f0f25001a07fb272a9c02c63c Author: Stephen Worley <sworley@cumulusnetworks.com> Date: Mon Jan 6 13:33:45 2020 -0500 zebra: reset nexthop pointer in zread of nexthops We were not resetting the nexthop pointer to NULL for each new read of a nexthop from the zapi route. On the chance we get a nexthop that does not have a proper type, we will not create a new nexthop and update that pointer, thus it still has the last valid one and will create a group with two pointers to the same nexthop. Then when it enters any code that iterates the group, it loops endlessly. This was found with zapi fuzzing. ``` 0x00007f728891f1c3 in jhash2 (k=<optimized out>, length=<optimized out>, initval=12183506) at lib/jhash.c:138 0x00007f728896d92c in nexthop_hash (nexthop=<optimized out>) at lib/nexthop.c:563 0x00007f7288979ece in nexthop_group_hash (nhg=<optimized out>) at lib/nexthop_group.c:394 0x0000000000621036 in zebra_nhg_hash_key (arg=<optimized out>) at zebra/zebra_nhg.c:356 0x00007f72888ec0e1 in hash_get (hash=<optimized out>, data=0x7ffffb94aef0, alloc_func=0x0) at lib/hash.c:138 0x00007f72888ee118 in hash_lookup (hash=0x7f7288de2f10, data=0x7f728908e7fc) at lib/hash.c:183 0x0000000000626613 in zebra_nhg_find (nhe=0x7ffffb94b080, id=0, nhg=0x6020000032d0, nhg_depends=0x0, vrf_id=<optimized out>, afi=<optimized out>, type=<optimized out>) at zebra/zebra_nhg.c:541 0x0000000000625f39 in zebra_nhg_rib_find (id=0, nhg=<optimized out>, rt_afi=AFI_IP) at zebra/zebra_nhg.c:1126 0x000000000065f953 in rib_add_multipath (afi=AFI_IP, safi=<optimized out>, p=0x7ffffb94b370, src_p=0x0, re=0x6070000013d0, ng=0x7f728908e7fc) at zebra/zebra_rib.c:2616 0x0000000000768f90 in zread_route_add (client=0x61f000000080, hdr=<optimized out>, msg=<optimized out>, zvrf=<optimized out>) at zebra/zapi_msg.c:1596 0x000000000077c135 in zserv_handle_commands (client=<optimized out>, msg=0x61b000000780) at zebra/zapi_msg.c:2636 0x0000000000575e1f in main (argc=<optimized out>, argv=<optimized out>) at zebra/main.c:309 ``` ``` (gdb) p *nhg->nexthop $4 = {next = 0x5488e0, prev = 0x5488e0, vrf_id = 16843009, ifindex = 16843009, type = NEXTHOP_TYPE_IFINDEX, flags = 8 '\b', {gate = {ipv4 = {s_addr = 0}, ipv6 = {__in6_u = {__u6_addr8 = '\000' <repeats 15 times>, __u6_addr16 = {0, 0, 0, 0, 0, 0, 0, 0}, __u6_addr32 = {0, 0, 0, 0}}}}, bh_type = BLACKHOLE_UNSPEC}, src = {ipv4 = {s_addr = 0}, ipv6 = {__in6_u = {__u6_addr8 = '\000' <repeats 15 times>, __u6_addr16 = {0, 0, 0, 0, 0, 0, 0, 0}, __u6_addr32 = {0, 0, 0, 0}}}}, rmap_src = {ipv4 = {s_addr = 0}, ipv6 = {__in6_u = {__u6_addr8 = '\000' <repeats 15 times>, __u6_addr16 = {0, 0, 0, 0, 0, 0, 0, 0}, __u6_addr32 = {0, 0, 0, 0}}}}, resolved = 0x0, rparent = 0x0, nh_label_type = ZEBRA_LSP_NONE, nh_label = 0x0, weight = 1 '\001'} (gdb) quit ``` Signed-off-by: Stephen Worley <sworley@cumulusnetworks.com> (cherry picked from commit c8b891b48392e0d29eb7b56942e4df697d4c14fd) commit 0764f43afef37c6a228038de9a7550f53b0bc27d Author: Stephen Worley <sworley@cumulusnetworks.com> Date: Mon Jan 6 12:58:41 2020 -0500 zebra: don't created connected if duplicate depend Since we are using a UNIQUE RB tree, we need to handle the case of adding in a duplicate entry into it. The list API code returns NULL when a successfull add occurs, so lets pull that handling further up into the connected handlers. Then, free the allocated connected struct if it is a duplicate. This is a pretty unlikely situation to happen. Also, pull up the RB handling of _del RB API as well. This was found with the zapi fuzzing code. ``` ==1052840== ==1052840== 200 bytes in 5 blocks are definitely lost in loss record 545 of 663 ==1052840== at 0x483BB1A: calloc (vg_replace_malloc.c:762) ==1052840== by 0x48E1008: qcalloc (memory.c:110) ==1052840== by 0x44D357: nhg_connected_new (zebra_nhg.c:73) ==1052840== by 0x44D300: nhg_connected_tree_add_nhe (zebra_nhg.c:123) ==1052840== by 0x44FBDC: depends_add (zebra_nhg.c:1077) ==1052840== by 0x44FD62: depends_find_add (zebra_nhg.c:1090) ==1052840== by 0x44E46D: zebra_nhg_find (zebra_nhg.c:567) ==1052840== by 0x44E1FE: zebra_nhg_rib_find (zebra_nhg.c:1126) ==1052840== by 0x45AD3D: rib_add_multipath (zebra_rib.c:2616) ==1052840== by 0x4977DC: zread_route_add (zapi_msg.c:1596) ==1052840== by 0x49ABB9: zserv_handle_commands (zapi_msg.c:2636) ==1052840== by 0x428B11: main (main.c:309) ``` Signed-off-by: Stephen Worley <sworley@cumulusnetworks.com> (cherry picked from commit 5bf15faa19288144c214ca48ef26e01512037ef6) commit b4deb56ddd15681b7bf1cd859d5f6ad817ad4899 Author: Stephen Worley <sworley@cumulusnetworks.com> Date: Thu Mar 26 10:57:45 2020 -0400 zebra: break if duplicate nexthop found in nhe2grp If we find that a nexthop is a duplicate, break immediately rather than continuing to look through the rest of the list. Signed-off-by: Stephen Worley <sworley@cumulusnetworks.com> (cherry picked from commit d43122b58f4bf9cb729c786b990ae254b8dde35b) commit 032dc63ecfaf50c48dbb4c09107c8e2cdd595175 Author: Stephen Worley <sworley@cumulusnetworks.com> Date: Thu Jan 30 16:43:09 2020 -0500 zebra: properly set the NEXTHOP_GROUP_VALID flag Properly set the NEXTHOP_GROUP_VALID flag and use it as a conditional for installation decisions for individual nexthop and groups containing it. We set the NEXTHOP_GROUP_VALID flag it is: 1) A fully resolved active nexthop or 2) Its a group that contains at least one VALID NHE Signed-off-by: Stephen Worley <sworley@cumulusnetworks.com> (cherry picked from commit 086e4e02f5fe02849ad9a6c17472094c1c1cbd98) commit 69eb76daaf7be2174d4f455ba0798cb1b07a0847 Author: Stephen Worley <sworley@cumulusnetworks.com> Date: Thu Jan 30 12:34:35 2020 -0500 zebra: set valid on re->nhe directly in nexthop_active_update() We were still doing a lookup on the nhe_id from before we started referencing re->nhe directly. Change set flag to just use re->nhe directly here since they should always be the same at this point in the code anyway. Signed-off-by: Stephen Worley <sworley@cumulusnetworks.com> (cherry picked from commit 715e5c70d564017a8b709599e23bf94884ab9bb9) commit e976083a73c2fae2b114479102fb1db2a6ceeaaf Author: Stephen Worley <sworley@cumulusnetworks.com> Date: Tue Jan 28 15:20:18 2020 -0500 zebra: add debug for duplicate NH in dataplane array conversion When we find a nexthop ID thats a duplicate in the code that converts NHG rb trees into a flat list of nexthop IDs for the dataplane, output a debug message. Signed-off-by: Stephen Worley <sworley@cumulusnetworks.com> (cherry picked from commit b1c3f7ef80fb626a15a1043b4c46f53c3fd34826) commit ee2833a567fda1ef4b9c6994a0c4fc87aeafe9fb Author: Stephen Worley <sworley@cumulusnetworks.com> Date: Tue Jan 28 14:33:10 2020 -0500 zebra: don't add ID to kernel nh_grp if not installed/queued When we transform the nexthop group rb trees into a flat array of IDs to send into the dataplane code (zebra_nhg_nhe2grp), don't put an ID in there that has not been in installed or is not currently queued to be installed into the dataplane. Otherwise, if some of the nexthops fail to install, we will still try to create a group with them and then the entire group will fail. Signed-off-by: Stephen Worley <sworley@cumulusnetworks.com> (cherry picked from commit 1866b3afc259c565f42a9aab262ede27c142eea4) commit 31be02111fce3d6111965cec72db4d36eafbba06 Author: Stephen Worley <sworley@cumulusnetworks.com> Date: Mon Jan 27 19:36:01 2020 -0500 zebra: handle NHG in NHG dataplane group conversion We were not properly handling the case of a NHG inside of another NHG when converting the rb tree of a multilevel NHG into a flat list of IDs. When constructing, we call the function zebra_nhg_nhe2grp_internal() recursively so that the rare case of a group within a group is handled such that its singleton nexthops are appended to the grp array of IDs we send to the dataplane code. Ex) 1: -> 2: -> 3 -> 4 ->5: ->6 becomes this: 1: ->3 ->4 ->6 when its sent to the dataplane code for final kernel installation. Signed-off-by: Stephen Worley <sworley@cumulusnetworks.com> (cherry picked from commit 497ff5792f6a27702bf4ee33b79e1a80ffcf0a09) commit 61cc86b1bbc6e6f2079b478a9dd060542b69ce17 Merge: f3662686f 21d5b651b Author: Donald Sharp <sharpd@cumulusnetworks.com> Date: Thu Apr 2 18:49:43 2020 -0400 Merge pull request #6142 from opensourcerouting/7.3/defaults-fix-bools [7.3] bgpd, ospfd, ospf6d: long is not bool :( commit f3662686f57f5f1787884491cf5d087e4e88d31e Merge: a8858b3e8 7cc9f2c79 Author: Mark Stapp <mjs@voltanet.io> Date: Thu Apr 2 15:25:32 2020 -0400 Merge pull request #6140 from sworleys/NHG-Fix-Dup-Leak_7.3 [7.3] zebra: free unhashable (dup) NHEs via ID table cleanup commit 21d5b651bbc4bcad3656a1804692c70e32797c69 Author: David Lamparter <equinox@diac24.net> Date: Thu Apr 2 21:16:04 2020 +0200 bgpd, ospfd, ospf6d: long is not bool :( ... Oops ... (for context, the defaults code originally didn't have a dedicated "bool" variant and just used long for bools... I derp'd this when adding bool as a separate case :( ) Reported-by: Donald Sharp <sharpd@cumulusnetworks.com> Signed-off-by: David Lamparter <equinox@diac24.net> (cherry picked from commit 4c1458b595282bff6a6e0b20767bb5cb655d0b4c) commit 7cc9f2c7953d48cfb70b7e0c1b0c57e45ae68ce8 Author: Stephen Worley <sworley@cumulusnetworks.com> Date: Wed Apr 1 15:31:40 2020 -0400 zebra: free unhashable (dup) NHEs via ID table cleanup Free unhashable (duplicate NHEs from the kernel) via ID table cleanup. Since the NHE ID hash table contains extra entries, that's the one we need to be calling zebra_nhg_hash_free() on, otherwise we will never free the unhashable NHEs. This was found via a memleak: ==1478713== HEAP SUMMARY: ==1478713== in use at exit: 10,267 bytes in 46 blocks ==1478713== total heap usage: 76,810 allocs, 76,764 frees, 3,901,237 bytes allocated ==1478713== ==1478713== 208 (88 direct, 120 indirect) bytes in 1 blocks are definitely lost in loss record 35 of 41 ==1478713== at 0x483BB1A: calloc (vg_replace_malloc.c:762) ==1478713== by 0x48E35E8: qcalloc (memory.c:110) ==1478713== by 0x451CCB: zebra_nhg_alloc (zebra_nhg.c:369) ==1478713== by 0x453DE3: zebra_nhg_copy (zebra_nhg.c:379) ==1478713== by 0x452670: nhg_ctx_process_new (zebra_nhg.c:1143) ==1478713== by 0x4523A8: nhg_ctx_process (zebra_nhg.c:1234) ==1478713== by 0x452A2D: zebra_nhg_kernel_find (zebra_nhg.c:1294) ==1478713== by 0x4326E0: netlink_nexthop_change (rt_netlink.c:2433) ==1478713== by 0x427320: netlink_parse_info (kernel_netlink.c:945) ==1478713== by 0x432DAD: netlink_nexthop_read (rt_netlink.c:2488) ==1478713== by 0x41B600: interface_list (if_netlink.c:1486) ==1478713== by 0x457275: zebra_ns_enable (zebra_ns.c:127) Repro with: ip next add id 1 blackhole ip next add id 2 blackhole valgrind /usr/lib/frr/zebra Signed-off-by: Stephen Worley <sworley@cumulusnetworks.com> (cherry picked from commit c25c3ea57a3dcd3b36d86ba76dd34961bcb662f0) commit a8858b3e823a392b4a23525f7cd67a15da4d39e7 Merge: 8200afada e85c67d05 Author: Mark Stapp <mjs@voltanet.io> Date: Thu Apr 2 13:19:03 2020 -0400 Merge pull request #6136 from sworleys/NHG-Fix-Src_7.3 [7.3] zebra: determine src with nexthop objects as well commit e85c67d05decf340dcf5663a48c652719d04387f Author: Stephen Worley <sworley@cumulusnetworks.com> Date: Tue Mar 24 17:32:21 2020 -0400 zebra: determine src when using nexthop objects Determine src based on nexthop data even when we are using kernel nexthop objects. Before, we were entirely skipping this step and just sending the nexthop ID, ignoring src determination. Signed-off-by: Stephen Worley <sworley@cumulusnetworks.com> (cherry picked from commit d8bfd8dc9a899f841967257a6b5f30910fdc17c8) commit c9d7f8c0126b7b078b06f36096a2b3bbbc1f63b4 Author: Stephen Worley <sworley@cumulusnetworks.com> Date: Tue Mar 24 17:10:08 2020 -0400 zebra: abstract route src determiniation into func Abstraction the route src determination from a nexthop in the netlink code into a function for both singlepath and mutlipath to call. Signed-off-by: Stephen Worley <sworley@cumulusnetworks.com> (cherry picked from commit 762288f50f5fa29512864fcc7814be83e1b58ff4) commit 8200afadac8887c9a4d450338f2378e592378108 Merge: 66b1dbf93 a7fd46590 Author: Donald Sharp <sharpd@cumulusnetworks.com> Date: Thu Mar 26 22:06:23 2020 -0400 Merge pull request #6098 from opensourcerouting/73_topo-fixes Topotest fixes commit a7fd4659072befe9bc7a4a780c353d01af9a8c63 Author: Martin Winter <mwinter@opensourcerouting.org> Date: Fri Mar 20 23:53:39 2020 +0100 tests: fix check for nhid in ipv6 table output Check based on actual output instead of assuming output based on kernel version Signed-off-by: Martin Winter <mwinter@opensourcerouting.org> commit 61067229985f23b9679b7819474a5a6a79a32f03 Author: Martin Winter <mwinter@opensourcerouting.org> Date: Fri Mar 20 23:50:29 2020 +0100 tests: Make topotest working on different locale "sort" as used in all-protocol-startup used sort which causes different sort order based on locale settings. Specify the correct one to make output matching our expected result Signed-off-by: Martin Winter <mwinter@opensourcerouting.org> commit 66b1dbf93eefc7afa641bf378b24870221af64bf Merge: 997ad79fe b49789f5d Author: Sri Mohana Singamsetty <srimohans@gmail.com> Date: Fri Mar 20 18:11:37 2020 -0700 Merge pull request #6063 from donaldsharp/73_want_a_yump yang: Partially revert code to restore functionality commit b49789f5d32429722542a1a7de4b371b43958a31 Author: Donald Sharp <sharpd@cumulusnetworks.com> Date: Wed Mar 18 22:30:28 2020 -0400 yang: Partially revert code to restore functionality Partially revert code from commit: f22b9250853229c93617ffdad139a4762f5f7348 since this broke passive-interface, network and offset-list commands in rip and ripng Fixes: #6001 Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com> commit 997ad79fe468ea0bbbe475edb788baab1eeba4d0 Merge: 968d1b2c8 33a9ff004 Author: Donatas Abraitis <donatas.abraitis@gmail.com> Date: Thu Mar 12 10:43:18 2020 +0200 Merge pull request #5980 from donaldsharp/backport_no_nhg_kernel_73 zebra: [7.3] add config to disable use of kernel nexthops commit 33a9ff0045adfa605832187e570dbe1374ceb22e Author: Mark Stapp <mjs@voltanet.io> Date: Tue Jan 28 11:00:42 2020 -0500 zebra: add config to disable use of kernel nexthops Add a config that disables use of kernel-level nexthop ids. Currently, zebra always uses nexthop ids if the kernel supports them. Signed-off-by: Mark Stapp <mjs@voltanet.io> commit 968d1b2c83fa0abd3aef29cb5d5da569ae164659 Merge: cf95bd466 540528864 Author: Russ White <russ@riw.us> Date: Tue Mar 3 09:37:47 2020 -0500 Merge pull request #5888 from ton31337/fix/do_not_show_failed_if_shutdown_7.3 bgpd: [7.3] `show bgp summary failed` backports commit 540528864d85a3b00e0794da769497ecfb8e0c27 Author: Donatas Abraitis <donatas.abraitis@gmail.com> Date: Tue Feb 11 18:02:19 2020 +0200 bgpd: Format properly `show bgp summary failed` Before: ``` Neighbor EstdCnt DropCnt ResetTime Reason 192.168.0.1 0 0 never Waiting for peer OPEN ``` After: ``` Neighbor EstdCnt DropCnt ResetTime Reason 192.168.0.1 0 0 never Waiting for peer OPEN ``` Signed-off-by: Donatas Abraitis <donatas.abraitis@gmail.com> commit 4098f79949dd0e1e4ed7b89df8dc9b2be81fa9d6 Author: Donatas Abraitis <donatas.abraitis@gmail.com> Date: Fri Feb 14 23:21:55 2020 +0200 bgpd: Show the real reason why the peer is failed If the peer was shutdown locally, it doesn't show up as admin. shutdown. Instead it's treated as "Waiting for peer OPEN". The same applies to when the peer reaches maximum-prefix count. Signed-off-by: Donatas Abraitis <donatas.abraitis@gmail.com> commit 2b5eda4c0539dcd30a06c975be36f879cc454e9f Author: Donald Sharp <sharpd@cumulusnetworks.com> Date: Mon Feb 10 19:25:52 2020 -0500 bgpd: Update failed reason to distinguish some NHT scenarios Current failed reasons for bgp when you have a peer that is not online yet is `Waiting for NHT`, even if NHT has succeeded. Add some code to differentiate this. eva# show bgp ipv4 uni summ failed BGP router identifier 192.168.201.135, local AS number 3923 vrf-id 0 BGP table version 0 RIB entries 0, using 0 bytes of memory Peers 2, using 43 KiB of memory Neighbor EstdCnt DropCnt ResetTime Reason 192.168.44.1 0 0 never Waiting for NHT 192.168.201.139 0 0 never Waiting for Open to Succeed Total number of neighbors 2 eva# eva# show bgp nexthop Current BGP nexthop cache: 192.168.44.1 invalid, peer 192.168.44.1 Must be Connected Last update: Mon Feb 10 19:05:19 2020 192.168.201.139 valid [IGP metric 0], #paths 0, peer 192.168.201.139 So 192.168.201.139 is a peer for a connected route that has not been created on .139, while 44.1 nexthop tracking has not succeeded yet. Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com> commit 46bf67e739f5a14a3cf7f7a646ef2ee0059233b0 Author: David Lamparter <equinox@diac24.net> Date: Tue Feb 25 17:45:53 2020 +0100 debian: 7.3-1 Signed-off-by: David Lamparter <equinox@diac24.net> commit 1a3de6c6080052beba2c16da9f622bd8480c3812 Merge: 25321d069 c0038fca9 Author: David Lamparter <equinox@diac24.net> Date: Tue Feb 25 17:32:36 2020 +0100 Merge tag 'frr-7.3' into debian/master FRRouting Release 7.3 commit cf95bd466ea19dbff1db5e7078be78056e8ae938 Merge: c0038fca9 0b7086494 Author: Donatas Abraitis <donatas.abraitis@gmail.com> Date: Wed Feb 19 21:02:24 2020 +0100 Merge pull request #5832 from mjstapp/fix_rtadv_stubs_7_3 [7.3] zebra: Fix rtadv stubs commit 0b7086494e9fe056f35560bcab53ff9eb0e68df4 Author: Mark Stapp <mjs@voltanet.io> Date: Wed Feb 19 08:44:05 2020 -0500 zebra: fix missing route-advert stubs Stubs are used when frr is built without route-advert support; a couple of apis were missing, causing builds to fail. Signed-off-by: Mark Stapp <mjs@voltanet.io> commit c0038fca9b4b736a59d6ed786c12ac0c8a2909ac Author: Martin Winter <mwinter@opensourcerouting.org> Date: Fri Feb 14 15:03:09 2020 +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> commit df80bf16869314ec9455fb7e4db63dcf1fdba2c2 Merge: 283925de4 debcb6c67 Author: Russ White <russ@riw.us> Date: Tue Feb 11 11:27:29 2020 -0500 Merge pull request #5782 from donaldsharp/bgp_73 [7.3]bgpd: Remove prefix pointer creation commit 283925de411b971fd3c6013ab4051f8311e3550a Merge: ef985ef82 4348f9d2b Author: Mark Stapp <mjs@voltanet.io> Date: Mon Feb 10 10:49:44 2020 -0500 Merge pull request #5784 from donaldsharp/dc_73 [7.3] Double commit of nexthop cli changes to get this in. commit 4348f9d2b9e9c876e51e3646e1e8604c3c76f154 Author: Donald Sharp <sharpd@cumulusnetworks.com> Date: Wed Jan 15 08:28:22 2020 -0500 doc: Update doc to reflect changes in `show nexthop-group rib` command Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com> commit 1def701bae83a56e867206335c60d5bf237c96fe Author: Donald Sharp <sharpd@cumulusnetworks.com> Date: Mon Jan 13 16:11:46 2020 -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> commit e83a19713dcb2d374defae560a499ae4d28ff475 Author: Donald Sharp <sharpd@cumulusnetworks.com> Date: Mon Jan 13 16:00:33 2020 -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> commit debcb6c672a7d78321d797d24de1577648738d6c Author: Donald Sharp <sharpd@cumulusnetworks.com> Date: Wed Feb 5 21:02:25 2020 -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> commit ef985ef82222c30c0c3458ce0cb1ea86676b4737 Merge: 3f1e3f28d a55e6c3fb Author: Donald Sharp <sharpd@cumulusnetworks.com> Date: Fri Feb 7 09:20:28 2020 -0500 Merge pull request #5769 from Spantik/bugs OSPF: Multi instance broken commit a55e6c3fb18a37ff4b4b2cfc257c49b754597c22 Author: Santosh P K <sapk@vmware.com> Date: Wed Feb 5 09:40:00 2020 -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> commit 3f1e3f28d1527ad1fb80f2cee6537304457363dd Merge: 314370afc 0028b683e Author: Donatas Abraitis <donatas.abraitis@gmail.com> Date: Sun Feb 2 18:59:05 2020 +0200 Merge pull request #5735 from chiragshah6/73_evpn [7.3] bgpd: fix evpn route json memory leaks commit 314370afcbbb1335bf1f535213f1f2361388d968 Merge: 063ce24a9 11f5c03d1 Author: Donatas Abraitis <donatas.abraitis@gmail.com> Date: Wed Jan 29 09:37:42 2020 +0200 Merge pull request #5736 from opensourcerouting/move_rpm_to_python3_73 [7.3] Move rpm to python3 commit 0028b683ef3b22298be2a310895873ddfe3f11e1 Author: Chirag Shah <chirag@cumulusnetworks.com> Date: Mon Jan 27 10:41:22 2020 -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> commit 36a1c228e4fa3096751fabe75551bb43f0a6ab05 Author: Chirag Shah <chirag@cumulusnetworks.com> Date: Wed Jan 22 12:22:27 2020 -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> commit 11f5c03d128f8f10d889db56baf46c07335a1799 Author: Martin Winter <mwinter@opensourcerouting.org> Date: Sat Jan 25 23:00:47 2020 +0100 doc: Update RedHat packaging description to use Python 3 Signed-off-by: Martin Winter <mwinter@opensourcerouting.org> commit 723a3322f8f9a49d7ee5f5362a70a68493df5f35 Author: Martin Winter <mwinter@opensourcerouting.org> Date: Sat Jan 25 00:44:34 2020 +0100 redhat: Update frr.spec.in to move all systems to Python3 except CentOS 6 Signed-off-by: Martin Winter <mwinter@opensourcerouting.org> commit 14fe571b9d125773f650d7fe2facc22749f87f48 Author: Martin Winter <mwinter@opensourcerouting.org> Date: Sat Jan 25 00:43:20 2020 +0100 tools: Update generate_support_bundle.py to support Python 3 Signed-off-by: Martin Winter <mwinter@opensourcerouting.org> commit 063ce24a967abbbc9070b11ad1860afd8c35c559 Merge: 5d4ddeb84 a69e581ec Author: Donatas Abraitis <donatas.abraitis@gmail.com> Date: Sat Jan 25 05:02:22 2020 +0200 Merge pull request #5730 from opensourcerouting/73_fix_centos6 lib: Fix missing __be16 typedef on CentOS6 commit a69e581ec54bd9a96a32533222ca483456bded7b Author: Martin Winter <mwinter@opensourcerouting.org> Date: Mon Jan 20 15:40:49 2020 +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> commit 5d4ddeb84e03a5c509af419a0d5f2b1e2ba58f1b Merge: 0b4671148 c7036f666 Author: Donatas Abraitis <donatas.abraitis@gmail.com> Date: Fri Jan 24 18:24:08 2020 +0200 Merge pull request #5723 from donaldsharp/73_onlink_loss 73 onlink loss commit c7036f6669cf2f32afe3695a5551bda71d75e7cb Author: Donald Sharp <sharpd@cumulusnetworks.com> Date: Wed Jan 22 21:46:46 2020 -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>