diff options
| author | Sai Gomathi N <nsaigomathi@vmware.com> | 2022-03-02 07:15:32 +0100 |
|---|---|---|
| committer | Sai Gomathi N <nsaigomathi@vmware.com> | 2022-04-04 09:52:03 +0200 |
| commit | de11054ed02fb5b25f7b5619bd6507261d4e38f0 (patch) | |
| tree | 307aba5b95dc59dd6988676220aaf4bc2a1b79e8 /pimd/pim_cmd_common.c | |
| parent | pim6d: Adding "show ipv6 pim jp-agg" command (diff) | |
| download | frr-de11054ed02fb5b25f7b5619bd6507261d4e38f0.tar.xz frr-de11054ed02fb5b25f7b5619bd6507261d4e38f0.zip | |
pim6d: Adding "show ipv6 pim local-membership"
Adding the new cli to display pim local membership information.
Changing DEFUN to DEPFY for "show ip pim local-membership"
Signed-off-by: Sai Gomathi N <nsaigomathi@vmware.com>
Diffstat (limited to '')
| -rw-r--r-- | pimd/pim_cmd_common.c | 17 |
1 files changed, 6 insertions, 11 deletions
diff --git a/pimd/pim_cmd_common.c b/pimd/pim_cmd_common.c index b859e4a47..441a00816 100644 --- a/pimd/pim_cmd_common.c +++ b/pimd/pim_cmd_common.c @@ -1728,7 +1728,6 @@ static void pim_show_membership_helper(struct vty *vty, struct pim_ifchannel *ch, struct json_object *json) { - char ch_grp_str[PIM_ADDRSTRLEN]; json_object *json_iface = NULL; json_object *json_row = NULL; @@ -1739,16 +1738,14 @@ static void pim_show_membership_helper(struct vty *vty, json_object_object_add(json, ch->interface->name, json_iface); } - snprintfrr(ch_grp_str, sizeof(ch_grp_str), "%pPAs", &ch->sg.grp); - json_row = json_object_new_object(); json_object_string_addf(json_row, "source", "%pPAs", &ch->sg.src); - json_object_string_add(json_row, "group", ch_grp_str); + json_object_string_addf(json_row, "group", "%pPAs", &ch->sg.grp); json_object_string_add(json_row, "localMembership", ch->local_ifmembership == PIM_IFMEMBERSHIP_NOINFO - ? "NOINFO" - : "INCLUDE"); - json_object_object_add(json_iface, ch_grp_str, json_row); + ? "NOINFO" + : "INCLUDE"); + json_object_object_addf(json_iface, json_row, "%pPAs", &ch->sg.grp); } void pim_show_membership(struct pim_instance *pim, struct vty *vty, bool uj) @@ -1773,8 +1770,7 @@ void pim_show_membership(struct pim_instance *pim, struct vty *vty, bool uj) } if (uj) { - vty_out(vty, "%s\n", json_object_to_json_string_ext( - json, JSON_C_TO_STRING_PRETTY)); + vty_json(vty, json); } else { vty_out(vty, "Interface Address Source Group Membership\n"); @@ -1841,9 +1837,8 @@ void pim_show_membership(struct pim_instance *pim, struct vty *vty, bool uj) } } } + json_object_free(json); } - - json_object_free(json); } static void pim_show_channel_helper(struct pim_instance *pim, struct vty *vty, |