matthieu/frr
1
0
Fork 0
forked from Mirror/frr
Code Pull requests Activity

ripd: fix show run output for distribute-list

Browse source 
CLI show callbacks should be defined in frr_ripd_cli_info instead of
frr_ripd_info, because only the former is loaded by mgmtd and only its
callbacks are getting called for config output.

Signed-off-by: Igor Ryzhov <idryzhov@gmail.com>
(cherry picked from commit 25d94ec3ee)
This commit is contained in:
Igor Ryzhov 2024-08-08 01:25:02 +03:00 committed by Mergify
parent 4541aba673
commit d2e2d69477
2 changed files with 16 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
ripd/rip_cli.c
View file

@ -1374,6 +1374,22 @@ const struct frr_yang_module_info frr_ripd_cli_info = {
.xpath = "/frr-ripd:ripd/instance/non-passive-interface", .xpath = "/frr-ripd:ripd/instance/non-passive-interface",
.cbs.cli_show = cli_show_rip_non_passive_interface, .cbs.cli_show = cli_show_rip_non_passive_interface,
}, },
{
.xpath = "/frr-ripd:ripd/instance/distribute-list/in/access-list",
.cbs.cli_show = group_distribute_list_ipv4_cli_show,
},
{
.xpath = "/frr-ripd:ripd/instance/distribute-list/out/access-list",
.cbs.cli_show = group_distribute_list_ipv4_cli_show,
},
{
.xpath = "/frr-ripd:ripd/instance/distribute-list/in/prefix-list",
.cbs.cli_show = group_distribute_list_ipv4_cli_show,
},
{
.xpath = "/frr-ripd:ripd/instance/distribute-list/out/prefix-list",
.cbs.cli_show = group_distribute_list_ipv4_cli_show,
},
{ {
.xpath = "/frr-ripd:ripd/instance/redistribute", .xpath = "/frr-ripd:ripd/instance/redistribute",
.cbs.cli_show = cli_show_rip_redistribute, .cbs.cli_show = cli_show_rip_redistribute,

4
ripd/rip_nb.c
View file

@ -143,7 +143,6 @@ const struct frr_yang_module_info frr_ripd_info = {
.cbs = { .cbs = {
.modify = group_distribute_list_ipv4_modify, .modify = group_distribute_list_ipv4_modify,
.destroy = group_distribute_list_ipv4_destroy, .destroy = group_distribute_list_ipv4_destroy,
.cli_show = group_distribute_list_ipv4_cli_show,
} }
}, },
{ {
@ -151,7 +150,6 @@ const struct frr_yang_module_info frr_ripd_info = {
.cbs = { .cbs = {
.modify = group_distribute_list_ipv4_modify, .modify = group_distribute_list_ipv4_modify,
.destroy = group_distribute_list_ipv4_destroy, .destroy = group_distribute_list_ipv4_destroy,
.cli_show = group_distribute_list_ipv4_cli_show,
} }
}, },
{ {
@ -159,7 +157,6 @@ const struct frr_yang_module_info frr_ripd_info = {
.cbs = { .cbs = {
.modify = group_distribute_list_ipv4_modify, .modify = group_distribute_list_ipv4_modify,
.destroy = group_distribute_list_ipv4_destroy, .destroy = group_distribute_list_ipv4_destroy,
.cli_show = group_distribute_list_ipv4_cli_show,
} }
}, },
{ {
@ -167,7 +164,6 @@ const struct frr_yang_module_info frr_ripd_info = {
.cbs = { .cbs = {
.modify = group_distribute_list_ipv4_modify, .modify = group_distribute_list_ipv4_modify,
.destroy = group_distribute_list_ipv4_destroy, .destroy = group_distribute_list_ipv4_destroy,
.cli_show = group_distribute_list_ipv4_cli_show,
} }
}, },
{ {