From: Abhishek N R Date: Thu, 9 Jun 2022 07:49:38 +0000 (-0700) Subject: pim6d: Moving resuable code to common api for "show pim rp-info" command X-Git-Tag: base_8.4~370^2~11 X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=e21c4e907540714cba39d5421699e5726911bec4;p=mirror%2Ffrr.git pim6d: Moving resuable code to common api for "show pim rp-info" command Signed-off-by: Abhishek N R --- diff --git a/pimd/pim6_cmd.c b/pimd/pim6_cmd.c index f86f3375d5..1b83d38b91 100644 --- a/pimd/pim6_cmd.c +++ b/pimd/pim6_cmd.c @@ -790,40 +790,8 @@ DEFPY (show_ipv6_pim_rp, "Multicast Group range\n" JSON_STR) { - struct pim_instance *pim; - struct vrf *v; - json_object *json_parent = NULL; - struct prefix *range = NULL; - - v = vrf_lookup_by_name(vrf ? vrf : VRF_DEFAULT_NAME); - - if (!v) - return CMD_WARNING; - - pim = pim_get_pim_instance(v->vrf_id); - - if (!pim) { - vty_out(vty, "%% Unable to find pim instance\n"); - return CMD_WARNING; - } - - if (group_str) { - range = prefix_new(); - prefix_copy(range, group); - apply_mask(range); - } - - if (json) - json_parent = json_object_new_object(); - - pim_rp_show_information(pim, range, vty, json_parent); - - if (json) - vty_json(vty, json_parent); - - prefix_free(&range); - - return CMD_SUCCESS; + return pim_show_rp_helper(vrf, vty, group_str, (struct prefix *)group, + !!json); } DEFPY (show_ipv6_pim_rp_vrf_all, @@ -837,36 +805,8 @@ DEFPY (show_ipv6_pim_rp_vrf_all, "Multicast Group range\n" JSON_STR) { - struct vrf *vrf; - json_object *json_parent = NULL; - json_object *json_vrf = NULL; - struct prefix *range = NULL; - - if (group_str) { - range = prefix_new(); - prefix_copy(range, group); - apply_mask(range); - } - - if (json) - json_parent = json_object_new_object(); - - RB_FOREACH (vrf, vrf_name_head, &vrfs_by_name) { - if (!json) - vty_out(vty, "VRF: %s\n", vrf->name); - else - json_vrf = json_object_new_object(); - pim_rp_show_information(vrf->info, range, vty, json_vrf); - if (json) - json_object_object_add(json_parent, vrf->name, - json_vrf); - } - if (json) - vty_json(vty, json_parent); - - prefix_free(&range); - - return CMD_SUCCESS; + return pim_show_rp_vrf_all_helper(vty, group_str, + (struct prefix *)group, !!json); } DEFPY (show_ipv6_pim_rpf, diff --git a/pimd/pim_cmd.c b/pimd/pim_cmd.c index 53ea54e906..b67bc23523 100644 --- a/pimd/pim_cmd.c +++ b/pimd/pim_cmd.c @@ -3254,40 +3254,8 @@ DEFPY (show_ip_pim_rp, "Multicast Group range\n" JSON_STR) { - struct pim_instance *pim; - struct vrf *v; - json_object *json_parent = NULL; - struct prefix *range = NULL; - - v = vrf_lookup_by_name(vrf ? vrf : VRF_DEFAULT_NAME); - - if (!v) - return CMD_WARNING; - - pim = pim_get_pim_instance(v->vrf_id); - - if (!pim) { - vty_out(vty, "%% Unable to find pim instance\n"); - return CMD_WARNING; - } - - if (group_str) { - range = prefix_new(); - prefix_copy(range, group); - apply_mask(range); - } - - if (json) - json_parent = json_object_new_object(); - - pim_rp_show_information(pim, range, vty, json_parent); - - if (json) - vty_json(vty, json_parent); - - prefix_free(&range); - - return CMD_SUCCESS; + return pim_show_rp_helper(vrf, vty, group_str, (struct prefix *)group, + !!json); } DEFPY (show_ip_pim_rp_vrf_all, @@ -3301,36 +3269,8 @@ DEFPY (show_ip_pim_rp_vrf_all, "Multicast Group range\n" JSON_STR) { - struct vrf *vrf; - json_object *json_parent = NULL; - json_object *json_vrf = NULL; - struct prefix *range = NULL; - - if (group_str) { - range = prefix_new(); - prefix_copy(range, group); - apply_mask(range); - } - - if (json) - json_parent = json_object_new_object(); - - RB_FOREACH (vrf, vrf_name_head, &vrfs_by_name) { - if (!json) - vty_out(vty, "VRF: %s\n", vrf->name); - else - json_vrf = json_object_new_object(); - pim_rp_show_information(vrf->info, range, vty, json_vrf); - if (json) - json_object_object_add(json_parent, vrf->name, - json_vrf); - } - if (json) - vty_json(vty, json_parent); - - prefix_free(&range); - - return CMD_SUCCESS; + return pim_show_rp_vrf_all_helper(vty, group_str, + (struct prefix *)group, !!json); } DEFPY (show_ip_pim_rpf, diff --git a/pimd/pim_cmd_common.c b/pimd/pim_cmd_common.c index 2807762175..3bc7381e0d 100644 --- a/pimd/pim_cmd_common.c +++ b/pimd/pim_cmd_common.c @@ -3791,3 +3791,77 @@ int pim_show_rpf_vrf_all_helper(struct vty *vty, bool json) return CMD_SUCCESS; } + +int pim_show_rp_helper(const char *vrf, struct vty *vty, const char *group_str, + const struct prefix *group, bool json) +{ + struct pim_instance *pim; + struct vrf *v; + json_object *json_parent = NULL; + struct prefix *range = NULL; + + v = vrf_lookup_by_name(vrf ? vrf : VRF_DEFAULT_NAME); + + if (!v) + return CMD_WARNING; + + pim = pim_get_pim_instance(v->vrf_id); + + if (!pim) { + vty_out(vty, "%% Unable to find pim instance\n"); + return CMD_WARNING; + } + + if (group_str) { + range = prefix_new(); + prefix_copy(range, group); + apply_mask(range); + } + + if (json) + json_parent = json_object_new_object(); + + pim_rp_show_information(pim, range, vty, json_parent); + + if (json) + vty_json(vty, json_parent); + + prefix_free(&range); + + return CMD_SUCCESS; +} + +int pim_show_rp_vrf_all_helper(struct vty *vty, const char *group_str, + const struct prefix *group, bool json) +{ + struct vrf *vrf; + json_object *json_parent = NULL; + json_object *json_vrf = NULL; + struct prefix *range = NULL; + + if (group_str) { + range = prefix_new(); + prefix_copy(range, group); + apply_mask(range); + } + + if (json) + json_parent = json_object_new_object(); + + RB_FOREACH (vrf, vrf_name_head, &vrfs_by_name) { + if (!json) + vty_out(vty, "VRF: %s\n", vrf->name); + else + json_vrf = json_object_new_object(); + pim_rp_show_information(vrf->info, range, vty, json_vrf); + if (json) + json_object_object_add(json_parent, vrf->name, + json_vrf); + } + if (json) + vty_json(vty, json_parent); + + prefix_free(&range); + + return CMD_SUCCESS; +} diff --git a/pimd/pim_cmd_common.h b/pimd/pim_cmd_common.h index ce81473eb4..baea749778 100644 --- a/pimd/pim_cmd_common.h +++ b/pimd/pim_cmd_common.h @@ -133,6 +133,10 @@ int pim_no_debug_pim_packets_cmd(const char *hello, const char *joins, const char *registers, struct vty *vty); int pim_show_rpf_helper(const char *vrf, struct vty *vty, bool json); int pim_show_rpf_vrf_all_helper(struct vty *vty, bool json); +int pim_show_rp_helper(const char *vrf, struct vty *vty, const char *group_str, + const struct prefix *group, bool json); +int pim_show_rp_vrf_all_helper(struct vty *vty, const char *group_str, + const struct prefix *group, bool json); /* * Special Macro to allow us to get the correct pim_instance;