proxmox-mirrors/mirror_frr
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_frr synced 2025-08-09 11:18:52 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #14846 from FRRouting/mergify/bp/stable/9.1/pr-14710

Browse Source 
ospfd:fix show_ip_ospf_gr_helper (backport #14710)
This commit is contained in:
Donald Sharp 2023-11-21 07:38:41 -05:00 committed by GitHub
commit b06ce4ec8e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 12 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
ospfd/ospf_vty.c
View File

@ -10807,22 +10807,10 @@ DEFPY (show_ip_ospf_gr_helper,
} }
ospf = ospf_lookup_by_inst_name(inst, vrf_name); ospf = ospf_lookup_by_inst_name(inst, vrf_name);
if (ospf == NULL || !ospf->oi_running) {
if (uj)
vty_json(vty, json);
else
vty_out(vty,
"%% OSPF is not enabled in vrf %s\n",
vrf_name);
return CMD_SUCCESS;
}
} else { } else {
/* Default Vrf */ /* Default Vrf */
ospf = ospf_lookup_by_vrf_id(VRF_DEFAULT); ospf = ospf_lookup_by_vrf_id(VRF_DEFAULT);
}
if (ospf == NULL || !ospf->oi_running) { if (ospf == NULL || !ospf->oi_running) {
@ -10830,15 +10818,12 @@ DEFPY (show_ip_ospf_gr_helper,
vty_json(vty, json); vty_json(vty, json);
else else
vty_out(vty, vty_out(vty,
"%% OSPF is not enabled in vrf default\n"); "%% OSPF is not enabled in vrf %s\n", vrf_name ? vrf_name : "default");
return CMD_SUCCESS; return CMD_SUCCESS;
} }
ospf_show_gr_helper_details(vty, ospf, use_vrf, json, uj, ospf_show_gr_helper_details(vty, ospf, use_vrf, json, uj, detail);
detail);
}
if (uj) if (uj)
vty_json(vty, json); vty_json(vty, json);