]>
git.puffer.fish Git - mirror/frr.git/log
Manoj Naragund [Fri, 31 Mar 2023 10:47:17 +0000 (03:47 -0700)]
mgmtd: Fix for issue 13154.
The changes involve adding show debuggin command for MGMTd which resolves
command incomplete issue.
issue #13154
Signed-off-by: Manoj Naragund <mnaragund@vmware.com>
Donatas Abraitis [Fri, 31 Mar 2023 06:25:44 +0000 (09:25 +0300)]
Merge pull request #13148 from samanvithab/bgp_mem_leak_fix
bgpd : memory leak fix for aggregate-address on cleanup
Donatas Abraitis [Fri, 31 Mar 2023 06:24:30 +0000 (09:24 +0300)]
Merge pull request #13153 from jeclarke/dump_buf_size
bgpd: increase buffer size used for dumping BGP to MRT files
Jafar Al-Gharaibeh [Fri, 31 Mar 2023 05:17:19 +0000 (00:17 -0500)]
Merge pull request #13082 from inspurSDN/bugfix_zebra_crash_rebooting
zebra: move vrf deleting handle to zebra final state handle
Jafar Al-Gharaibeh [Fri, 31 Mar 2023 05:14:27 +0000 (00:14 -0500)]
Merge pull request #13060 from opensourcerouting/feature/allow_peering_with_127.0.0.1
bgpd: Allow peering via 127.0.0.0/8
Jafar Al-Gharaibeh [Fri, 31 Mar 2023 05:09:55 +0000 (00:09 -0500)]
Merge pull request #13142 from donaldsharp/cleanup_debugs
tests: Turn off debug logging
Jafar Al-Gharaibeh [Thu, 30 Mar 2023 13:44:18 +0000 (08:44 -0500)]
Merge pull request #13004 from donaldsharp/vtysh_fork
Vtysh fork
jeclarke [Thu, 30 Mar 2023 13:23:48 +0000 (14:23 +0100)]
bgpd: increase buffer size used for dumping BGP to MRT files
Signed-off-by: James Clarke (jamclar2) <jamclar2@cisco.com>
Samanvitha B Bhargav [Thu, 30 Mar 2023 05:35:44 +0000 (22:35 -0700)]
bgpd : aggregate-address memory leak fix
Memory leaks are observed in the cleanup code. When “no router bgp" is executed,
cleanup in that flow for aggregate-address command is not taken care.
fixes the below leak:
--
./bgp_local_asn_dot.test_bgp_local_asn_dot_agg/r3.bgpd.asan.
3410444 :Direct leak of 152 byte(s) in 1 object(s) allocated from:
./bgp_local_asn_dot.test_bgp_local_asn_dot_agg/r3.bgpd.asan.
3410444 - #0 0x7f163e911037 in __interceptor_calloc ../../../../src/libsanitizer/asan/asan_malloc_linux.cpp:154
./bgp_local_asn_dot.test_bgp_local_asn_dot_agg/r3.bgpd.asan.
3410444 - #1 0x7f163e4b9259 in qcalloc lib/memory.c:105
./bgp_local_asn_dot.test_bgp_local_asn_dot_agg/r3.bgpd.asan.
3410444 - #2 0x562bf42ebbd5 in bgp_aggregate_new bgpd/bgp_route.c:7239
./bgp_local_asn_dot.test_bgp_local_asn_dot_agg/r3.bgpd.asan.
3410444 - #3 0x562bf42f14e8 in bgp_aggregate_set bgpd/bgp_route.c:8421
./bgp_local_asn_dot.test_bgp_local_asn_dot_agg/r3.bgpd.asan.
3410444 - #4 0x562bf42f1e55 in aggregate_addressv6_magic bgpd/bgp_route.c:8592
./bgp_local_asn_dot.test_bgp_local_asn_dot_agg/r3.bgpd.asan.
3410444 - #5 0x562bf42be3f5 in aggregate_addressv6 bgpd/bgp_route_clippy.c:341
./bgp_local_asn_dot.test_bgp_local_asn_dot_agg/r3.bgpd.asan.
3410444 - #6 0x7f163e3f1e1b in cmd_execute_command_real lib/command.c:988
./bgp_local_asn_dot.test_bgp_local_asn_dot_agg/r3.bgpd.asan.
3410444 - #7 0x7f163e3f219c in cmd_execute_command lib/command.c:1048
./bgp_local_asn_dot.test_bgp_local_asn_dot_agg/r3.bgpd.asan.
3410444 - #8 0x7f163e3f2df4 in cmd_execute lib/command.c:1215
./bgp_local_asn_dot.test_bgp_local_asn_dot_agg/r3.bgpd.asan.
3410444 - #9 0x7f163e5a2d73 in vty_command lib/vty.c:544
./bgp_local_asn_dot.test_bgp_local_asn_dot_agg/r3.bgpd.asan.
3410444 - #10 0x7f163e5a79c8 in vty_execute lib/vty.c:1307
./bgp_local_asn_dot.test_bgp_local_asn_dot_agg/r3.bgpd.asan.
3410444 - #11 0x7f163e5ad299 in vtysh_read lib/vty.c:2216
./bgp_local_asn_dot.test_bgp_local_asn_dot_agg/r3.bgpd.asan.
3410444 - #12 0x7f163e593f16 in event_call lib/event.c:1995
./bgp_local_asn_dot.test_bgp_local_asn_dot_agg/r3.bgpd.asan.
3410444 - #13 0x7f163e47c839 in frr_run lib/libfrr.c:1185
./bgp_local_asn_dot.test_bgp_local_asn_dot_agg/r3.bgpd.asan.
3410444 - #14 0x562bf414e58d in main bgpd/bgp_main.c:505
./bgp_local_asn_dot.test_bgp_local_asn_dot_agg/r3.bgpd.asan.
3410444 - #15 0x7f163de66d09 in __libc_start_main ../csu/libc-start.c:308
./bgp_local_asn_dot.test_bgp_local_asn_dot_agg/r3.bgpd.asan.
3410444 -
./bgp_local_asn_dot.test_bgp_local_asn_dot_agg/r3.bgpd.asan.
3410444 :Direct leak of 152 byte(s) in 1 object(s) allocated from:
./bgp_local_asn_dot.test_bgp_local_asn_dot_agg/r3.bgpd.asan.
3410444 - #0 0x7f163e911037 in __interceptor_calloc ../../../../src/libsanitizer/asan/asan_malloc_linux.cpp:154
./bgp_local_asn_dot.test_bgp_local_asn_dot_agg/r3.bgpd.asan.
3410444 - #1 0x7f163e4b9259 in qcalloc lib/memory.c:105
./bgp_local_asn_dot.test_bgp_local_asn_dot_agg/r3.bgpd.asan.
3410444 - #2 0x562bf42ebbd5 in bgp_aggregate_new bgpd/bgp_route.c:7239
./bgp_local_asn_dot.test_bgp_local_asn_dot_agg/r3.bgpd.asan.
3410444 - #3 0x562bf42f14e8 in bgp_aggregate_set bgpd/bgp_route.c:8421
./bgp_local_asn_dot.test_bgp_local_asn_dot_agg/r3.bgpd.asan.
3410444 - #4 0x562bf42f1cde in aggregate_addressv4_magic bgpd/bgp_route.c:8543
./bgp_local_asn_dot.test_bgp_local_asn_dot_agg/r3.bgpd.asan.
3410444 - #5 0x562bf42bd258 in aggregate_addressv4 bgpd/bgp_route_clippy.c:255
./bgp_local_asn_dot.test_bgp_local_asn_dot_agg/r3.bgpd.asan.
3410444 - #6 0x7f163e3f1e1b in cmd_execute_command_real lib/command.c:988
./bgp_local_asn_dot.test_bgp_local_asn_dot_agg/r3.bgpd.asan.
3410444 - #7 0x7f163e3f219c in cmd_execute_command lib/command.c:1048
./bgp_local_asn_dot.test_bgp_local_asn_dot_agg/r3.bgpd.asan.
3410444 - #8 0x7f163e3f2df4 in cmd_execute lib/command.c:1215
./bgp_local_asn_dot.test_bgp_local_asn_dot_agg/r3.bgpd.asan.
3410444 - #9 0x7f163e5a2d73 in vty_command lib/vty.c:544
./bgp_local_asn_dot.test_bgp_local_asn_dot_agg/r3.bgpd.asan.
3410444 - #10 0x7f163e5a79c8 in vty_execute lib/vty.c:1307
./bgp_local_asn_dot.test_bgp_local_asn_dot_agg/r3.bgpd.asan.
3410444 - #11 0x7f163e5ad299 in vtysh_read lib/vty.c:2216
./bgp_local_asn_dot.test_bgp_local_asn_dot_agg/r3.bgpd.asan.
3410444 - #12 0x7f163e593f16 in event_call lib/event.c:1995
./bgp_local_asn_dot.test_bgp_local_asn_dot_agg/r3.bgpd.asan.
3410444 - #13 0x7f163e47c839 in frr_run lib/libfrr.c:1185
./bgp_local_asn_dot.test_bgp_local_asn_dot_agg/r3.bgpd.asan.
3410444 - #14 0x562bf414e58d in main bgpd/bgp_main.c:505
./bgp_local_asn_dot.test_bgp_local_asn_dot_agg/r3.bgpd.asan.
3410444 - #15 0x7f163de66d09 in __libc_start_main ../csu/libc-start.c:308
./bgp_local_asn_dot.test_bgp_local_asn_dot_agg/r3.bgpd.asan.
3410444 -
./bgp_local_asn_dot.test_bgp_local_asn_dot_agg/r3.bgpd.asan.
3410444 -SUMMARY: AddressSanitizer: 304 byte(s) leaked in 2 allocation(s).
Signed-off-by: Samanvitha B Bhargav <bsamanvitha@vmware.com>
mobash-rasool [Thu, 30 Mar 2023 03:11:40 +0000 (08:41 +0530)]
Merge pull request #12916 from donaldsharp/clang_15_warnings
freebsd 14, clang 15
Donald Sharp [Thu, 30 Mar 2023 00:30:00 +0000 (20:30 -0400)]
Merge pull request #13133 from isabelladeleon12/add_drop_counter
isisd: Add PDU drop counter to "show isis summary"
Donald Sharp [Thu, 30 Mar 2023 00:13:43 +0000 (20:13 -0400)]
Merge pull request #13146 from opensourcerouting/fix/drop_double_soft_reconfig_in
bgpd: Do not call bgp_soft_reconfig_in() twice in a row on policy change
Donald Sharp [Wed, 29 Mar 2023 18:03:28 +0000 (14:03 -0400)]
tests: Turn off debug logging
Tests are taking up too much space, turn off debug logging
for normal runs.
Signed-off-by: Donald Sharp <sharpd@nvidia.com>
Donatas Abraitis [Wed, 29 Mar 2023 20:21:35 +0000 (23:21 +0300)]
bgpd: Do not call bgp_soft_reconfig_in() twice in a row on policy change
Just realized it was a stupid copy/paste.
Signed-off-by: Donatas Abraitis <donatas@opensourcerouting.org>
Russ White [Wed, 29 Mar 2023 15:05:30 +0000 (11:05 -0400)]
Merge pull request #12645 from gpnaveen/ospf_error_msg_enhancements
tests: [topojson] Update assert/error messages for ospf scripts
Donald Sharp [Wed, 29 Mar 2023 11:51:31 +0000 (07:51 -0400)]
Merge pull request #13124 from opensourcerouting/fix/unsupress_map_delay_timer
bgpd: Do not announce routes immediatelly on prefix/distribute/filter changes
Jafar Al-Gharaibeh [Wed, 29 Mar 2023 04:18:58 +0000 (23:18 -0500)]
Merge pull request #13120 from Pdoijode/ospf-virtual-link-crash
ospfd: Fix for vitual-link crash in signal handler
Jafar Al-Gharaibeh [Wed, 29 Mar 2023 04:17:03 +0000 (23:17 -0500)]
Merge pull request #13132 from donaldsharp/use_zebra_vrf_lookup_by_id
zebra: Use zebra_vrf_lookup_by_id when we can
Isabella de Leon [Tue, 28 Mar 2023 23:18:59 +0000 (16:18 -0700)]
isisd: Add PDU drop counter to "show isis summary"
Adding a new drop counters section to "show isis summary".
New output:
Drop counters per PDU type:
P2P IIH: <count>
L2 LSP: <count>
L2 CSNP: <count>
L2 PSNP: <count>
...
Before:
r1# show isis summary
vrf : default
Process Id : 972
System Id : 0000.0000.0001
Up time : 00:00:48 ago
Number of areas : 1
Area TE:
Net: 49.0000.0000.0000.0001.00
TX counters per PDU type:
P2P IIH: 36
L2 LSP: 8
L2 CSNP: 12
L2 PSNP: 11
RX counters per PDU type:
P2P IIH: 37
L2 LSP: 17
L2 CSNP: 12
L2 PSNP: 6
Advertise high metrics: Disabled
...
After:
r1# show isis summary
vrf : default
Process Id : 972
System Id : 0000.0000.0001
Up time : 00:00:19 ago
Number of areas : 1
Area TE:
Net: 49.0000.0000.0000.0001.00
TX counters per PDU type:
P2P IIH: 16
L2 LSP: 2
L2 CSNP: 4
L2 PSNP: 6
LSP RXMT: 0
RX counters per PDU type:
P2P IIH: 16
L2 LSP: 5
L2 CSNP: 4
L2 PSNP: 2
Drop counters per PDU type:
P2P IIH: 2
Advertise high metrics: Disabled
...
Signed-off-by: Isabella de Leon <ideleon@microsoft.com>
Donald Sharp [Tue, 28 Mar 2023 19:49:50 +0000 (15:49 -0400)]
zebra: Use zebra_vrf_lookup_by_id when we can
Let's make this as consistent as is possible.
Signed-off-by: Donald Sharp <sharpd@nvidia.com>
Donatas Abraitis [Tue, 28 Mar 2023 16:14:27 +0000 (19:14 +0300)]
Merge pull request #13113 from sri-mohan1/sri-mohan-ldp
ldpd: changes for code maintainability
Donatas Abraitis [Tue, 28 Mar 2023 13:18:47 +0000 (16:18 +0300)]
bgpd: Do not announce routes immediatelly on filter updates
If we set `bgp route-map delay-timer X`, we should ignore starting to announce
routes immediately, and wait for delay timer to expire (or ignore at all if set
to zero).
f1aa49293a4a8302b70989aaa9ceb715385c3a7e broke this because we always sent
route refresh and on receiving BoRR before sending back EoRR.
Let's get fix this.
Signed-off-by: Donatas Abraitis <donatas@opensourcerouting.org>
Russ White [Tue, 28 Mar 2023 15:21:42 +0000 (11:21 -0400)]
Merge pull request #13118 from opensourcerouting/fix/password_xfer_config
bgpd: Copy the password from the previous peer on peer_xfer_config()
Russ White [Tue, 28 Mar 2023 15:19:08 +0000 (11:19 -0400)]
Merge pull request #13123 from donaldsharp/fix_route_map_name
bgpd: Fix debug output for route-map names when using a unsuppress-map
Russ White [Tue, 28 Mar 2023 14:17:15 +0000 (10:17 -0400)]
Merge pull request #13117 from donaldsharp/assert_unneeded
Assert unneeded
Donald Sharp [Mon, 27 Feb 2023 23:28:59 +0000 (18:28 -0500)]
vtysh: Exit with first received error code when forking
vtysh -f forks. Gather the return codes and report the first
failed return code.
Signed-off-by: Donald Sharp <sharpd@nvidia.com>
Quentin Young [Fri, 19 Nov 2021 21:03:02 +0000 (16:03 -0500)]
vtysh: use fork() workflow for -f too
It was being used for -b only; we should be able to use it for -f as
well.
This also merges the codepaths for -b and -f since they have no real
functional difference.
Signed-off-by: Quentin Young <qlyoung@nvidia.com>
Mark Stapp [Thu, 21 Oct 2021 13:21:35 +0000 (13:21 +0000)]
vtysh: use daemon type and handle multi-instance types
To handle multi-instance daemons (ospf, e.g.), each forked
vtysh handles all of the instances of a daemon type.
Signed-off-by: Mark Stapp <mstapp@nvidia.com>
Quentin Young [Wed, 15 Sep 2021 23:00:41 +0000 (19:00 -0400)]
vtysh, doc: add doc & help text for -t/--timestamp
Signed-off-by: Quentin Young <qlyoung@nvidia.com>
Quentin Young [Tue, 14 Sep 2021 17:14:25 +0000 (13:14 -0400)]
vtysh: fork() on boot
When using -b flag to apply config to all running daemons, fork a copy
of vtysh for each daemon we need to configure instead of doing them one
at a time. This is about N times faster when you have N daemons.
Signed-off-by: Quentin Young <qlyoung@nvidia.com>
mergeme
Donald Sharp [Tue, 28 Feb 2023 18:26:10 +0000 (18:26 +0000)]
lib: Remove getopt.c and getopt1.c
Why do we need getopt code that is standard in everything
that we compile against?
Signed-off-by: Donald Sharp <sharpd@nvidia.com>
Donald Sharp [Tue, 28 Feb 2023 18:19:52 +0000 (18:19 +0000)]
bgpd: Remove set but unused variables
Found by clang 15.
Signed-off-by: Donald Sharp <sharpd@nvidia.com>
Donald Sharp [Tue, 28 Mar 2023 11:47:22 +0000 (07:47 -0400)]
bgpd: Fix debug output for route-map names when using a unsuppress-map
Log is printing this with this config:
2023-03-28 07:36:47.007 [DEBG] bgpd: [Q9J6Z-09HRR] 192.168.119.120 [Update:SEND] 1.2.3.33/32 is filtered by route-map '(null)'
Here's the config:
address-family ipv4 unicast
network 1.2.3.33/32
network 1.2.3.34/32
aggregate-address 1.2.3.0/24 summary-only
redistribute table 33 route-map foo
neighbor 192.168.119.120 route-map DENY in
neighbor 192.168.119.120 unsuppress-map UNSUPPRESS
ip prefix-list UNSUPPRESS seq 5 permit 1.2.3.4/32
ip prefix-list UNSUPPRESS seq 10 permit 1.2.3.5/32
ip prefix-list UNSUPPRESS seq 15 permit 1.2.3.6/32
Signed-off-by: Donald Sharp <sharpd@nvidia.com>
Donald Sharp [Tue, 28 Mar 2023 10:35:19 +0000 (06:35 -0400)]
Merge pull request #13119 from mjstapp/fix_mgmt_proto_makefile
build: clean up mgmtd lib protobuf make syntax
Pooja Jagadeesh Doijode [Mon, 27 Mar 2023 17:31:00 +0000 (10:31 -0700)]
ospfd: Fix for vitual-link crash in signal handler
Whenever OSPF virtual-link is created, a virtual interface is
associated with it. Name of the virtual interface is derived by
combining "VLINK" string with the value of vlink_count, which is a global
variable.
Problem:
Consider a scenario where 2 virtual links A and B are created in OSPF with
virtual interfaces VLINK0 and VLINK1 respectively. When virtual-link A is unconfigured
and reconfigured, new interface name derived for it will be VLINK1, which is already
associated with virtual-link B. Due to this, both virtual-links A and B will
point to the same interface, VLINK1.
During FRR restart when signal handler is called, OSPF goes through all the virtual
links and deletes the interface(oi) associated with it. During the deletion of interface
for virtual-link B,it accesses the interface which was deleted already(which was deleted
during deletion of virual-link A) and whose fields were set to NULL. This
leads to OSPF crash.
Fixed it by not decrementing vlink_count during unconfig/deletion for virtual-link.
Signed-off-by: Pooja Jagadeesh Doijode <pdoijode@nvidia.com>
Mark Stapp [Mon, 27 Mar 2023 20:44:27 +0000 (16:44 -0400)]
build: clean up mgmtd lib protobuf make syntax
Fix the makefile rules for the new mgmtd lib module that's
generated from a protobuf spec file.
Signed-off-by: Mark Stapp <mjs@labn.net>
Donatas Abraitis [Mon, 27 Mar 2023 19:03:03 +0000 (22:03 +0300)]
bgpd: Copy the password from the previous peer on peer_xfer_config()
We copy the password only if an existing peer structure didn't have it.
But it might be the case when it exists, and we skip here.
Signed-off-by: Donatas Abraitis <donatas@opensourcerouting.org>
Donatas Abraitis [Mon, 27 Mar 2023 18:55:58 +0000 (21:55 +0300)]
Merge pull request #13086 from donaldsharp/suppress_fib_pending
bgpd: Ensure suppress-fib-pending works with network statements
Donald Sharp [Mon, 27 Mar 2023 12:09:42 +0000 (08:09 -0400)]
mgmtd: Remove unnecessary asserts
event_add_XXXX functions have no failure path where
if you pass in a double event pointer that it could
return without setting the pointer. As such these
asserts make no sense and are unnecessary
Signed-off-by: Donald Sharp <sharpd@nvidia.com>
Donald Sharp [Mon, 27 Mar 2023 12:08:36 +0000 (08:08 -0400)]
lib: Remove unneeded asserts in mgmt code
event_add_XXXX functions have no failure path where
if you pass in a double event pointer that it could
return without setting the pointer. As such these
asserts make no sense and are unnecessary
Signed-off-by: Donald Sharp <sharpd@nvidia.com>
Donatas Abraitis [Mon, 27 Mar 2023 10:45:00 +0000 (13:45 +0300)]
Merge pull request #12931 from SaiGomathiN/yang
pim6d: custom error-message for non-multicast groups
sri-mohan1 [Mon, 27 Mar 2023 06:57:01 +0000 (12:27 +0530)]
ldpd: changes for code maintainability
these changes are for improving the code maintainability and readability
Signed-off-by: sri-mohan1 <sri.mohan@samsung.com>
nguggarigoud [Tue, 17 Jan 2023 06:34:06 +0000 (22:34 -0800)]
tests: [topojson] Update assert/error messages
Few assert/error messages are updated for test
scripts for better debugging.
Signed-off-by: nguggarigoud <nguggarigoud@vmware.com>
Donald Sharp [Sun, 26 Mar 2023 12:21:31 +0000 (08:21 -0400)]
Merge pull request #13084 from opensourcerouting/fix/bgp_vrf_md5_password
bgpd: Set md5 TCP socket option for outgoing connections on listener
Donald Sharp [Sun, 26 Mar 2023 12:20:33 +0000 (08:20 -0400)]
Merge pull request #13101 from opensourcerouting/fix/bindir_for_frr-reload
tools: Set correct directory of vtysh for frr-reload.py
Donald Sharp [Sat, 25 Mar 2023 16:57:00 +0000 (12:57 -0400)]
Merge pull request #13108 from opensourcerouting/clippy-string-warn
lib: improve clippy behavior with invalid input
David Lamparter [Sat, 25 Mar 2023 03:34:35 +0000 (12:34 +0900)]
lib/clippy: bail out on newline inside string
While C compilers will generally process strings across lines, we really
don't want that. I rather treat this as the indication of the typo it
probably is warn about it than support this odd C edge case.
Signed-off-by: David Lamparter <equinox@opensourcerouting.org>
David Lamparter [Sat, 25 Mar 2023 03:33:14 +0000 (12:33 +0900)]
lib/clippy: don't SEGV on invalid tokens in DEFPY
The token value can be NULL if we run into something that failed to
parse. Throw a Python exception rather than SEGV.
Signed-off-by: David Lamparter <equinox@opensourcerouting.org>
Jafar Al-Gharaibeh [Fri, 24 Mar 2023 18:48:53 +0000 (13:48 -0500)]
Merge pull request #12953 from donaldsharp/struct_event
Struct event
Donatas Abraitis [Thu, 23 Mar 2023 18:55:14 +0000 (20:55 +0200)]
tools: Set correct directory of vtysh for frr-reload.py
Before it was setting SDIR, which is /usr/lib/frr, but the vtysh binary is put
under bindir (which is /usr/local by default). And running `/usr/lib/frr/frr reload`
failed.
Signed-off-by: Donatas Abraitis <donatas@opensourcerouting.org>
Donald Sharp [Fri, 24 Mar 2023 14:23:18 +0000 (10:23 -0400)]
Merge pull request #13093 from manojvn/ospf_mem_leaks
ospfd: Fix for memory leak issue in ospf related to flood_reduction tests.
Donald Sharp [Fri, 24 Mar 2023 14:22:48 +0000 (10:22 -0400)]
Merge pull request #13100 from opensourcerouting/fix/bgp_cap_llgr_length_check
bgpd: Check 7 bytes for Long-lived Graceful-Restart capability
Donatas Abraitis [Fri, 24 Mar 2023 07:55:23 +0000 (09:55 +0200)]
bgpd: Check 7 bytes for Long-lived Graceful-Restart capability
It's not 4 bytes, it was assuming the same as Graceful-Restart tuples.
LLGR has more 3 bytes (Long-lived Stale Time).
Signed-off-by: Donatas Abraitis <donatas@opensourcerouting.org>
mobash-rasool [Fri, 24 Mar 2023 13:03:05 +0000 (18:33 +0530)]
Merge pull request #13088 from donaldsharp/pim_use_after
pimd: Fix use after free issue for ifp's moving vrfs
Donatas Abraitis [Fri, 24 Mar 2023 12:38:47 +0000 (14:38 +0200)]
bgpd: Allow self next-hop if `bgp allow-martian-nexthop` is enabled
For instance, if we receive the routes from the peer with the next-hop as me,
but those routes shares the same network, we can fake the next-hop.
Signed-off-by: Donatas Abraitis <donatas@opensourcerouting.org>
Donald Sharp [Fri, 24 Mar 2023 12:41:11 +0000 (08:41 -0400)]
Merge pull request #13094 from loganaden/master
mgmtd: Fix fd leak.
Donald Sharp [Thu, 23 Mar 2023 11:37:28 +0000 (07:37 -0400)]
*: Fixup formatting issues due to reordering
All the event changes exposed a bunch of places where
we were not properly following our standards. Just
clean them up in one big fell swoop.
Signed-off-by: Donald Sharp <sharpd@nvidia.com>
Donald Sharp [Tue, 7 Mar 2023 19:22:48 +0000 (14:22 -0500)]
*: Convert event.h to frrevent.h
We should probably prevent any type of namespace collision
with something else.
Signed-off-by: Donald Sharp <sharpd@nvidia.com>
Donald Sharp [Tue, 7 Mar 2023 19:14:41 +0000 (14:14 -0500)]
*: Convert `struct event_master` to `struct event_loop`
Let's find a better name for it.
Signed-off-by: Donald Sharp <sharpd@nvidia.com>
Donald Sharp [Sat, 4 Mar 2023 14:14:52 +0000 (09:14 -0500)]
*: Convert thread_master_XXX functions to event_master_XXX
Signed-off-by: Donald Sharp <sharpd@nvidia.com>
Donald Sharp [Sun, 25 Dec 2022 15:26:52 +0000 (10:26 -0500)]
*: Convert THREAD_XXX macros to EVENT_XXX macros
Signed-off-by: Donald Sharp <sharpd@nvidia.com>
Donald Sharp [Sun, 11 Dec 2022 16:39:09 +0000 (11:39 -0500)]
lib, zebra: Convert THREAD_TIMER_STRLEN to EVENT_TIMER_STRLEN
Signed-off-by: Donald Sharp <sharpd@nvidia.com>
Donald Sharp [Sun, 11 Dec 2022 16:36:01 +0000 (11:36 -0500)]
lib: change cpu_thread_history to cpu_event_history
Signed-off-by: Donald Sharp <sharpd@nvidia.com>
Donald Sharp [Sun, 11 Dec 2022 16:33:30 +0000 (11:33 -0500)]
lib: convert xref_threadsched to xref_eventsched
Signed-off-by: Donald Sharp <sharpd@nvidia.com>
Donald Sharp [Sun, 11 Dec 2022 16:27:26 +0000 (11:27 -0500)]
lib: convert thread internal lists to event internal lists
Signed-off-by: Donald Sharp <sharpd@nvidia.com>
Donald Sharp [Sun, 11 Dec 2022 16:20:40 +0000 (11:20 -0500)]
*: Convert struct thread_master to struct event_master and it's ilk
Convert the `struct thread_master` to `struct event_master`
across the code base.
Signed-off-by: Donald Sharp <sharpd@nvidia.com>
Donald Sharp [Sun, 11 Dec 2022 15:51:58 +0000 (10:51 -0500)]
*: Convert a bunch of thread_XX to event_XX
Convert these functions:
thread_getrusage
thread_cmd_init
thread_consumed_time
thread_timer_to_hhmmss
thread_is_scheduled
thread_ignore_late_timer
Signed-off-by: Donald Sharp <sharpd@nvidia.com>
Donald Sharp [Sun, 11 Dec 2022 15:39:12 +0000 (10:39 -0500)]
*: Convert thread_should_yield and thread_set_yield_time
Convert thread_should_yield and thread_set_yield_time
to event_should_yield and event_set_yield_time
Signed-off-by: Donald Sharp <sharpd@nvidia.com>
Donald Sharp [Sun, 11 Dec 2022 13:19:00 +0000 (08:19 -0500)]
*: Convert thread_timer_remain_XXX to event_timer_remain_XXX
Signed-off-by: Donald Sharp <sharpd@nvidia.com>
Donald Sharp [Sun, 11 Dec 2022 13:06:25 +0000 (08:06 -0500)]
*: Convert thread_execute to event_execute
Signed-off-by: Donald Sharp <sharpd@nvidia.com>
Donald Sharp [Sun, 11 Dec 2022 12:55:02 +0000 (07:55 -0500)]
lib: Convert THREAD_YIELD_TIME_SLOT to EVENT_YIELD_TIME_SLOT
Signed-off-by: Donald Sharp <sharpd@nvidia.com>
Donald Sharp [Sun, 11 Dec 2022 12:51:16 +0000 (07:51 -0500)]
*: Convert thread_fetch and thread_call to event_fetch and event_call
Signed-off-by: Donald Sharp <sharpd@nvidia.com>
Donald Sharp [Sat, 10 Dec 2022 14:28:31 +0000 (09:28 -0500)]
lib: Convert thread_type to event_type and make an enum
a) Convert thread types to a enum
b) Convert MTYPES to EVENT instead of THREAD
Signed-off-by: Donald Sharp <sharpd@nvidia.com>
Donald Sharp [Sat, 10 Dec 2022 14:08:37 +0000 (09:08 -0500)]
*: Convert thread_cancelXXX to event_cancelXXX
Modify the code base so that thread_cancel becomes event_cancel
Signed-off-by: Donald Sharp <sharpd@nvidia.com>
Donald Sharp [Fri, 20 May 2022 18:19:08 +0000 (14:19 -0400)]
*: Convert thread_add_XXX functions to event_add_XXX
Signed-off-by: Donald Sharp <sharpd@nvidia.com>
Donald Sharp [Tue, 1 Mar 2022 21:18:12 +0000 (16:18 -0500)]
*: Rename `struct thread` to `struct event`
Effectively a massive search and replace of
`struct thread` to `struct event`. Using the
term `thread` gives people the thought that
this event system is a pthread when it is not
Signed-off-by: Donald Sharp <sharpd@nvidia.com>
Donald Sharp [Mon, 28 Feb 2022 15:40:31 +0000 (10:40 -0500)]
*: Rename thread.[ch] to event.[ch]
This is a first in a series of commits, whose goal is to rename
the thread system in FRR to an event system. There is a continual
problem where people are confusing `struct thread` with a true
pthread. In reality, our entire thread.c is an event system.
In this commit rename the thread.[ch] files to event.[ch].
Signed-off-by: Donald Sharp <sharpd@nvidia.com>
Donald Sharp [Thu, 23 Mar 2023 23:57:08 +0000 (19:57 -0400)]
Merge pull request #13065 from rgirada/ospf_abr_summary
Loganaden Velvindron [Thu, 23 Mar 2023 19:07:06 +0000 (23:07 +0400)]
mgmtd: Fix fd leak.
Close fd before returning to avoid leaks.
Signed-off-by: Loganaden Velvindron <logan@cyberstorm.mu>
Manoj Naragund [Thu, 23 Mar 2023 12:59:38 +0000 (05:59 -0700)]
ospfd: Fix for memory leak issue in ospf related to flood_reduction tests.
Problem:
Multiple memory leaks after pr12366
RCA:
ospf_lsa_unlock was not happening for the few of the LSAs in
ospf_lsa_refresh_walker after pr12366 due to which memory
related to lsas was leaking.
Fix:
Moved the ospf_lsa_unlock outside if check.
Signed-off-by: Manoj Naragund <mnaragund@vmware.com>
Donatas Abraitis [Thu, 23 Mar 2023 12:08:29 +0000 (14:08 +0200)]
Merge pull request #13074 from donaldsharp/hash_clean_and_free
*: Add a hash_clean_and_free() function
Donald Sharp [Thu, 23 Mar 2023 11:50:35 +0000 (07:50 -0400)]
Merge pull request #13078 from opensourcerouting/fix/set_distance_zero
bgpd: Do not allow setting `set distance` via route-maps to zero
Donald Sharp [Wed, 22 Mar 2023 22:24:56 +0000 (18:24 -0400)]
pimd: Fix use after free issue for ifp's moving vrfs
We have this valgrind trace:
==1125== Invalid read of size 4
==1125== at 0x170A7D: pim_if_delete (pim_iface.c:203)
==1125== by 0x170C01: pim_if_terminate (pim_iface.c:80)
==1125== by 0x174F34: pim_instance_terminate (pim_instance.c:68)
==1125== by 0x17535B: pim_vrf_terminate (pim_instance.c:260)
==1125== by 0x1941CF: pim_terminate (pimd.c:161)
==1125== by 0x1B476D: pim_sigint (pim_signals.c:44)
==1125== by 0x4910C22: frr_sigevent_process (sigevent.c:133)
==1125== by 0x49220A4: thread_fetch (thread.c:1777)
==1125== by 0x48DC8E2: frr_run (libfrr.c:1222)
==1125== by 0x15E12A: main (pim_main.c:176)
==1125== Address 0x6274d28 is 1,192 bytes inside a block of size 1,752 free'd
==1125== at 0x48369AB: free (in /usr/lib/x86_64-linux-gnu/valgrind/vgpreload_memcheck-amd64-linux.so)
==1125== by 0x174FF1: pim_vrf_delete (pim_instance.c:181)
==1125== by 0x4925480: vrf_delete (vrf.c:264)
==1125== by 0x4925480: vrf_delete (vrf.c:238)
==1125== by 0x49332C7: zclient_vrf_delete (zclient.c:2187)
==1125== by 0x4934319: zclient_read (zclient.c:4003)
==1125== by 0x492249C: thread_call (thread.c:2008)
==1125== by 0x48DC8D7: frr_run (libfrr.c:1223)
==1125== by 0x15E12A: main (pim_main.c:176)
==1125== Block was alloc'd at
==1125== at 0x4837B65: calloc (in /usr/lib/x86_64-linux-gnu/valgrind/vgpreload_memcheck-amd64-linux.so)
==1125== by 0x48E80AF: qcalloc (memory.c:116)
==1125== by 0x1750DA: pim_instance_init (pim_instance.c:90)
==1125== by 0x1750DA: pim_vrf_new (pim_instance.c:161)
==1125== by 0x4924FDC: vrf_get (vrf.c:183)
==1125== by 0x493334C: zclient_vrf_add (zclient.c:2157)
==1125== by 0x4934319: zclient_read (zclient.c:4003)
==1125== by 0x492249C: thread_call (thread.c:2008)
==1125== by 0x48DC8D7: frr_run (libfrr.c:1223)
==1125== by 0x15E12A: main (pim_main.c:176)
and you do this series of events:
a) Create a vrf, put an interface in it
b) Turn on pim on that interface and turn on pim in that vrf
c) Delete the vrf
d) Do anything with the interface, in this case shutdown the system
The move of the interface to a new vrf is leaving the pim_ifp->pim pointer pointing
at the old pim instance, which was just deleted, so the instance pointer was freed.
Let's clean up the pim pointer in the interface pointer as well.
Signed-off-by: Donald Sharp <sharpd@nvidia.com>
Jafar Al-Gharaibeh [Wed, 22 Mar 2023 17:37:14 +0000 (12:37 -0500)]
Merge pull request #13059 from FRRouting/dev/mgmtd
Introduce the centralized management daemon
Donald Sharp [Wed, 22 Mar 2023 15:35:28 +0000 (11:35 -0400)]
bgpd: Ensure suppress-fib-pending works with network statements
The flag for telling BGP that a route is expected to be installed
first before notifying a peer was always being set upon receipt
of a path that could be accepted as bestpath. This is not correct:
imagine that you have a peer sending you a route and you have a
network statement that covers the same route. Irrelevant if the
network statement would win the flag on the dest was being set
in bgp_update. Thus you could get into a situation where
the network statement path wins but since the flag is set on
the node, it will never be announced to a peer.
Let's just move the setting of the flag into bgp_zebra_announce
and _withdraw. In _announce set the flag to TRUE when suppress-fib
is enabled. In _withdraw just always unset the flag as that a withdrawal
does not need to wait for rib removal before announcing. This will
cover the case when a network statement is added after the route has
been learned from a peer.
Signed-off-by: Donald Sharp <sharpd@nvidia.com>
Donatas Abraitis [Wed, 22 Mar 2023 13:17:30 +0000 (15:17 +0200)]
bgpd: Set TCP_MD5 for outgoing connections when `password` is set
If configuring `neighbor password` under VRF (not default), the session
will never be established.
Before setting TCP_MD5 for the connection fd, we need to enable this on the
accept direction as well (listener).
Signed-off-by: Donatas Abraitis <donatas@opensourcerouting.org>
Donatas Abraitis [Wed, 22 Mar 2023 12:15:13 +0000 (14:15 +0200)]
tests: Check if BGP peering with MD5 per-VRF works correctly
Signed-off-by: Donatas Abraitis <donatas@opensourcerouting.org>
Donatas Abraitis [Wed, 22 Mar 2023 10:47:35 +0000 (12:47 +0200)]
Merge pull request #13075 from donaldsharp/bgp_route_debugs
bgpd: Add vrf name and peer name to some bgp debugs
scotchung [Wed, 22 Mar 2023 08:51:07 +0000 (16:51 +0800)]
some threads will still get vrf, when a new entry would created with insufficient data, and so it may crash.
Donatas Abraitis [Wed, 22 Mar 2023 07:23:10 +0000 (09:23 +0200)]
Merge pull request #13080 from chiragshah6/fdev2
zebra: add evpn isDetectionFreeze to json output
Christian Hopps [Mon, 20 Mar 2023 23:28:42 +0000 (19:28 -0400)]
lib: mgmtd: fix build warnings (as error)
Signed-off-by: Christian Hopps <chopps@labn.net>
Christian Hopps [Mon, 20 Mar 2023 19:12:56 +0000 (15:12 -0400)]
tests: apply frrbot style requirements
Signed-off-by: Christian Hopps <chopps@labn.net>
Christian Hopps [Mon, 20 Mar 2023 19:07:44 +0000 (15:07 -0400)]
lib: staticd: vtysh: apply frrbot style requirements
Signed-off-by: Christian Hopps <chopps@labn.net>
Pushpasis Sarkar [Tue, 14 Mar 2023 10:36:06 +0000 (03:36 -0700)]
lib, mgmtd: Add few fixes for commit-check and rollback
This commit contains fixes for the following issues found
- 'mgmt commit check' issued through 'vtysh -f' was actually commtting the changeset.
- On config validation failure backend, mgmtd was not passing the correct error-reason
to frontend.
- 'mgmt rollback ...' was reverting the change on backend, but config on mgmtd daemon
remains intact
Signed-off-by: Pushpasis Sarkar <pushpasis@gmail.com>
Christian Hopps [Wed, 8 Mar 2023 22:11:43 +0000 (17:11 -0500)]
mgmtd: lib: utilize msglib constructed from the removed code
Signed-off-by: Christian Hopps <chopps@labn.net>
Christian Hopps [Wed, 8 Mar 2023 22:11:00 +0000 (17:11 -0500)]
lib: new message library for mgmtd client and adapters
Signed-off-by: Christian Hopps <chopps@labn.net>
Christian Hopps [Tue, 28 Feb 2023 04:57:17 +0000 (23:57 -0500)]
staticd: handle `distance` value
Signed-off-by: Christian Hopps <chopps@labn.net>
nguggarigoud [Fri, 29 Oct 2021 11:14:33 +0000 (04:14 -0700)]
tests: Add topotests for MGMT daemon
1. MGMT daemon support in topotests.
2. Sanity tests for MGMTd.
Signed-off-by: nguggarigoud <nguggarigoud@vmware.com>
Sindhu Parvathi Gopinathan [Sat, 18 Mar 2023 18:48:34 +0000 (11:48 -0700)]
zebra: add evpn isDetectionFreeze to json output
Added "isDetectionFreeze" for show evpn json output to identify the
default and freeze permanent config.
Before fix:-
```
tor-2(config)# router bgp 65561
tor-2(config-router)# address-family l2vpn evpn
<cr>
tor-2(config-router)# address-family l2vpn evpn
tor-2(config-router-af)# dup-addr-detection freeze permanent
tor-2(config-router-af)# do show evpn
L2 VNIs: 21
L3 VNIs: 5
Advertise gateway mac-ip: No
Advertise svi mac-ip: No
Advertise svi mac: No
Duplicate address detection: Enable
Detection max-moves 5, time 180
Detection freeze permanent
EVPN MH:
mac-holdtime: 1080s, neigh-holdtime: 1080s
startup-delay: 180s, start-delay-timer: --:--:--
uplink-cfg-cnt: 0, uplink-active-cnt: 0
tor-2(config-router-af)#
tor-2(config-router-af)# do show evpn json
{
"advertiseGatewayMacip":"No",
"advertiseSviMacip":"No",
"advertiseSviMac":"No",
"numVnis":26,
"numL2Vnis":21,
"numL3Vnis":5,
"isDuplicateAddrDetection":true,
"maxMoves":5,
"detectionTime":180,
"detectionFreezeTime":0,
"macHoldtime":1080,
"neighHoldtime":1080,
"startupDelay":180,
"startupDelayTimer":"--:--:--",
"uplinkConfigCount":0,
"uplinkActiveCount":0
}
tor-2(config-router-af)#
```
After fix:-
```
cumulus@tor-1:mgmt:~$ sudo vtysh -c "show evpn json"
{
"advertiseGatewayMacip":"No",
"advertiseSviMacip":"No",
"advertiseSviMac":"No",
"numVnis":26,
"numL2Vnis":21,
"numL3Vnis":5,
"isDuplicateAddrDetection":true,
"maxMoves":5,
"detectionTime":180,
"detectionFreezeTime":0, ==> default case , i.e dad_freeze duration is 0
"isDetectionFreeze":false, ==> default case, i.e. dad_freeze disabled
"macHoldtime":1080,
"neighHoldtime":1080,
"startupDelay":180,
"startupDelayTimer":"--:--:--",
"uplinkConfigCount":0,
"uplinkActiveCount":0
}
cumulus@tor-1:mgmt:~$
tor-1(config-router-af)# dup-addr-detection freeze permanent
tor-1(config-router-af)# do show evpn json
{
"advertiseGatewayMacip":"No",
"advertiseSviMacip":"No",
"advertiseSviMac":"No",
"numVnis":26,
"numL2Vnis":21,
"numL3Vnis":5,
"isDuplicateAddrDetection":true,
"maxMoves":5,
"detectionTime":180,
"detectionFreezeTime":0, ==> dad_freeze with duration permanent
"isDetectionFreeze":true, ==> dad_freeze enabled
"macHoldtime":1080,
"neighHoldtime":1080,
"startupDelay":180,
"startupDelayTimer":"00:00:08",
"uplinkConfigCount":0,
"uplinkActiveCount":0,
"protodownReasons":[
"startupDelay"
]
}
tor-1(config-router-af)#
tor-1(config-router-af)# dup-addr-detection freeze 400
tor-1(config-router-af)#
tor-1(config-router-af)# do show evpn json
{
"advertiseGatewayMacip":"No",
"advertiseSviMacip":"No",
"advertiseSviMac":"No",
"numVnis":26,
"numL2Vnis":21,
"numL3Vnis":5,
"isDuplicateAddrDetection":true,
"maxMoves":5,
"detectionTime":180,
"detectionFreezeTime":400, ==> dad_freeze duration with numeric value
"isDetectionFreeze":true, ==> dad_freeze enabled
"macHoldtime":1080,
"neighHoldtime":1080,
"startupDelay":180,
"startupDelayTimer":"00:00:47",
"uplinkConfigCount":0,
"uplinkActiveCount":0,
"protodownReasons":[
"startupDelay"
]
}
tor-1(config-router-af)# no dup-addr-detection freeze permanent
tor-1(config-router-af)# do show evpn json
{
"advertiseGatewayMacip":"No",
"advertiseSviMacip":"No",
"advertiseSviMac":"No",
"numVnis":26,
"numL2Vnis":21,
"numL3Vnis":5,
"isDuplicateAddrDetection":true,
"maxMoves":5,
"detectionTime":180,
"detectionFreezeTime":0, ==> no dad_freeze duration
"isDetectionFreeze":false, ==> no dad_freeze enabled
"macHoldtime":1080,
"neighHoldtime":1080,
"startupDelay":180,
"startupDelayTimer":"--:--:--",
"uplinkConfigCount":0,
"uplinkActiveCount":0
}
tor-1(config-router-af)#
```
Ticket:#
3404283
Issue:
3404283
Testing: UT done
Signed-off-by: Sindhu Parvathi Gopinathan's <sgopinathan@nvidia.com>
Pushpasis Sarkar [Fri, 29 Oct 2021 17:22:42 +0000 (10:22 -0700)]
doc: Add documentation for MGMT daemon
This commit adds user documentation for the new MGMT daemon and
new FRR Management Framework.
Co-authored-by: Yash Ranjan <ranjany@vmware.com>
Co-authored-by: Abhinay Ramesh <rabhinay@vmware.com>
Co-authored-by: Ujwal P <ujwalp@vmware.com>
Signed-off-by: Pushpasis Sarkar <pushpasis@gmail.com>