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_zebra.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_zebra.c')
| -rw-r--r-- | pimd/pim_zebra.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/pimd/pim_zebra.c b/pimd/pim_zebra.c index 1822de2299..bda5dd6845 100644 --- a/pimd/pim_zebra.c +++ b/pimd/pim_zebra.c @@ -1130,8 +1130,8 @@ void pim_forward_start(struct pim_ifchannel *ch) char group_str[100]; char upstream_str[100]; - pim_inet4_dump("<source?>", ch->source_addr, source_str, sizeof(source_str)); - pim_inet4_dump("<group?>", ch->group_addr, group_str, sizeof(group_str)); + pim_inet4_dump("<source?>", ch->sg.u.sg.src, source_str, sizeof(source_str)); + pim_inet4_dump("<group?>", ch->sg.u.sg.grp, group_str, sizeof(group_str)); pim_inet4_dump("<upstream?>", up->upstream_addr, upstream_str, sizeof(upstream_str)); zlog_debug("%s: (S,G)=(%s,%s) oif=%s(%s)", __PRETTY_FUNCTION__, @@ -1175,8 +1175,8 @@ void pim_forward_stop(struct pim_ifchannel *ch) if (PIM_DEBUG_PIM_TRACE) { char source_str[100]; char group_str[100]; - pim_inet4_dump("<source?>", ch->source_addr, source_str, sizeof(source_str)); - pim_inet4_dump("<group?>", ch->group_addr, group_str, sizeof(group_str)); + pim_inet4_dump("<source?>", ch->sg.u.sg.src, source_str, sizeof(source_str)); + pim_inet4_dump("<group?>", ch->sg.u.sg.grp, group_str, sizeof(group_str)); zlog_debug("%s: (S,G)=(%s,%s) oif=%s", __PRETTY_FUNCTION__, source_str, group_str, ch->interface->name); @@ -1185,8 +1185,8 @@ void pim_forward_stop(struct pim_ifchannel *ch) if (!up->channel_oil) { char source_str[100]; char group_str[100]; - pim_inet4_dump("<source?>", ch->source_addr, source_str, sizeof(source_str)); - pim_inet4_dump("<group?>", ch->group_addr, group_str, sizeof(group_str)); + pim_inet4_dump("<source?>", ch->sg.u.sg.src, source_str, sizeof(source_str)); + pim_inet4_dump("<group?>", ch->sg.u.sg.grp, group_str, sizeof(group_str)); zlog_warn("%s: (S,G)=(%s,%s) oif=%s missing channel OIL", __PRETTY_FUNCTION__, source_str, group_str, ch->interface->name); |