Commit Graph

25309 Commits

Author SHA1 Message Date
Renato Westphal
a01b086340
Merge pull request #9338 from idryzhov/static-nb-err
staticd: replace NB checks with assert
2021-08-13 22:17:31 -03:00
Igor Ryzhov
f0010840e8
Merge pull request #9389 from mjstapp/fix_netlink_if_name_sa
zebra: interface name must be a valid string
2021-08-14 02:14:44 +03:00
Mark Stapp
e9f79fff57 zebra: interface name must be a valid string
Validate incoming netlink interface name strings.

Signed-off-by: Mark Stapp <mjs.ietf@gmail.com>
2021-08-13 16:06:07 -04:00
Igor Ryzhov
cb5eb14c52
Merge pull request #9361 from qlyoung/upstream-8857
ospf6d: JSON output for database dump show command
2021-08-13 20:10:02 +03:00
Igor Ryzhov
1523c0f9ee
Merge pull request #9371 from donaldsharp/zebra_evpn_getl
zebra: Ensure stream is long enough
2021-08-13 14:06:37 +03:00
Quentin Young
6ddb368d6b ospf6d: JSON output for database dump show command
Added missing output to "show ipv6 ospf6 databse dump json" VTY shell
command.

Co-authored-by: David Schweizer dschweizer@opensourcerouting.org
Signed-off-by: Quentin Young <qlyoung@nvidia.com>
2021-08-12 16:26:01 -04:00
Quentin Young
0c0830c599 lib: add frrstr_hex to hexdump buffers
Signed-off-by: Quentin Young <qlyoung@nvidia.com>
2021-08-12 16:25:57 -04:00
Donald Sharp
a876da9b08
Merge pull request #9374 from mjstapp/fix_nhg_add_leak
zebra: clean up nhg allocations in error path
2021-08-12 15:34:07 -04:00
Donald Sharp
86d87c5352 zebra: Ensure stream is long enough
In zebra_evpn_proc_remote_nh if we do not pass in a long
enough stream, the stream reads will fail.  Ensure that
we have enough data.

Signed-off-by: Donald Sharp <sharpd@nvidia.com>
2021-08-12 15:29:47 -04:00
Mark Stapp
1722cef455
Merge pull request #9304 from donaldsharp/zebra_random_stuff
Zebra random stuff
2021-08-12 10:16:46 -04:00
Mark Stapp
86ba19b60f
Merge pull request #9376 from idryzhov/doc-fixes
a couple of ospf6 doc fixes
2021-08-12 08:49:41 -04:00
Quentin Young
4596518981
Merge pull request #9370 from opensourcerouting/rpm-keep-config-master
redhat: Install frr.conf only if no per daemon config exists
2021-08-11 12:36:36 -04:00
Igor Ryzhov
1e29f449bc doc: fix ospf6 nssa area command description
Currently the NSSA support is a separate section, but it should actually
be a description of the corresponding CLI command.

Signed-off-by: Igor Ryzhov <iryzhov@nfware.com>
2021-08-11 18:22:06 +03:00
Igor Ryzhov
df175bc89d doc: move ospf6 debugging section to the end of the doc
Currently the debugging section is placed in the middle of the section
with various configuration commands.

Signed-off-by: Igor Ryzhov <iryzhov@nfware.com>
2021-08-11 18:14:53 +03:00
Igor Ryzhov
7e5e3c1919 doc: move ospf6 area commands to the appropriate section
Signed-off-by: Igor Ryzhov <iryzhov@nfware.com>
2021-08-11 18:00:28 +03:00
Mark Stapp
fd99142ab7 zebra: clean up nhg allocations in error path
Clean up allocated nhgs in error path in zread_nhg_add().

Signed-off-by: Mark Stapp <mjs.ietf@gmail.com>
2021-08-11 10:41:53 -04:00
Igor Ryzhov
6a9ac96f2c
Merge pull request #9363 from mobash-rasool/ospfv2-bug-fixes-04
ospfd: ospf redistribute originating LSA internal connected routes
2021-08-11 16:49:52 +03:00
Donald Sharp
c472a97080
Merge pull request #9367 from mjstapp/fix_rt_netlink_af
zebra: ignore unknown address-family in netlink route msg
2021-08-11 08:11:39 -04:00
Martin Winter
328b7121ee
redhat: Install frr.conf only if no per daemon config exists
Install frr.conf template as a template file, but only install it
as a config file if no per daemon file exists. This will use the
integrated config with new setups, but keeps the per-daemon config
for existing users

Signed-off-by: Martin Winter <mwinter@opensourcerouting.org>
2021-08-11 12:03:29 +02:00
Mark Stapp
854571290b
Merge pull request #9330 from idryzhov/vtysh-srv6
vtysh: fix daemon for srv6 commands
2021-08-10 16:06:29 -04:00
Mobashshera Rasool
e474c14373 ospfd: ospf redistribute originating LSA internal connected routes
When OSPF is disabled on interface and enabled again, the IP which is
not matching the prefix-list is getting originated as External LSA.

Fixes: #9362

Signed-off-by: Mobashshera Rasool <mrasool@vmware.com>
2021-08-10 09:41:14 -07:00
Mark Stapp
deb28338de zebra: ignore unknown address-family in netlink route msg
Ignore AFs we don't handle in incoming netlink route
updates.

Signed-off-by: Mark Stapp <mjs.ietf@gmail.com>
2021-08-10 11:44:08 -04:00
Sri Mohana Singamsetty
dd4c59d79a
Merge pull request #9236 from AnuradhaKaruppiah/v6-nh-rmac
zebra: use a separate dummy prefix for referencing v6 nexthops
2021-08-10 08:20:55 -07:00
Donald Sharp
bde0fd77d9
Merge pull request #9348 from dlqs/consecutive
lib: lua: consecutive script calls
2021-08-10 10:11:35 -04:00
Russ White
227ffdfe61
Merge pull request #9290 from ranjanyash54/ecmp_delete_route
ospf6d: Check the cost only when asbr_present for ECMP routes
2021-08-10 09:57:52 -04:00
Russ White
ec179bcbba
Merge pull request #9300 from donaldsharp/ospf_header
ospfd: Cleanup ospf_interface.h to work with our standards
2021-08-10 09:50:50 -04:00
Russ White
800ac2d7b5
Merge pull request #9328 from donaldsharp/peer_deletion
bgpd: bgp_packet_process_error can access peer after deletion
2021-08-10 09:33:58 -04:00
Russ White
28b946f9e5
Merge pull request #9343 from ton31337/fix/dont_convert_by_default_to_alias
bgpd: Fix bgp routes filtering by [l]community-list
2021-08-10 09:33:08 -04:00
Igor Ryzhov
bdb7b7c5d9
Merge pull request #9321 from donaldsharp/no_leak_re
zebra: Prevent memory leak if route is rejected early
2021-08-10 11:39:30 +03:00
Christian Hopps
cb04c8e906
Merge pull request #9219 from mobash-rasool/ospfv2-bug-fixes
tools: Add ospfv2 and ospfv3 commands in support bundle
2021-08-10 03:14:43 -04:00
Donatas Abraitis
947a27f5ae tests: Make sure BGP filters by community lists work with community alias
Signed-off-by: Donatas Abraitis <donatas.abraitis@gmail.com>
2021-08-10 09:46:16 +03:00
Donatas Abraitis
f4dd829679 bgpd: BGP extended [l]community-list regexp match must work with aliases
We have to convert BGP alias to numerical format to compare in regexp.

Signed-off-by: Donatas Abraitis <donatas.abraitis@gmail.com>
2021-08-10 09:46:15 +03:00
Donald Lee
5141fd7f8e doc: fix unrelated typo
Signed-off-by: Donald Lee <dlqs@gmx.com>
2021-08-10 07:35:32 +08:00
Donald Lee
c42f38b8df doc: Update for consecutive frrscript_call
Signed-off-by: Donald Lee <dlqs@gmx.com>
2021-08-10 07:35:32 +08:00
Donald Lee
2ed598ba6b lib: Enable consecutive frrscript_call
Previous:
 - frrscript_load: push Lua function onto stack
 - frrscript_call: calls Lua function

Now:
 - frrscript_load: checks Lua function
 - frrscript_call: pushes and calls Lua function (first clear the stack)

So now we just need one frrscript_load for consecutive frrscript_call.
frrscript_call does not recompile or reload the script file, it just
keys it from the global Lua table (where it should already be).

Signed-off-by: Donald Lee <dlqs@gmx.com>
2021-08-10 07:35:32 +08:00
Donald Lee
80bfe93670 tests: Add test consecutive frrscript_call
Signed-off-by: Donald Lee <dlqs@gmx.com>
2021-08-10 07:28:39 +08:00
Mark Stapp
c123e9df54
Merge pull request #9299 from donaldsharp/zebra_should_continue
Zebra should continue
2021-08-09 13:16:10 -04:00
Quentin Young
edc6ea2ec5
Merge pull request #9273 from dlqs/luadofilefix
lib: Fix dead code from lua_dofile
2021-08-09 09:55:35 -04:00
Donald Sharp
38c764dde4 zebra: Properly note add/update for rib_add_multipath_nhe
When calling rib_add_multipath_nhe ensure that we have
well aligned return codes that mean something so that
interersted parties can properly handle the situation.

Signed-off-by: Donald Sharp <sharpd@nvidia.com>
2021-08-09 08:06:33 -04:00
Donald Sharp
f94a7703c0 zebra: Prevent memory leak if route is rejected early
When receiving a route via zapi, if the route is rejected
there exists a code path where we would not free the corresponding
re created.

Signed-off-by: Donald Sharp <sharpd@nvidia.com>
2021-08-09 07:55:07 -04:00
Igor Ryzhov
aaddf974c5 staticd: replace NB checks with assert
If there's no route table in a VRF, it's a hard bug - staticd will crash
on any subsequent action with this route anyway. So let's assert the
existence of a route table instead of returning an unrecoverable error.

Signed-off-by: Igor Ryzhov <iryzhov@nfware.com>
2021-08-09 12:48:38 +03:00
Donatas Abraitis
d04e7788c1
Merge pull request #9324 from donaldsharp/bgp_info_cmp
bgpd: Store distance received from a redistribute statement
2021-08-09 10:36:43 +03:00
Donatas Abraitis
4de721ee97
Merge pull request #9305 from proelbtn/patch-1
bgpd: fix typo in ensure_vrf_tovpn_sid
2021-08-09 10:35:10 +03:00
Donatas Abraitis
e885e97d87
Merge pull request #9325 from anlancs/fix-lib-warning
lib: Fix coverity warning of return value
2021-08-09 10:34:38 +03:00
Igor Ryzhov
ee78534054 vtysh: fix daemon for srv6 commands
All these commands are zebra-only. We shouldn't send them to pathd.

Signed-off-by: Igor Ryzhov <iryzhov@nfware.com>
2021-08-08 22:41:10 +03:00
Donald Sharp
1fae5c8e28 bgpd: bgp_packet_process_error can access peer after deletion
in bgp_io.c upon packet read of some error we are storing
the peer pointer on a thread to call bgp_packet_process_error.
In this case an event is generated that is not guaranteed to be
run immediately.  It could come in *after* the peer data structure
is deleted and as such we now are writing into memory that we
no longer possibly own as a peer data structure.

Modify the code so that the peer can track the thread associated
with the read error and then it can wisely kill that thread
when deleting the peer data structure.

Signed-off-by: Donald Sharp <sharpd@nvidia.com>
2021-08-08 08:23:24 -04:00
Donald Sharp
2570a9f165
Merge pull request #8262 from reubendowle/fixes/nhrp-misc-fixes
nhrp misc fixes
2021-08-08 07:27:41 -04:00
Donald Sharp
a66413a53b
Merge pull request #8870 from anlancs/master-fix-reload-service
tools: add "vni" to oneline list
2021-08-08 07:21:10 -04:00
anlan_cs
4b0d126794 lib: Fix coverity warning of return value
Suppress coverity warning on unchecked str2sockunion's return value.

Signed-off-by: anlan_cs <anlan_cs@tom.com>
2021-08-07 21:57:55 -04:00
Donald Sharp
957f74c302 bgpd: Store distance received from a redistribute statement
When bgp receives the admin distance from a redistribution statement
let's store that distance for later usage.

Signed-off-by: Donald Sharp <sharpd@nvidia.com>
2021-08-07 20:27:45 -04:00