Mirror/frr
0
0
Fork 1
mirror of https://github.com/FRRouting/frr.git synced 2025-04-30 13:37:17 +02:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

Merge pull request #14710 from teletajp/fix_show_ospf_gr_helper_cmd

Browse source 
ospfd:fix show_ip_ospf_gr_helper
This commit is contained in:
Donatas Abraitis 2023-11-21 11:39:31 +02:00 committed by GitHub
parent b9228127df 62754e1029
commit 77ff93b8f5
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

39
ospfd/ospf_vty.c
View file

@ -10808,38 +10808,23 @@ DEFPY (show_ip_ospf_gr_helper,
}
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 {
/* Default Vrf */
ospf = ospf_lookup_by_vrf_id(VRF_DEFAULT);
if (ospf == NULL || !ospf->oi_running) {
if (uj)
vty_json(vty, json);
else
vty_out(vty,
"%% OSPF is not enabled in vrf default\n");
return CMD_SUCCESS;
}
ospf_show_gr_helper_details(vty, ospf, use_vrf, json, uj,
detail);
}
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 ? vrf_name : "default");
return CMD_SUCCESS;
}
ospf_show_gr_helper_details(vty, ospf, use_vrf, json, uj, detail);
if (uj)
vty_json(vty, json);