proxmox-mirrors/mirror_frr
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_frr synced 2025-07-27 00:31:32 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
26,496 Commits 4 Branches 191 Tags 125 MiB
6e5532187f
Commit Graph

26496 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Igor Ryzhov
6e5532187f
Merge pull request #10112 from ton31337/feature/route-map_autocomplete 
lib: Use autocomplete for `route-map <name> <action> <seq>`
 2021-11-23 19:05:27 +03:00
Donatas Abraitis
8f241168b7 lib: Use autocomplete for route-map <name> <action> <seq> 
```
exit1-debian-11(config)# route-map ?
  RMAP_NAME  Route map tag
     belekas testas
```

Signed-off-by: Donatas Abraitis <donatas.abraitis@gmail.com>
 2021-11-23 16:10:10 +02:00
Igor Ryzhov
4ac61f7a2a
Merge pull request #10024 from ton31337/feature/match_ipv6_next-hop_access-list 
bgpd: match ipv6 next-hop
 2021-11-23 16:45:25 +03:00
Donatas Abraitis
390cde0afc tests: Test if match ipv6 next-hop works 
Signed-off-by: Donatas Abraitis <donatas.abraitis@gmail.com>
 2021-11-23 13:47:27 +02:00
Donatas Abraitis
bc63ba980f bgpd: Add an ability to match ipv6 next-hop by access-list 
Signed-off-by: Donatas Abraitis <donatas.abraitis@gmail.com>
 2021-11-23 13:47:26 +02:00
Donatas Abraitis
0ecdbedbf9
Merge pull request #10040 from idryzhov/ifp-vrf-id-cleanup 
*: cleanup ifp->vrf_id
 2021-11-23 11:43:48 +02:00
Donatas Abraitis
f7517a8b44 doc: Add match ipv6 next-hop ACCESS6_NAME 
Signed-off-by: Donatas Abraitis <donatas.abraitis@gmail.com>
 2021-11-23 08:27:50 +02:00
Donald Sharp
f1189d7374
Merge pull request #9919 from mobash-rasool/pim-upst-3 
pimd: STAR inherited Flag not properly set in certain scenarios
 2021-11-22 14:42:56 -05:00
Igor Ryzhov
096f7609f9 *: cleanup ifp->vrf_id 
Since f60a1188 we store a pointer to the VRF in the interface structure.
There's no need anymore to store a separate vrf_id field.

Signed-off-by: Igor Ryzhov <iryzhov@nfware.com>
 2021-11-22 20:47:23 +03:00
Donald Sharp
d32c92a4c0
Merge pull request #10057 from ton31337/fix/we_shouldn_send_LLA_for_RS 
bgpd: Do not send LLA for route-server-client peers
 2021-11-22 12:06:36 -05:00
Donald Sharp
9d5a61264a
Merge pull request #10076 from idryzhov/if-is-loopback-or-vrf 
*: unify if_is_loopback/if_is_loopback_or_vrf
 2021-11-22 12:02:21 -05:00
Quentin Young
7b532137c3
Merge pull request #10070 from idryzhov/ospf6-memcmp-cleanup 2021-11-22 09:33:52 -05:00
Donald Sharp
7a27d523aa
Merge pull request #10083 from karelvanhecke/master 
redhat: check if frr.conf already exists
 2021-11-22 09:02:49 -05:00
Donatas Abraitis
039fb41165
Merge pull request #10096 from mjstapp/fix_ted_free 
lib: use _safe iteration during link_state/ted cleanup
 2021-11-22 15:38:05 +02:00
Donald Sharp
cfbf74a9a1
Merge pull request #10088 from opensourcerouting/pim-forward-stop 
pimd: fix stale forwarding entries left around after join goes away
 2021-11-22 08:30:18 -05:00
Donatas Abraitis
e59d8139ae
Merge pull request #10102 from idryzhov/match-ip-nexthop 
bgpd, lib: fix inconsistency of match ip/ipv6 next-hop commands
 2021-11-22 15:24:33 +02:00
Donatas Abraitis
7b7d413445
Merge pull request #10103 from donaldsharp/python_exabgp_fun 
tests: Explicitly call out which version of python we need
 2021-11-22 14:08:19 +02:00
Donald Sharp
f1f0bd0911 tests: Fix tests using exabgp to explicitly call out which python to use 
There exist systems that do not explicity have a python soft-link
on their system.  Let's explicity call out which python we want
to be using with exabgp.

Signed-off-by: Donald Sharp <sharpd@nvidia.com>
 2021-11-20 19:36:40 -05:00
Igor Ryzhov
587cf8f170
Merge pull request #9683 from volta-networks/sr-minor-fixes 
ospfd, isisd: minor SR fixes
 2021-11-20 14:53:09 +03:00
Igor Ryzhov
03030106ce bgpd, lib: fix inconsistency of match ip/ipv6 next-hop commands 
For IPv4 matching, we have "match ip next-hop address A.B.C.D".
For IPv6 matching, we have "match ipv6 next-hop X:X::X:X".

To have consistency, let's add "address" keyword to IPv6 commands.
Old commands are preserved as hidden for backward compatibility.

Signed-off-by: Igor Ryzhov <iryzhov@nfware.com>
 2021-11-19 21:11:52 +03:00
Donatas Abraitis
41eec96003
Merge pull request #10097 from pguibert6WIND/ipv6_fix_ecom_list 
bgpd: support redirect import more than one route-target ipv6
 2021-11-19 14:50:01 +02:00
Igor Ryzhov
0609190219
Merge pull request #10074 from opensourcerouting/assorted-20211116 
lib/vtysh/ospf6d: assorted small bits
 2021-11-19 15:43:10 +03:00
Donald Sharp
90a215ad3f
Merge pull request #9970 from mobash-rasool/pim-upst-1 
pimd : packet processing optimization on rp change
 2021-11-19 06:19:28 -05:00
Mobashshera Rasool
62596d9a1f pimd : packet processing optimization on rp change 
Problem Statement:
==================
on rp_change, PIM processes all the upstream in a loop and for selected
upstreams PIM has to send join/prune based on the RPF changed.
join and prune packets are not getting aggregated in a single packet.

Root Cause Analysis:
====================
on pim_rp_change pim_upstream_update() gets called for selected upstreams.
This API calculates to whom it has to send join and to whom it has to
send prune via API pim_zebra_upstream_rpf_changed(). This API peprares
the upstream_switch_list list per interface and inserts the group and
sources.
Now PIM is still in the pim_upstream_update() API context, i.e PIM
is still processing the same upstream. In the last there is a
call to pim_zebra_update_all_interfaces() which processes the
upstream_switch_list list, sends the packets out and clears the list.

Fix:
====
Don't process the upstream_switch_list in the upstream context.
process all the upstreams prepare the upstream_switch_list and then
process in one go. This will club all the S,G entries.
It also saves list cleanup with respect to memory allocation and
deallocation multiple times.

Signed-off-by: Vishal Dhingra <rac.vishaldhingra@gmail.com>
Signed-off-by: Mobashshera Rasool <mrasool@vmware.com>
 2021-11-18 21:46:07 -08:00
Igor Ryzhov
3c52293809
Merge pull request #10092 from ton31337/feature/replace_json_object_string_add_to_json_object_string_addf_for_inet_ntop 
*: inet_ntop for JSON output
 2021-11-18 22:19:40 +03:00
Philippe Guibert
f32f3ae5c9 bgpd: support redirect import more than one route-target ipv6 
the fix consists in parsing the ext community list ipv6 by taking
account the size of the ecommunity val size.

Signed-off-by: Philippe Guibert <philippe.guibert@6wind.com>
 2021-11-18 18:35:18 +01:00
Russ White
ef148de26d
Merge pull request #9706 from donaldsharp/zebra_client_summ_more_room 
zebra: Expand v4/v6 route space
 2021-11-18 12:19:44 -05:00
Igor Ryzhov
40d954f649
Merge pull request #10095 from imzyxwvu/nb-validation 
lib: Do not use sizeof() on `size_t errmsg_len`.
 2021-11-18 19:52:32 +03:00
Donatas Abraitis
4e9a98636f *: Remove unused variables 
Signed-off-by: Donatas Abraitis <donatas.abraitis@gmail.com>
 2021-11-18 18:45:41 +02:00
Donatas Abraitis
08edf9c6af zebra: Replace inet_ntop to %pI4/6 for JSON outputs 
Signed-off-by: Donatas Abraitis <donatas.abraitis@gmail.com>
 2021-11-18 18:45:41 +02:00
Donatas Abraitis
b0d5264e3f pimd: Replace inet_ntop to %pI4/6 for JSON outputs 
Signed-off-by: Donatas Abraitis <donatas.abraitis@gmail.com>
 2021-11-18 18:45:41 +02:00
Donatas Abraitis
ce4b236f61 ospf6d: Replace inet_ntop to %pI4/6 for JSON outputs 
Signed-off-by: Donatas Abraitis <donatas.abraitis@gmail.com>
 2021-11-18 18:45:41 +02:00
Donatas Abraitis
20308be317 ospfd: Replace inet_ntop to %pI4/6 for JSON outputs 
Signed-off-by: Donatas Abraitis <donatas.abraitis@gmail.com>
 2021-11-18 18:45:39 +02:00
Mark Stapp
bb0e68802d lib: use _safe iteration during link_state/ted cleanup 
Use the _safe iterators when cleaning up the link-state module's
vertices, edges, and subnets.

Signed-off-by: Mark Stapp <mstapp@nvidia.com>
 2021-11-18 11:23:39 -05:00
Igor Ryzhov
31ffc82f65
Merge pull request #10080 from mjstapp/fix_lsp_workqueue 
zebra: ignore workqueue delete callbacks during shutdown
 2021-11-18 18:47:35 +03:00
zyxwvu Shi
1c1c6c3f2a lib: Do not use sizeof() on size_t errmsg_len. 
This prevents caller from getting complete
validation message.

Signed-off-by: zyxwvu Shi <i@shiyc.cn>
 2021-11-18 22:44:00 +08:00
Mark Stapp
b0d10d93e2 zebra: during shutdown, don't process LSPs on the lsp workqueue 
During zebra shutdown, we clear out the LSP workqueue. The LSPs
will be uninstalled and freed during the shutdown process, so
just ignore any LSPs that happen to be on the workqueue.

Signed-off-by: Mark Stapp <mstapp@nvidia.com>
 2021-11-18 07:35:35 -05:00
Mark Stapp
695b279ae3 zebra: free LSP workqueue early, revert PR 10050 
this reverts commit dd9538c5f3, which tried to clear
the LSP workqueue late during shutdown.

Signed-off-by: Mark Stapp <mstapp@nvidia.com>
 2021-11-18 07:35:35 -05:00
Donatas Abraitis
e46a4ac958 lib: Replace inet_ntop to %pI4/6 for JSON outputs 
Signed-off-by: Donatas Abraitis <donatas.abraitis@gmail.com>
 2021-11-18 11:35:31 +02:00
Donatas Abraitis
19fee2b7eb ldpd: Replace inet_ntop to %pI4/6 for JSON outputs 
Signed-off-by: Donatas Abraitis <donatas.abraitis@gmail.com>
 2021-11-18 11:35:31 +02:00
Donatas Abraitis
c949c77101 bgpd: Replace inet_ntop to %pI4/6 for JSON outputs 
Signed-off-by: Donatas Abraitis <donatas.abraitis@gmail.com>
 2021-11-18 11:35:29 +02:00
Donatas Abraitis
8b3c84254d tools: Add coccinelle script to replace inet_ntop inside JSON 
Signed-off-by: Donatas Abraitis <donatas.abraitis@gmail.com>
 2021-11-18 11:32:46 +02:00
Igor Ryzhov
537355b18a
Merge pull request #10091 from donaldsharp/ospf6_thread_stop 
ospf6d: Prevent use after free
 2021-11-18 12:19:20 +03:00
Donatas Abraitis
c594695225
Merge pull request #10077 from idryzhov/pim-if-addr-add 
pimd: use correct VRF when processing interface address add
 2021-11-18 10:34:33 +02:00
Donatas Abraitis
d86cf7aa65
Merge pull request #10084 from opensourcerouting/json-sugar 
lib: make JSON output less painful/boilerplate-y
 2021-11-18 10:33:52 +02:00
Donald Sharp
a8f692edb0 ospf6d: Prevent use after free 
I encountered a crash where the ospf6_write thread
was already thought to be scheduled by ospf6d:

(gdb) bt
    t_ptr=0x5624ee6bd260) at lib/thread.c:972
(gdb)

When poking around it was noticed that the ospf6 pointer was crap:
(gdb) p (struct ospf6 *)$7
$8 = (struct ospf6 *) 0x5624ee6c6b20
(gdb) p *$8
$9 = {vrf_id = 3998487040, name = 0x5624ee420010 "\a", router_id = 65892, router_id_static = 65892, router_id_zebra = 0, starttime = {tv_sec = 1654674, tv_usec = 678673},
  area_list = 0x0, backbone = 0x5624ee6c6710, lsdb = 0x5624ee6c2370, lsdb_self = 0x5624ee6c5d80, route_table = 0x5624ee6c5c10, brouter_table = 0x5624ee6c4690,
  external_table = 0x5624ee6c4710, external_id_table = 0x5624ee6c4f10, external_id = 24, redist = {0x0 <repeats 32 times>}, nssa_default_import_check = {refcnt = 0,
    status = false}, flag = 1 '\001', redistribute = 0, config_flags = 0 '\000', default_originate = 0, lsa_minarrival = 1000, spf_delay = 0, spf_holdtime = 50,
  spf_max_holdtime = 5000, spf_hold_multiplier = 1, spf_reason = 554, ts_spf = {tv_sec = 1654712, tv_usec = 122041}, ts_spf_duration = {tv_sec = 0, tv_usec = 48},
  last_spf_reason = 11, fd = -1, t_spf_calc = 0x0, t_ase_calc = 0x0, maxage_remover = 0x0, t_distribute_update = 0x0, t_ospf6_receive = 0x0, t_external_aggr = 0x0,
  t_write = 0x5624ee6cc930, write_oi_count = 20, ref_bandwidth = 100000, distance_all = 0 '\000', distance_intra = 0 '\000', distance_inter = 0 '\000',
  distance_external = 0 '\000', distance_table = 0x5624ee6c4f50, inst_shutdown = 1 '\001', max_multipath = 128, gr_info = {restart_support = false, restart_in_progress = false,
    prepare_in_progress = false, finishing_restart = false, grace_period = 0, t_grace_period = 0x0}, ospf6_helper_cfg = {supported_grace_time = 1800, is_helper_supported = false,
    strict_lsa_check = true, only_planned_restart = false, enable_rtr_list = 0x0, active_restarter_cnt = 0, last_exit_reason = 0}, anyNSSA = 0 '\000', t_abr_task = 0x0,
  oi_write_q = 0x0, redist_count = 0, aggr_action = 1, aggr_delay_interval = 6, rt_aggr_tbl = 0x5624ee6c51b0, qobj_node = {nid = 6163304287853836241, nodehash = {hi = {next = 0x0,
        hashval = 1613461457}}, type = 0x5624ed65e4e0 <qobj_t_ospf6>}}

Upon code inspection there was no place where we disabled the t_write thread upon ospf6 deletion.
If the code were to issue a `no router ospf6` and then recreate it.  We could see this crash.

Signed-off-by: Donald Sharp <sharpd@nvidia.com>
 2021-11-17 18:46:06 -05:00
Donatas Abraitis
56cc2c987d
Merge pull request #10089 from donaldsharp/really_remove 
vtysh: Really remove `address-family evpn`
 2021-11-17 21:41:50 +02:00
Donald Sharp
1822c2af07 vtysh: Really remove address-family evpn 
I don't know how my original compile didn't fail
or I didn't notice :(

Signed-off-by: Donald Sharp <sharpd@nvidia.com>
 2021-11-17 11:20:43 -05:00
Igor Ryzhov
503661c62f
Merge pull request #10086 from donaldsharp/cpp_removal 
tools, vtysh: Remove final vestige of `address-family evpn`
 2021-11-17 19:07:19 +03:00
David Lamparter
0c3b8d5461
Merge pull request #10087 from donaldsharp/core_file_restore 2021-11-17 17:00:19 +01:00