diff options
| author | sarita patra <saritap@vmware.com> | 2022-03-16 11:08:53 +0100 |
|---|---|---|
| committer | Sarita Patra <saritap@vmware.com> | 2022-07-07 19:56:45 +0200 |
| commit | 1407e40fc89812341f2dabc4d8a3105cefb3793f (patch) | |
| tree | e92b13076841d12ed0b78df77353e5ab5e42a57a /pimd/pim_cmd.c | |
| parent | pim6d: add pimv6 support for bsm_hdr (diff) | |
| download | frr-1407e40fc89812341f2dabc4d8a3105cefb3793f.tar.xz frr-1407e40fc89812341f2dabc4d8a3105cefb3793f.zip | |
pim6d: add pimv6 support for bsmmsg_rpinfo
Signed-off-by: sarita patra <saritap@vmware.com>
Diffstat (limited to 'pimd/pim_cmd.c')
| -rw-r--r-- | pimd/pim_cmd.c | 29 |
1 files changed, 14 insertions, 15 deletions
diff --git a/pimd/pim_cmd.c b/pimd/pim_cmd.c index 048530e64..602fac7a8 100644 --- a/pimd/pim_cmd.c +++ b/pimd/pim_cmd.c @@ -862,7 +862,7 @@ static void pim_show_bsm_db(struct pim_instance *pim, struct vty *vty, bool uj) char grp_str[PREFIX_STRLEN]; char rp_str[INET_ADDRSTRLEN]; struct bsmmsg_grpinfo *group; - struct bsmmsg_rpinfo *rpaddr; + struct bsmmsg_rpinfo *bsm_rpinfo; struct prefix grp; struct bsm_hdr *hdr; uint32_t offset = 0; @@ -951,31 +951,30 @@ static void pim_show_bsm_db(struct pim_instance *pim, struct vty *vty, bool uj) "RpAddress HoldTime Priority\n"); while (frag_rp_cnt--) { - rpaddr = (struct bsmmsg_rpinfo *)buf; + bsm_rpinfo = (struct bsmmsg_rpinfo *)buf; buf += sizeof(struct bsmmsg_rpinfo); offset += sizeof(struct bsmmsg_rpinfo); - pim_inet4_dump("<Rp addr?>", - rpaddr->rpaddr.addr, rp_str, - sizeof(rp_str)); - if (uj) { json_row = json_object_new_object(); - json_object_string_add( - json_row, "Rp Address", rp_str); + json_object_string_addf( + json_row, "Rp Address", "%pPA", + (pim_addr *)&bsm_rpinfo->rpaddr.addr); json_object_int_add( json_row, "Rp HoldTime", - ntohs(rpaddr->rp_holdtime)); + ntohs(bsm_rpinfo->rp_holdtime)); json_object_int_add(json_row, "Rp Priority", - rpaddr->rp_pri); - json_object_object_add( - json_group, rp_str, json_row); + bsm_rpinfo->rp_pri); + json_object_object_addf( + json_group, json_row, "%pPA", + (pim_addr *)&bsm_rpinfo->rpaddr.addr); } else { - vty_out(vty, "%-15s %-12d %d\n", rp_str, - ntohs(rpaddr->rp_holdtime), - rpaddr->rp_pri); + vty_out(vty, "%-15pPA %-12d %d\n", + (pim_addr *)&bsm_rpinfo->rpaddr.addr, + ntohs(bsm_rpinfo->rp_holdtime), + bsm_rpinfo->rp_pri); } } vty_out(vty, "\n"); |