]> git.proxmox.com Git - mirror_frr.git/log
mirror_frr.git
4 years agobfdd: simplify code flow
Rafael Zalamena [Mon, 13 Apr 2020 17:23:03 +0000 (14:23 -0300)]
bfdd: simplify code flow

Don't attempt to handle out-of-memory situations: XMALLOC/XCALLOC will
`assert` if there is no memory left.

Signed-off-by: Rafael Zalamena <rzalamena@opensourcerouting.org>
4 years agobfdd: add debug fine tuning capabilities
Rafael Zalamena [Mon, 13 Apr 2020 10:36:23 +0000 (07:36 -0300)]
bfdd: add debug fine tuning capabilities

Move most of the log messages to debug guards so they only get activated
if the user configured the proper debug level.

Current debug levels:
- Peer events.
- Zebra events.
- Network layer debugs.

Signed-off-by: Rafael Zalamena <rzalamena@opensourcerouting.org>
4 years agoMerge pull request #6017 from sarav511/ovrride
Donald Sharp [Tue, 14 Apr 2020 12:32:32 +0000 (08:32 -0400)]
Merge pull request #6017 from sarav511/ovrride

pimd: Join not sent within prune override time when received non local prune

4 years agoMerge pull request #6196 from dslicenc/ospf6d-brouter-loop
David Lamparter [Tue, 14 Apr 2020 12:12:17 +0000 (14:12 +0200)]
Merge pull request #6196 from dslicenc/ospf6d-brouter-loop

ospf6d: stop looping thru same Inter-Area Router LSAs

4 years agoMerge pull request #5988 from xThaid/zebra_vrf_logs
David Lamparter [Tue, 14 Apr 2020 10:52:31 +0000 (12:52 +0200)]
Merge pull request #5988 from xThaid/zebra_vrf_logs

zebra: Add vrf name and id to debugs

4 years agoMerge pull request #6215 from vivek-cumulus/wtecmp_linkbw_doc
David Lamparter [Tue, 14 Apr 2020 10:45:12 +0000 (12:45 +0200)]
Merge pull request #6215 from vivek-cumulus/wtecmp_linkbw_doc

doc: Documentation for weighted ECMP and link bandwidth

4 years agodoc: Documentation for weighted ECMP and link bandwidth
vivek [Tue, 14 Apr 2020 03:20:19 +0000 (20:20 -0700)]
doc: Documentation for weighted ECMP and link bandwidth

Signed-off-by: Vivek Venkatraman <vivek@cumulusnetworks.com>
4 years agoMerge pull request #5892 from qlyoung/fix-zclient-many
Renato Westphal [Tue, 14 Apr 2020 01:48:28 +0000 (22:48 -0300)]
Merge pull request #5892 from qlyoung/fix-zclient-many

assorted lib / zclient fixes

4 years agolib: fix SA warning in vrf creation zapi handler
Quentin Young [Mon, 13 Apr 2020 17:24:51 +0000 (13:24 -0400)]
lib: fix SA warning in vrf creation zapi handler

Signed-off-by: Quentin Young <qlyoung@cumulusnetworks.com>
4 years agolib: fix if_set_value
Quentin Young [Wed, 8 Apr 2020 20:29:23 +0000 (16:29 -0400)]
lib: fix if_set_value

Something in there is wrong and causing test failures. Moving it back to
how it was; we'll stil assert if the message was wrong, just in a
different place now.

Signed-off-by: Quentin Young <qlyoung@cumulusnetworks.com>
4 years agolib: work around enum issue in old gcc
Quentin Young [Tue, 24 Mar 2020 17:16:06 +0000 (13:16 -0400)]
lib: work around enum issue in old gcc

I'd like to keep the explicit check here, but since underlying type of
enum is implementation defined, theres some inconsistency using -Wall
-Werror in older compilers here

Signed-off-by: Quentin Young <qlyoung@cumulusnetworks.com>
4 years agoMerge pull request #6213 from ton31337/fix/moar_bool_stuff
Quentin Young [Mon, 13 Apr 2020 18:11:23 +0000 (14:11 -0400)]
Merge pull request #6213 from ton31337/fix/moar_bool_stuff

bgpd: Replace 0 to false for bool assignment in bgp_update_martian_ne…

4 years agoMerge pull request #6210 from donaldsharp/sharp_labels
Mark Stapp [Mon, 13 Apr 2020 17:56:03 +0000 (13:56 -0400)]
Merge pull request #6210 from donaldsharp/sharp_labels

sharpd: Allow sharpd to specify it's own routes for label changes

4 years agobgpd: Replace 0 to false for bool assignment in bgp_update_martian_nexthop()
Donatas Abraitis [Mon, 13 Apr 2020 17:39:31 +0000 (20:39 +0300)]
bgpd: Replace 0 to false for bool assignment in bgp_update_martian_nexthop()

Signed-off-by: Donatas Abraitis <donatas.abraitis@gmail.com>
4 years agolib: re-add accidentally deleted pfx family set
Quentin Young [Tue, 24 Mar 2020 15:38:19 +0000 (11:38 -0400)]
lib: re-add accidentally deleted pfx family set

Signed-off-by: Quentin Young <qlyoung@cumulusnetworks.com>
4 years agolib: improve sanity check on vrf backend value
Quentin Young [Wed, 18 Mar 2020 16:00:38 +0000 (12:00 -0400)]
lib: improve sanity check on vrf backend value

Signed-off-by: Quentin Young <qlyoung@cumulusnetworks.com>
4 years agolib: handle failure to change ifindex
Quentin Young [Mon, 2 Mar 2020 23:50:58 +0000 (18:50 -0500)]
lib: handle failure to change ifindex

This fixes a theoretical bug that could occur when trying to change an
ifindex on an interface to that of an existing interface. We would
remove the interface from the ifindex tree, and change the ifindex, but
when we tried to reinsert the interface, the insert would fail. It was
impossible to know if this failed due to the insertion / deletion macros
capturing the result value of the underlying BSD tree macros. So we
would effectively delete the interface.

Instead of failing on insert, we just check if the prospective ifindex
already exists and return -1 if it does.

Macros have been changed to statement expressions so the result can be
checked, and bubbled up.

Signed-off-by: Quentin Young <qlyoung@cumulusnetworks.com>
4 years agolib: more zclient fixes; str termination, vrfs...
Quentin Young [Mon, 2 Mar 2020 23:47:11 +0000 (18:47 -0500)]
lib: more zclient fixes; str termination, vrfs...

* Don't crash if we get a request to create an existing VRF
* Ensure interface & vrf names are null terminated...again

Signed-off-by: Quentin Young <qlyoung@cumulusnetworks.com>
4 years agolib: don't crash on iface add for unknown vrf
Quentin Young [Sun, 1 Mar 2020 22:44:12 +0000 (17:44 -0500)]
lib: don't crash on iface add for unknown vrf

If Zebra sends us an interface add notification with a garbage VRF we
crash on an assert(vrf_get(vrf_id, NULL)); let's not

Signed-off-by: Quentin Young <qlyoung@cumulusnetworks.com>
4 years agolib: ensure iface name is null terminated
Quentin Young [Sun, 1 Mar 2020 22:43:53 +0000 (17:43 -0500)]
lib: ensure iface name is null terminated

Signed-off-by: Quentin Young <qlyoung@cumulusnetworks.com>
4 years agolib: handle bogus VRF backend type
Quentin Young [Mon, 2 Mar 2020 23:42:56 +0000 (18:42 -0500)]
lib: handle bogus VRF backend type

And use an enum...

Signed-off-by: Quentin Young <qlyoung@cumulusnetworks.com>
4 years agolib: make all zclient.[ch] stream funcs safe
Quentin Young [Sun, 1 Mar 2020 06:21:56 +0000 (01:21 -0500)]
lib: make all zclient.[ch] stream funcs safe

Use STREAM_GET* variants of stream getters, which all have non-assert
error paths.

Signed-off-by: Quentin Young <qlyoung@cumulusnetworks.com>
4 years agolib: add STREAM_GETQ, STREAM_GETF
Quentin Young [Sun, 1 Mar 2020 06:20:40 +0000 (01:20 -0500)]
lib: add STREAM_GETQ, STREAM_GETF

Signed-off-by: Quentin Young <qlyoung@cumulusnetworks.com>
4 years agolib: remove unnecessary null checks
Quentin Young [Sun, 1 Mar 2020 06:19:55 +0000 (01:19 -0500)]
lib: remove unnecessary null checks

Signed-off-by: Quentin Young <qlyoung@cumulusnetworks.com>
4 years agoMerge pull request #6209 from donaldsharp/true_false
Mark Stapp [Mon, 13 Apr 2020 16:17:19 +0000 (12:17 -0400)]
Merge pull request #6209 from donaldsharp/true_false

bgpd: bools use `true/false` not `TRUE/FALSE`

4 years agosharpd: Allow sharpd to specify it's own routes for label changes
Donald Sharp [Mon, 13 Apr 2020 12:12:26 +0000 (08:12 -0400)]
sharpd: Allow sharpd to specify it's own routes for label changes

With the command using STR_SHARP, the sharp daemon is not allowed
to use it's own routes for label modification.  Switching over
to STR_ZEBRA allows the sharp daemon to modify labels on any
route in the system, since there are no `ROUTE_ZEBRA` types.

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
4 years agobgpd: bools use `true/false` not `TRUE/FALSE`
Donald Sharp [Mon, 13 Apr 2020 12:08:48 +0000 (08:08 -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>
4 years agoMerge pull request #6199 from opensourcerouting/bfdd-improvements
Donald Sharp [Mon, 13 Apr 2020 00:28:35 +0000 (20:28 -0400)]
Merge pull request #6199 from opensourcerouting/bfdd-improvements

bfdd: misc code improvements and fixes

4 years agoMerge pull request #6204 from opensourcerouting/fix-eigrp-neighbor
Donald Sharp [Mon, 13 Apr 2020 00:25:26 +0000 (20:25 -0400)]
Merge pull request #6204 from opensourcerouting/fix-eigrp-neighbor

yang: use the correct type for EIGRP neighbors

4 years agozebra: Add vrf name and id to debugs
Jakub Urbańczyk [Sun, 15 Mar 2020 18:42:30 +0000 (19:42 +0100)]
zebra: Add vrf name and id to debugs

In some places we log the interface but not the vfr the
interface is in. In others we only output the vrf id, which
can be difficult for human to read. This commit makes zebra
debugs more vrf aware.

Signed-off-by: Jakub Urbańczyk <xthaid@gmail.com>
4 years agoyang: use the correct type for EIGRP neighbors
Renato Westphal [Sun, 12 Apr 2020 03:12:19 +0000 (00:12 -0300)]
yang: use the correct type for EIGRP neighbors

Fixes #6193.

Signed-off-by: Renato Westphal <renato@opensourcerouting.org>
4 years agoMerge pull request #6181 from volta-networks/fix_isisd_no_metric_style
Renato Westphal [Sun, 12 Apr 2020 02:29:28 +0000 (23:29 -0300)]
Merge pull request #6181 from volta-networks/fix_isisd_no_metric_style

isisd: fix two 'no X' commands

4 years agoMerge pull request #6027 from sarav511/vrfloop
Donald Sharp [Fri, 10 Apr 2020 18:02:28 +0000 (14:02 -0400)]
Merge pull request #6027 from sarav511/vrfloop

pimd: crash while finding primary address.

4 years agoMerge pull request #6176 from NaveenThanikachalam/memleaks
Quentin Young [Fri, 10 Apr 2020 17:55:52 +0000 (13:55 -0400)]
Merge pull request #6176 from NaveenThanikachalam/memleaks

bgpd: Fixes for memory leaks.

4 years agobfdd: use standard log macros
Rafael Zalamena [Fri, 10 Apr 2020 14:06:22 +0000 (11:06 -0300)]
bfdd: use standard log macros

Remove old log_* macros and standardize on FRR's logging infrastructure.

Signed-off-by: Rafael Zalamena <rzalamena@opensourcerouting.org>
4 years agoMerge pull request #6189 from vivek-cumulus/unequal_cost_multipath_fixes
Russ White [Fri, 10 Apr 2020 13:03:50 +0000 (09:03 -0400)]
Merge pull request #6189 from vivek-cumulus/unequal_cost_multipath_fixes

Unequal cost multipath fixes

4 years agobfdd: fix transmission timer calculation
Rafael Zalamena [Thu, 9 Apr 2020 20:46:02 +0000 (17:46 -0300)]
bfdd: fix transmission timer calculation

According to the RFC 5880 the transmission time should be mandated by
the slowest system.

Signed-off-by: Rafael Zalamena <rzalamena@opensourcerouting.org>
4 years agobfdd: initialize packet data with zeroes
Rafael Zalamena [Thu, 9 Apr 2020 20:44:56 +0000 (17:44 -0300)]
bfdd: initialize packet data with zeroes

Lets avoid garbage data on packets by zeroing the packet before setting
the fields/flags.

Signed-off-by: Rafael Zalamena <rzalamena@opensourcerouting.org>
4 years agobfdd: remove BFD_*_FLAG macros
Rafael Zalamena [Thu, 9 Apr 2020 19:52:49 +0000 (16:52 -0300)]
bfdd: remove BFD_*_FLAG macros

Lets use what FRR provide us instead of implementing a new macros.

Signed-off-by: Rafael Zalamena <rzalamena@opensourcerouting.org>
4 years agoospf6d: stop looping thru same Inter-Area Router LSAs
Don Slice [Thu, 2 Apr 2020 17:50:53 +0000 (17:50 +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>
4 years agoMerge pull request #6124 from kuldeepkash/bgp_basic_functionality
Donatas Abraitis [Thu, 9 Apr 2020 12:59:49 +0000 (15:59 +0300)]
Merge pull request #6124 from kuldeepkash/bgp_basic_functionality

tests: Adding new test suite bgp_as_allow_in

4 years agotests: Added new tests to bgp-basic-functionality-topo1
Kuldeep Kashyap [Wed, 1 Apr 2020 05:30:38 +0000 (05:30 +0000)]
tests: Added new tests to bgp-basic-functionality-topo1

1. Added 2 new test cases to bgp-basic-functionality-topo1
2. Enhanced 2 tests to run for both static routes and network advvertise command

Signed-off-by: Kuldeep Kashyap <kashyapk@vmware.com>
4 years agotests: Adding new test suite bgp_as_allow_in
Kuldeep Kashyap [Wed, 1 Apr 2020 04:41:45 +0000 (04:41 +0000)]
tests: Adding new test suite bgp_as_allow_in

1. Added 5 test cases to verify BGP AS-allow-in behavior in FRR
2. Enhanced framework to support BGP AS-allow-in config(lib/bgp.py)
3. Added API in bgp.py to verify BGP RIB table(lib/bgp.py)

Signed-off-by: Kuldeep Kashyap <kashyapk@vmware.com>
4 years agoMerge pull request #6125 from kuldeepkash/bgp-communities
Donatas Abraitis [Thu, 9 Apr 2020 08:49:43 +0000 (11:49 +0300)]
Merge pull request #6125 from kuldeepkash/bgp-communities

tests: Adding new test suite bgp_communities_topo1

4 years agobgpd: Fixes for memory leaks.
Naveen Thanikachalam [Tue, 7 Apr 2020 12:03:34 +0000 (05:03 -0700)]
bgpd: Fixes for memory leaks.

This commit addresses the memory leaks when certain BGP JSON
show commands are executed

Signed-off-by: NaveenThanikachalam <nthanikachal@vmware.com>
4 years agobgpd: Trigger EVPN type-5 injection upon link-bandwidth change
vivek [Thu, 9 Apr 2020 01:46:59 +0000 (18:46 -0700)]
bgpd: Trigger EVPN type-5 injection upon link-bandwidth change

Ensure that upon a link-bandwidth change - for e.g., due to change in
the number of multipaths - EVPN type-5 route injection is triggered.
In the absence of this, the proper link-bandwidth is not updated in
EVPN type-5 routes originated by the router.

Signed-off-by: Vivek Venkatraman <vivek@cumulusnetworks.com>
4 years agobgpd: Fix overflow in bandwidth calc
vivek [Thu, 9 Apr 2020 01:14:19 +0000 (18:14 -0700)]
bgpd: Fix overflow in bandwidth calc

Signed-off-by: Vivek Venkatraman <vivek@cumulusnetworks.com>
4 years agoMerge pull request #6175 from ton31337/fix/avoid_same_type_typecasting
David Lamparter [Wed, 8 Apr 2020 20:44:53 +0000 (22:44 +0200)]
Merge pull request #6175 from ton31337/fix/avoid_same_type_typecasting

*: Do not cast to the same type

4 years agoMerge pull request #6185 from opensourcerouting/build-assorted-20200408
Donald Sharp [Wed, 8 Apr 2020 17:29:45 +0000 (13:29 -0400)]
Merge pull request #6185 from opensourcerouting/build-assorted-20200408

assorted build fixes

4 years agoMerge pull request #6186 from ton31337/fix/no_magic_numbers_community
Donald Sharp [Wed, 8 Apr 2020 17:28:56 +0000 (13:28 -0400)]
Merge pull request #6186 from ton31337/fix/no_magic_numbers_community

bgpd: Use COMMUNITY_SIZE instead of just 4

4 years agoMerge pull request #6041 from donaldsharp/wang_a_yump
Renato Westphal [Wed, 8 Apr 2020 16:33:17 +0000 (13:33 -0300)]
Merge pull request #6041 from donaldsharp/wang_a_yump

Wang a yump

4 years agobgpd: Use COMMUNITY_SIZE instead of just 4
Donatas Abraitis [Wed, 8 Apr 2020 15:09:25 +0000 (18:09 +0300)]
bgpd: Use COMMUNITY_SIZE instead of just 4

Easier to maintain and read.

Signed-off-by: Donatas Abraitis <donatas.abraitis@gmail.com>
4 years agoMerge pull request #6128 from donaldsharp/more_static_routes_tests
Renato Westphal [Wed, 8 Apr 2020 14:59:15 +0000 (11:59 -0300)]
Merge pull request #6128 from donaldsharp/more_static_routes_tests

tests: Add a couple more static route tests

4 years agobuild: fix git detection for worktrees
David Lamparter [Wed, 8 Apr 2020 13:18:34 +0000 (15:18 +0200)]
build: fix git detection for worktrees

When using additional git worktrees, .git is not a directory.

Signed-off-by: David Lamparter <equinox@diac24.net>
4 years agoyang/embedmodel.py: create output dir if needed
David Lamparter [Wed, 8 Apr 2020 13:21:17 +0000 (15:21 +0200)]
yang/embedmodel.py: create output dir if needed

For builds with separate build directory, just to be on the safe side.

Signed-off-by: David Lamparter <equinox@diac24.net>
4 years agotests: fix parallel build race
David Lamparter [Wed, 8 Apr 2020 13:17:21 +0000 (15:17 +0200)]
tests: fix parallel build race

If we're building with a separate build directory, these two build
targets can fail in case their output directory hasn't been created by
some other target that may or may not have run earlier.

Signed-off-by: David Lamparter <equinox@diac24.net>
4 years agotests: Add tests to rip and ripngd to show func works
Donald Sharp [Thu, 19 Mar 2020 02:29:00 +0000 (22:29 -0400)]
tests: Add tests to rip and ripngd to show func works

Add some basic tests to show that network and passive-interface
commands work with interface names in rip and ripngd.

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
4 years agoyang: Temp change interface type to string to allow configuration
Donald Sharp [Wed, 8 Apr 2020 14:17:24 +0000 (10:17 -0400)]
yang: Temp change interface type to string to allow configuration

Temporarily change the interface types in rip and ripng to
strings to allow us to work, since the yang uplift to 1.0
is proving difficult.

Signed-off-by: Donald Sharp sharpd@cumulusnetworks.com>
4 years agotools: Add coccinelle script to catch typecasts to same type
Donatas Abraitis [Wed, 8 Apr 2020 05:57:37 +0000 (08:57 +0300)]
tools: Add coccinelle script to catch typecasts to same type

Signed-off-by: Donatas Abraitis <donatas.abraitis@gmail.com>
4 years ago*: Do not cast to the same type
Donatas Abraitis [Wed, 8 Apr 2020 05:57:15 +0000 (08:57 +0300)]
*: Do not cast to the same type

Signed-off-by: Donatas Abraitis <donatas.abraitis@gmail.com>
4 years agoMerge pull request #5928 from xThaid/rt_link_cleanup
David Lamparter [Wed, 8 Apr 2020 13:38:46 +0000 (15:38 +0200)]
Merge pull request #5928 from xThaid/rt_link_cleanup

zebra: make common function for RTM_NEWNEIGH calls

4 years agoMerge pull request #5917 from Spantik/ospf_redis
Russ White [Wed, 8 Apr 2020 13:35:56 +0000 (09:35 -0400)]
Merge pull request #5917 from Spantik/ospf_redis

Zebra: Default route distribute handling.

4 years agotests: Add a couple more static route tests
Donald Sharp [Wed, 1 Apr 2020 12:56:22 +0000 (08:56 -0400)]
tests: Add a couple more static route tests

Add a couple more tests to static route installation
Do some very very basic work to make sure that they are working
the way we want.

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
4 years agotests: Adding new test suite bgp_communities_topo1
Kuldeep Kashyap [Wed, 1 Apr 2020 06:56:54 +0000 (06:56 +0000)]
tests: Adding new test suite bgp_communities_topo1

1. Added 1 test case to verify NO-ADVERTISE Community functionality
2. Enhanced bgp.py to exclude routers from verification, if doesn't have bgp config

Signed-off-by: Kuldeep Kashyap <kashyapk@vmware.com>
4 years agotests: Added new tests to bgp-basic-functionality-topo1
Kuldeep Kashyap [Wed, 1 Apr 2020 05:30:38 +0000 (05:30 +0000)]
tests: Added new tests to bgp-basic-functionality-topo1

1. Added 2 new test cases to bgp-basic-functionality-topo1
2. Enhanced 2 tests to run for both static routes and network advvertise command

Signed-off-by: Kuldeep Kashyap <kashyapk@vmware.com>
4 years agotests: Adding new test suite bgp_as_allow_in
Kuldeep Kashyap [Wed, 1 Apr 2020 04:41:45 +0000 (04:41 +0000)]
tests: Adding new test suite bgp_as_allow_in

1. Added 5 test cases to verify BGP AS-allow-in behavior in FRR
2. Enhanced framework to support BGP AS-allow-in config(lib/bgp.py)
3. Added API in bgp.py to verify BGP RIB table(lib/bgp.py)

Signed-off-by: Kuldeep Kashyap <kashyapk@vmware.com>
4 years agoMerge pull request #6166 from volta-networks/fix_isis_lsp_timers
Olivier Dugeon [Wed, 8 Apr 2020 08:00:03 +0000 (10:00 +0200)]
Merge pull request #6166 from volta-networks/fix_isis_lsp_timers

isisd, yang: unified lsp-timers command

4 years agoMerge pull request #6180 from mjstapp/fix_bgp_ecomm_sa
Renato Westphal [Wed, 8 Apr 2020 02:00:06 +0000 (23:00 -0300)]
Merge pull request #6180 from mjstapp/fix_bgp_ecomm_sa

bgpd: clean up SA warning in bgp_ecommunity.c

4 years agoMerge pull request #6174 from volta-networks/fix_lm_async_log
Renato Westphal [Wed, 8 Apr 2020 01:59:09 +0000 (22:59 -0300)]
Merge pull request #6174 from volta-networks/fix_lm_async_log

zebra: minor fix to label manager log

4 years agoMerge pull request #6183 from qlyoung/doc-isis-lsp-mtu-knob
Renato Westphal [Wed, 8 Apr 2020 01:44:42 +0000 (22:44 -0300)]
Merge pull request #6183 from qlyoung/doc-isis-lsp-mtu-knob

doc: document lsp-mtu knob for IS-IS

4 years agodoc: document lsp-mtu knob for IS-IS
Quentin Young [Wed, 8 Apr 2020 00:11:18 +0000 (20:11 -0400)]
doc: document lsp-mtu knob for IS-IS

Signed-off-by: Quentin Young <qlyoung@cumulusnetworks.com>
4 years agoisisd: fix two 'no X' commands
Emanuele Di Pascale [Tue, 7 Apr 2020 16:41:15 +0000 (18:41 +0200)]
isisd: fix two 'no X' commands

for some reason, when issuing a 'no metric-style' command we were
setting the metric-style to narrow, even though the default is
actually wide. Use NULL to avoid similar problems in the future.

Likewise, the 'no is-type' command was still trying to implement
the old logic of applying a different default for the first area.
In practice this had no effect because the value would now be the
same in both cases, but it's better to remove useless code anyway.

Signed-off-by: Emanuele Di Pascale <emanuele@voltanet.io>
4 years agoZebra: Default route distribute handling.
Santosh P K [Tue, 7 Apr 2020 14:02:21 +0000 (07:02 -0700)]
Zebra: Default route distribute handling.

When default route is requested from client, default
route is sent to client if present. When route gets
deleted then delete is sent to clients.

Signed-off-by: Santosh P K <sapk@vmware.com>
4 years agoMerge pull request #6178 from opensourcerouting/debian-backprop
Quentin Young [Tue, 7 Apr 2020 17:03:21 +0000 (13:03 -0400)]
Merge pull request #6178 from opensourcerouting/debian-backprop

feed debian/ changes back into master

4 years agobgpd: clean up SA warning in bgp_ecommunity.c
Mark Stapp [Tue, 7 Apr 2020 16:56:43 +0000 (12:56 -0400)]
bgpd: clean up SA warning in bgp_ecommunity.c

Signed-off-by: Mark Stapp <mjs@voltanet.io>
4 years agoMerge pull request #6179 from ton31337/fix/typecast_to_biger_sizes
Quentin Young [Tue, 7 Apr 2020 16:42:38 +0000 (12:42 -0400)]
Merge pull request #6179 from ton31337/fix/typecast_to_biger_sizes

tools: Add coccinelle script to catch typecasts to larger sizes

4 years agoMerge pull request #6097 from mjstapp/fix_nhg_cli_dups
Stephen Worley [Tue, 7 Apr 2020 16:14:44 +0000 (12:14 -0400)]
Merge pull request #6097 from mjstapp/fix_nhg_cli_dups

lib: support replacement in the nexthop-group cli

4 years agoMerge pull request #6173 from ton31337/fix/treat-as-withdraw_community
Russ White [Tue, 7 Apr 2020 15:42:01 +0000 (11:42 -0400)]
Merge pull request #6173 from ton31337/fix/treat-as-withdraw_community

bgpd: Treat-as-withdraw if [el]community length is zero

4 years agotools: Add coccinelle script to catch typecasts to larger sizes
Donatas Abraitis [Tue, 7 Apr 2020 14:25:10 +0000 (17:25 +0300)]
tools: Add coccinelle script to catch typecasts to larger sizes

That's valid only for uint*_t

Signed-off-by: Donatas Abraitis <donatas.abraitis@gmail.com>
4 years agodebian: 7.2.1 prep
David Lamparter [Mon, 20 Jan 2020 15:57:10 +0000 (16:57 +0100)]
debian: 7.2.1 prep

Just the odd housekeeping bits.

Signed-off-by: David Lamparter <equinox@diac24.net>
4 years agodebian: remove outdated README content
David Lamparter [Mon, 20 Jan 2020 15:53:55 +0000 (16:53 +0100)]
debian: remove outdated README content

Signed-off-by: David Lamparter <equinox@diac24.net>
4 years agolib: support replacement in the nexthop-group cli
Mark Stapp [Thu, 26 Mar 2020 18:11:56 +0000 (14:11 -0400)]
lib: support replacement in the nexthop-group cli

Use more limited matching logic so that nexthops within a
nexthop-group are unique based only on vrf, type, and gateway.
Treat configuration of a nexthop that matches an existing
nexthop as a replace operation.

Signed-off-by: Mark Stapp <mjs@voltanet.io>
4 years agozebra: minor fix to label manager log
Emanuele Di Pascale [Thu, 2 Apr 2020 22:05:44 +0000 (00:05 +0200)]
zebra: minor fix to label manager log

zebra should only check whether a get_chunk operation succeeded
when processing the response, rather than insde the get_chunk
call itself. Spllitting the request and response hooks was done
precisely to allow for asynchronous calls to an external label
manager; in this case, the requested chunk is not necessarily
going to be available at request time.

Signed-off-by: Emanuele Di Pascale <emanuele@voltanet.io>
4 years agobgpd: Treat-as-withdraw if [el]community length is zero
Donatas Abraitis [Tue, 7 Apr 2020 07:08:16 +0000 (10:08 +0300)]
bgpd: Treat-as-withdraw if [el]community length is zero

Signed-off-by: Donatas Abraitis <donatas.abraitis@gmail.com>
4 years agoMerge pull request #6167 from qlyoung/fix-cluster-list-uaf
Donatas Abraitis [Tue, 7 Apr 2020 06:47:28 +0000 (09:47 +0300)]
Merge pull request #6167 from qlyoung/fix-cluster-list-uaf

bgpd: treat 0-length cluster_list as withdraw

4 years agoMerge pull request #6160 from qlyoung/fix-pim-bsm-negative-shift
David Lamparter [Mon, 6 Apr 2020 18:26:13 +0000 (20:26 +0200)]
Merge pull request #6160 from qlyoung/fix-pim-bsm-negative-shift

pimd: fix negative bitshift in BSM code

4 years agobgpd: treat 0-length cluster_list as withdraw
Quentin Young [Mon, 6 Apr 2020 16:30:35 +0000 (12:30 -0400)]
bgpd: treat 0-length cluster_list as withdraw

See source comment...

Signed-off-by: Quentin Young <qlyoung@cumulusnetworks.com>
4 years agopimd: fix negative bitshift
Quentin Young [Mon, 6 Apr 2020 03:40:47 +0000 (23:40 -0400)]
pimd: fix negative bitshift

Valid range for hashmasklen is 0-32 under IPv4; failure to validate this
results in a negative bitshift later

Signed-off-by: Quentin Young <qlyoung@cumulusnetworks.com>
4 years agoMerge pull request #6150 from ton31337/feature/black_topotests_developer_guide
David Lamparter [Mon, 6 Apr 2020 15:39:20 +0000 (17:39 +0200)]
Merge pull request #6150 from ton31337/feature/black_topotests_developer_guide

doc: Mention that we should use `black` code formatter for topotests

4 years agoisisd, yang: unified lsp-timers command
Emanuele Di Pascale [Mon, 6 Apr 2020 15:05:41 +0000 (17:05 +0200)]
isisd, yang: unified lsp-timers command

Yang constraints enforced by the northbound callbacks require that
the maximum lifetime be >= than (refresh interval + 300). When we are
moving from one config to another through frr-reload.py, we issue
a number of vtysh -c commands ('no lsp-refresh-interval level-1 500',
'no max-lsp-lifetime level-1 1000'), which reset these parameters to their
default values, respectively 900 and 1200. Depending on the actual
values in the current config, the order in which these commands are sent
might be the wrong one, in that we hit an invalid intermediate state and
make vtysh (and by extension frr-reload.py) return an error.

As a workaround, let's add a one-liner command that sets all these
inter-related parameters in one go, and make isisd display them as a
single line too, so that the diff will be computed as a single command.
The old individual commands are kept to ensure backwards compatibility.

Signed-off-by: Emanuele Di Pascale <emanuele@voltanet.io>
4 years agoMerge pull request #6158 from qlyoung/fix-cluster-list-uaf
David Lamparter [Mon, 6 Apr 2020 15:38:27 +0000 (17:38 +0200)]
Merge pull request #6158 from qlyoung/fix-cluster-list-uaf

bgpd: fix multiple bugs with cluster_list attrs

4 years agoMerge pull request #6155 from qlyoung/fix-unsigned-cmp-lt-zero
David Lamparter [Mon, 6 Apr 2020 15:37:11 +0000 (17:37 +0200)]
Merge pull request #6155 from qlyoung/fix-unsigned-cmp-lt-zero

bgpd, zebra: don't compare unsigned < 0

4 years agoMerge pull request #6159 from qlyoung/fix-pim-tlv-unaligned-pointer-access
David Lamparter [Mon, 6 Apr 2020 15:33:01 +0000 (17:33 +0200)]
Merge pull request #6159 from qlyoung/fix-pim-tlv-unaligned-pointer-access

pimd: fix unaligned pointer access

4 years agoMerge pull request #6161 from qlyoung/fix-bsm-json-keys
Donatas Abraitis [Mon, 6 Apr 2020 07:37:32 +0000 (10:37 +0300)]
Merge pull request #6161 from qlyoung/fix-bsm-json-keys

pimd: fix BSM JSON keys

4 years agopimd: fix unaligned access parsing tlvs
Quentin Young [Mon, 6 Apr 2020 04:14:14 +0000 (00:14 -0400)]
pimd: fix unaligned access parsing tlvs

Can't use a uint8_t as a uint32_t

Signed-off-by: Quentin Young <qlyoung@cumulusnetworks.com>
4 years agopimd: fix BSM JSON keys
Quentin Young [Mon, 6 Apr 2020 03:53:02 +0000 (23:53 -0400)]
pimd: fix BSM JSON keys

We use camelCase keys in FRR.

Signed-off-by: Quentin Young <qlyoung@cumulusnetworks.com>
4 years agobgpd: fix multiple bugs with cluster_list attrs
Quentin Young [Sun, 5 Apr 2020 21:11:25 +0000 (17:11 -0400)]
bgpd: fix multiple bugs with cluster_list attrs

Multiple different issues causing mostly UAFs but maybe other more
subtle things.

- Cluster lists were the only attributes whose pointers were not being
  NULL'd when freed, resulting in heap UAF
- When performing an insert into the cluster hash, our temporary struct
  used for hash_get() was inconsistent with our hash keying and
  comparison functions. In the case of a zero length cluster list, the
  ->length field is 0 and the ->list field is NULL. When performing an
  insert, we set the ->list field regardless of whether the length is 0.
  This resulted in the two cluster lists hashing equal but not comparing
  equal. Later, when removing one of them from the hash before freeing
  it, because the key matched and the comparison succeeded (because it
  was set to NULL *after* the search but *before* inserting into the
  hash) we would sometimes release the duplicated copy of the struct,
  and then free the one that remained in the hash table. Later accesses
  constitute UAF. This is fixed by making sure the fields used for the
  existence check match what is actually inserted into the hash when
  that check fails.

This patch also makes cluster_unintern static, because it should be.

Signed-off-by: Quentin Young <qlyoung@cumulusnetworks.com>
4 years agoMerge pull request #6105 from vivek-cumulus/bgp_link_bandwidth_unequal_cost_multipath
Sri Mohana Singamsetty [Sun, 5 Apr 2020 18:41:42 +0000 (11:41 -0700)]
Merge pull request #6105 from vivek-cumulus/bgp_link_bandwidth_unequal_cost_multipath

Unequal cost multipath (a.ka. weighted ECMP) with BGP link-bandwidth

4 years agoMerge pull request #6143 from ton31337/fix/remove_prefixReceivedCount
Sri Mohana Singamsetty [Sun, 5 Apr 2020 18:41:04 +0000 (11:41 -0700)]
Merge pull request #6143 from ton31337/fix/remove_prefixReceivedCount

bgpd: Remove `prefixReceivedCount` from JSON

4 years agoMerge pull request #6144 from ton31337/fix/python_formatter
Quentin Young [Sun, 5 Apr 2020 17:20:30 +0000 (13:20 -0400)]
Merge pull request #6144 from ton31337/fix/python_formatter

tests: Run python formatter (black) for topotests