diff options
| author | Igor Ryzhov <idryzhov@gmail.com> | 2024-08-08 01:25:02 +0300 | 
|---|---|---|
| committer | Mergify <37929162+mergify[bot]@users.noreply.github.com> | 2024-08-08 18:29:25 +0000 | 
| commit | 8d258daa09eb4389be834fe9d95afb9551100579 (patch) | |
| tree | 42a203d84436e41ec7f080ca26f432d6126120c9 | |
| parent | cd413729c06348953da08e8586c34cc619aaf72b (diff) | |
ripd: fix show run output for distribute-list
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 25d94ec3eedca978ce7c37359105b0518dcf0f5f)
| -rw-r--r-- | ripd/rip_cli.c | 16 | ||||
| -rw-r--r-- | ripd/rip_nb.c | 4 | 
2 files changed, 16 insertions, 4 deletions
diff --git a/ripd/rip_cli.c b/ripd/rip_cli.c index 4d4349b81a..976764f078 100644 --- a/ripd/rip_cli.c +++ b/ripd/rip_cli.c @@ -1356,6 +1356,22 @@ const struct frr_yang_module_info frr_ripd_cli_info = {  			.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",  			.cbs.cli_show = cli_show_rip_redistribute,  		}, diff --git a/ripd/rip_nb.c b/ripd/rip_nb.c index d5df5916ad..231099d3ac 100644 --- a/ripd/rip_nb.c +++ b/ripd/rip_nb.c @@ -143,7 +143,6 @@ const struct frr_yang_module_info frr_ripd_info = {  			.cbs = {  				.modify = group_distribute_list_ipv4_modify,  				.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 = {  				.modify = group_distribute_list_ipv4_modify,  				.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 = {  				.modify = group_distribute_list_ipv4_modify,  				.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 = {  				.modify = group_distribute_list_ipv4_modify,  				.destroy = group_distribute_list_ipv4_destroy, -				.cli_show = group_distribute_list_ipv4_cli_show,  			}  		},  		{  | 
