diff options
| author | Donald Sharp <sharpd@cumulusnetworks.com> | 2016-07-22 08:01:43 -0400 |
|---|---|---|
| committer | Donald Sharp <sharpd@cumulusnetworks.com> | 2016-12-21 20:26:02 -0500 |
| commit | 99064df9e385acc466ea8b4ee9f53709d0df9b55 (patch) | |
| tree | 42c6c8d33a467819346b76752c2b87814753478f /pimd/pim_cmd.c | |
| parent | e945ee80d35e4cce29ec87c1717db0597f8e6af4 (diff) | |
pimd: Convert ifchannel to using a prefix to store (s,g)
Convert ifchannel to use a prefix to store (s,g) information.
Additionally create pim_str_sg_dump function to output
data when using debugs.
Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
Diffstat (limited to 'pimd/pim_cmd.c')
| -rw-r--r-- | pimd/pim_cmd.c | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/pimd/pim_cmd.c b/pimd/pim_cmd.c index b595d337e7..726a033343 100644 --- a/pimd/pim_cmd.c +++ b/pimd/pim_cmd.c @@ -178,9 +178,9 @@ static void pim_show_assert(struct vty *vty) char uptime[10]; char timer[10]; - pim_inet4_dump("<ch_src?>", ch->source_addr, + pim_inet4_dump("<ch_src?>", ch->sg.u.sg.src, ch_src_str, sizeof(ch_src_str)); - pim_inet4_dump("<ch_grp?>", ch->group_addr, + pim_inet4_dump("<ch_grp?>", ch->sg.u.sg.grp, ch_grp_str, sizeof(ch_grp_str)); pim_inet4_dump("<assrt_win?>", ch->ifassert_winner, winner_str, sizeof(winner_str)); @@ -236,9 +236,9 @@ static void pim_show_assert_internal(struct vty *vty) char ch_src_str[100]; char ch_grp_str[100]; - pim_inet4_dump("<ch_src?>", ch->source_addr, + pim_inet4_dump("<ch_src?>", ch->sg.u.sg.src, ch_src_str, sizeof(ch_src_str)); - pim_inet4_dump("<ch_grp?>", ch->group_addr, + pim_inet4_dump("<ch_grp?>", ch->sg.u.sg.grp, ch_grp_str, sizeof(ch_grp_str)); vty_out(vty, "%-9s %-15s %-15s %-15s %-3s %-3s %-3s %-4s%s", ifp->name, @@ -284,9 +284,9 @@ static void pim_show_assert_metric(struct vty *vty) am = pim_macro_spt_assert_metric(&ch->upstream->rpf, pim_ifp->primary_address); - pim_inet4_dump("<ch_src?>", ch->source_addr, + pim_inet4_dump("<ch_src?>", ch->sg.u.sg.src, ch_src_str, sizeof(ch_src_str)); - pim_inet4_dump("<ch_grp?>", ch->group_addr, + pim_inet4_dump("<ch_grp?>", ch->sg.u.sg.grp, ch_grp_str, sizeof(ch_grp_str)); pim_inet4_dump("<addr?>", am.ip_address, addr_str, sizeof(addr_str)); @@ -337,9 +337,9 @@ static void pim_show_assert_winner_metric(struct vty *vty) am = &ch->ifassert_winner_metric; - pim_inet4_dump("<ch_src?>", ch->source_addr, + pim_inet4_dump("<ch_src?>", ch->sg.u.sg.src, ch_src_str, sizeof(ch_src_str)); - pim_inet4_dump("<ch_grp?>", ch->group_addr, + pim_inet4_dump("<ch_grp?>", ch->sg.u.sg.grp, ch_grp_str, sizeof(ch_grp_str)); pim_inet4_dump("<addr?>", am->ip_address, addr_str, sizeof(addr_str)); @@ -394,9 +394,9 @@ static void pim_show_membership(struct vty *vty) char ch_src_str[100]; char ch_grp_str[100]; - pim_inet4_dump("<ch_src?>", ch->source_addr, + pim_inet4_dump("<ch_src?>", ch->sg.u.sg.src, ch_src_str, sizeof(ch_src_str)); - pim_inet4_dump("<ch_grp?>", ch->group_addr, + pim_inet4_dump("<ch_grp?>", ch->sg.u.sg.grp, ch_grp_str, sizeof(ch_grp_str)); vty_out(vty, "%-9s %-15s %-15s %-15s %-10s%s", @@ -727,9 +727,9 @@ static void pim_show_join(struct vty *vty) char expire[10]; char prune[10]; - pim_inet4_dump("<ch_src?>", ch->source_addr, + pim_inet4_dump("<ch_src?>", ch->sg.u.sg.src, ch_src_str, sizeof(ch_src_str)); - pim_inet4_dump("<ch_grp?>", ch->group_addr, + pim_inet4_dump("<ch_grp?>", ch->sg.u.sg.grp, ch_grp_str, sizeof(ch_grp_str)); pim_time_uptime_begin(uptime, sizeof(uptime), now, ch->ifjoin_creation); |