proxmox-mirrors/mirror_frr
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_frr synced 2025-08-14 16:04:49 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

pim6d: Moving resuable code to common api for "show pim rp-info" command

Browse Source 
Signed-off-by: Abhishek N R <abnr@vmware.com>
This commit is contained in:
Abhishek N R 2022-06-09 00:49:38 -07:00
parent 6d1bd8c28a
commit e21c4e9075
4 changed files with 86 additions and 128 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

68
pimd/pim6_cmd.c
View File

@ -790,40 +790,8 @@ DEFPY (show_ipv6_pim_rp,
"Multicast Group range\n" "Multicast Group range\n"
JSON_STR) JSON_STR)
{ {
struct pim_instance *pim; return pim_show_rp_helper(vrf, vty, group_str, (struct prefix *)group,
struct vrf *v; !!json);
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;
} }
DEFPY (show_ipv6_pim_rp_vrf_all, DEFPY (show_ipv6_pim_rp_vrf_all,
@ -837,36 +805,8 @@ DEFPY (show_ipv6_pim_rp_vrf_all,
"Multicast Group range\n" "Multicast Group range\n"
JSON_STR) JSON_STR)
{ {
struct vrf *vrf; return pim_show_rp_vrf_all_helper(vty, group_str,
json_object *json_parent = NULL; (struct prefix *)group, !!json);
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;
} }
DEFPY (show_ipv6_pim_rpf, DEFPY (show_ipv6_pim_rpf,

68
pimd/pim_cmd.c
View File

@ -3254,40 +3254,8 @@ DEFPY (show_ip_pim_rp,
"Multicast Group range\n" "Multicast Group range\n"
JSON_STR) JSON_STR)
{ {
struct pim_instance *pim; return pim_show_rp_helper(vrf, vty, group_str, (struct prefix *)group,
struct vrf *v; !!json);
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;
} }
DEFPY (show_ip_pim_rp_vrf_all, DEFPY (show_ip_pim_rp_vrf_all,
@ -3301,36 +3269,8 @@ DEFPY (show_ip_pim_rp_vrf_all,
"Multicast Group range\n" "Multicast Group range\n"
JSON_STR) JSON_STR)
{ {
struct vrf *vrf; return pim_show_rp_vrf_all_helper(vty, group_str,
json_object *json_parent = NULL; (struct prefix *)group, !!json);
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;
} }
DEFPY (show_ip_pim_rpf, DEFPY (show_ip_pim_rpf,

74
pimd/pim_cmd_common.c
View File

@ -3791,3 +3791,77 @@ int pim_show_rpf_vrf_all_helper(struct vty *vty, bool json)
return CMD_SUCCESS; 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;
}

4
pimd/pim_cmd_common.h
View File

@ -133,6 +133,10 @@ int pim_no_debug_pim_packets_cmd(const char *hello, const char *joins,
const char *registers, struct vty *vty); const char *registers, struct vty *vty);
int pim_show_rpf_helper(const char *vrf, struct vty *vty, bool json); 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_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; * Special Macro to allow us to get the correct pim_instance;