From 78b0e6907301bf93500a9341035541770f90b896 Mon Sep 17 00:00:00 2001 From: Sai Gomathi N Date: Thu, 9 Jun 2022 02:36:08 -0700 Subject: [PATCH] pim6d: Moving the common lines of pim_show_neighbors_vrf_all cli Moving the common lines of pim_show_neighbors_vrf_all cli in pim_cmd.c and pim6_cmd.c to pim_cmd_common.c file Signed-off-by: Sai Gomathi N --- pimd/pim6_cmd.c | 26 +------------------------- pimd/pim_cmd.c | 26 +------------------------- pimd/pim_cmd_common.c | 30 ++++++++++++++++++++++++++++++ pimd/pim_cmd_common.h | 2 ++ 4 files changed, 34 insertions(+), 50 deletions(-) diff --git a/pimd/pim6_cmd.c b/pimd/pim6_cmd.c index 764e8059a9..a46e7fa178 100644 --- a/pimd/pim6_cmd.c +++ b/pimd/pim6_cmd.c @@ -1406,31 +1406,7 @@ DEFPY (show_ipv6_pim_neighbor_vrf_all, "Name of interface or neighbor\n" JSON_STR) { - struct vrf *v; - json_object *json_parent = NULL; - json_object *json_vrf = NULL; - - if (json) - json_parent = json_object_new_object(); - RB_FOREACH (v, vrf_name_head, &vrfs_by_name) { - if (!json) - vty_out(vty, "VRF: %s\n", v->name); - else - json_vrf = json_object_new_object(); - - if (interface) - pim_show_neighbors_single(v->info, vty, interface, - json_vrf); - else - pim_show_neighbors(v->info, vty, json_vrf); - - if (json) - json_object_object_add(json_parent, v->name, json_vrf); - } - if (json) - vty_json(vty, json_parent); - - return CMD_SUCCESS; + return pim_show_neighbors_vrf_all_cmd_helper(vty, json, interface); } DEFPY (show_ipv6_pim_nexthop, diff --git a/pimd/pim_cmd.c b/pimd/pim_cmd.c index 1afa707620..4e573d2372 100644 --- a/pimd/pim_cmd.c +++ b/pimd/pim_cmd.c @@ -2850,31 +2850,7 @@ DEFPY (show_ip_pim_neighbor_vrf_all, "Name of interface or neighbor\n" JSON_STR) { - struct vrf *v; - json_object *json_parent = NULL; - json_object *json_vrf = NULL; - - if (json) - json_parent = json_object_new_object(); - RB_FOREACH (v, vrf_name_head, &vrfs_by_name) { - if (!json) - vty_out(vty, "VRF: %s\n", v->name); - else - json_vrf = json_object_new_object(); - - if (interface) - pim_show_neighbors_single(v->info, vty, interface, - json_vrf); - else - pim_show_neighbors(v->info, vty, json_vrf); - - if (json) - json_object_object_add(json_parent, v->name, json_vrf); - } - if (json) - vty_json(vty, json_parent); - - return CMD_SUCCESS; + return pim_show_neighbors_vrf_all_cmd_helper(vty, json, interface); } DEFPY (show_ip_pim_secondary, diff --git a/pimd/pim_cmd_common.c b/pimd/pim_cmd_common.c index 42c6c2c98c..e7299f2214 100644 --- a/pimd/pim_cmd_common.c +++ b/pimd/pim_cmd_common.c @@ -2636,6 +2636,36 @@ int pim_show_neighbors_cmd_helper(const char *vrf, struct vty *vty, return CMD_SUCCESS; } +int pim_show_neighbors_vrf_all_cmd_helper(struct vty *vty, const char *json, + const char *interface) +{ + struct vrf *v; + json_object *json_parent = NULL; + json_object *json_vrf = NULL; + + if (json) + json_parent = json_object_new_object(); + RB_FOREACH (v, vrf_name_head, &vrfs_by_name) { + if (!json) + vty_out(vty, "VRF: %s\n", v->name); + else + json_vrf = json_object_new_object(); + + if (interface) + pim_show_neighbors_single(v->info, vty, interface, + json_vrf); + else + pim_show_neighbors(v->info, vty, json_vrf); + + if (json) + json_object_object_add(json_parent, v->name, json_vrf); + } + if (json) + vty_json(vty, json_parent); + + return CMD_SUCCESS; +} + void pim_show_neighbors_single(struct pim_instance *pim, struct vty *vty, const char *neighbor, json_object *json) { diff --git a/pimd/pim_cmd_common.h b/pimd/pim_cmd_common.h index 6bd3f48f11..d6fd360ac8 100644 --- a/pimd/pim_cmd_common.h +++ b/pimd/pim_cmd_common.h @@ -105,6 +105,8 @@ void ip_pim_ssm_show_group_range(struct pim_instance *pim, struct vty *vty, void pim_show_nexthop(struct pim_instance *pim, struct vty *vty); int pim_show_neighbors_cmd_helper(const char *vrf, struct vty *vty, const char *json, const char *interface); +int pim_show_neighbors_vrf_all_cmd_helper(struct vty *vty, const char *json, + const char *interface); void pim_show_neighbors_single(struct pim_instance *pim, struct vty *vty, const char *neighbor, json_object *json); void pim_show_neighbors(struct pim_instance *pim, struct vty *vty, -- 2.39.5