diff options
| author | Sai Gomathi N <nsaigomathi@vmware.com> | 2022-06-01 21:54:44 -0700 |
|---|---|---|
| committer | Sai Gomathi N <nsaigomathi@vmware.com> | 2022-06-08 23:25:51 -0700 |
| commit | b6bf33775de493676cad5ae27c5545550d8a99c8 (patch) | |
| tree | dfa72dcf7c0551e7e2ceed89f013805d5bfc31dd | |
| parent | f5b2f86ac0ccaecaed248e8cc80569c3c274e70b (diff) | |
pim6d: Moving the common lines of pim_show_channel cli
Moving the common lines of pim_show_channel cli
in pim_cmd.c and pim6_cmd.c to pim_cmd_common.c file
Signed-off-by: Sai Gomathi N <nsaigomathi@vmware.com>
| -rw-r--r-- | pimd/pim6_cmd.c | 12 | ||||
| -rw-r--r-- | pimd/pim_cmd.c | 12 | ||||
| -rw-r--r-- | pimd/pim_cmd_common.c | 14 | ||||
| -rw-r--r-- | pimd/pim_cmd_common.h | 1 |
4 files changed, 17 insertions, 22 deletions
diff --git a/pimd/pim6_cmd.c b/pimd/pim6_cmd.c index 77844988ea..bb9e2f7db6 100644 --- a/pimd/pim6_cmd.c +++ b/pimd/pim6_cmd.c @@ -1235,17 +1235,7 @@ DEFPY (show_ipv6_pim_channel, "PIM downstream channel info\n" JSON_STR) { - struct vrf *v; - bool uj = !!json; - - v = vrf_lookup_by_name(vrf ? vrf : VRF_DEFAULT_NAME); - - if (!v) - return CMD_WARNING; - - pim_show_channel(v->info, vty, uj); - - return CMD_SUCCESS; + return pim_show_channel_cmd_helper(vrf, vty, !!json); } DEFPY (show_ipv6_pim_interface, diff --git a/pimd/pim_cmd.c b/pimd/pim_cmd.c index 2d6ce24381..3cdf53709d 100644 --- a/pimd/pim_cmd.c +++ b/pimd/pim_cmd.c @@ -3168,17 +3168,7 @@ DEFPY (show_ip_pim_channel, "PIM downstream channel info\n" JSON_STR) { - struct vrf *v; - bool uj = !!json; - - v = vrf_lookup_by_name(vrf ? vrf : VRF_DEFAULT_NAME); - - if (!v) - return CMD_WARNING; - - pim_show_channel(v->info, vty, uj); - - return CMD_SUCCESS; + return pim_show_channel_cmd_helper(vrf, vty, !!json); } DEFPY (show_ip_pim_upstream_join_desired, diff --git a/pimd/pim_cmd_common.c b/pimd/pim_cmd_common.c index d5eb763df3..895ac0c81e 100644 --- a/pimd/pim_cmd_common.c +++ b/pimd/pim_cmd_common.c @@ -1945,6 +1945,20 @@ void pim_show_channel(struct pim_instance *pim, struct vty *vty, bool uj) vty_json(vty, json); } +int pim_show_channel_cmd_helper(const char *vrf, struct vty *vty, bool uj) +{ + struct vrf *v; + + v = vrf_lookup_by_name(vrf ? vrf : VRF_DEFAULT_NAME); + + if (!v) + return CMD_WARNING; + + pim_show_channel(v->info, vty, uj); + + return CMD_SUCCESS; +} + void pim_show_interfaces(struct pim_instance *pim, struct vty *vty, bool mlag, json_object *json) { diff --git a/pimd/pim_cmd_common.h b/pimd/pim_cmd_common.h index 9644f84e0c..21592385a4 100644 --- a/pimd/pim_cmd_common.h +++ b/pimd/pim_cmd_common.h @@ -88,6 +88,7 @@ void pim_show_join(struct pim_instance *pim, struct vty *vty, pim_sgaddr *sg, void pim_show_jp_agg_list(struct pim_instance *pim, struct vty *vty); void pim_show_membership(struct pim_instance *pim, struct vty *vty, bool uj); void pim_show_channel(struct pim_instance *pim, struct vty *vty, bool uj); +int pim_show_channel_cmd_helper(const char *vrf, struct vty *vty, bool uj); void pim_show_interfaces(struct pim_instance *pim, struct vty *vty, bool mlag, json_object *json); void pim_show_interfaces_single(struct pim_instance *pim, struct vty *vty, |