diff options
| author | Donald Sharp <sharpd@cumulusnetwroks.com> | 2016-07-22 23:28:13 -0400 |
|---|---|---|
| committer | Donald Sharp <sharpd@cumulusnetworks.com> | 2016-12-21 20:26:03 -0500 |
| commit | ee1a477a046442f251e18d16fcfc8039b94a09bf (patch) | |
| tree | 58fc2e908ede3138a829be0d047f8da1be2b94bd /pimd/pim_join.c | |
| parent | 5074a4230a11607b837fe07c7419ce5b3275f942 (diff) | |
pimd: Convert pim_ifchannel_join_add to struct prefix *sg
Convert the pim_ifchannel_join_add to use a struct prefix *sg
instead of struct in_addr's.
Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
Diffstat (limited to 'pimd/pim_join.c')
| -rw-r--r-- | pimd/pim_join.c | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/pimd/pim_join.c b/pimd/pim_join.c index 75f484e577..afebc03109 100644 --- a/pimd/pim_join.c +++ b/pimd/pim_join.c @@ -55,18 +55,20 @@ static void recv_join(struct interface *ifp, struct in_addr source, uint8_t source_flags) { + struct prefix sg; + + memset (&sg, 0, sizeof (struct prefix)); + sg.u.sg.src = source; + sg.u.sg.grp = group; + if (PIM_DEBUG_PIM_TRACE) { char up_str[100]; - char src_str[100]; - char grp_str[100]; char neigh_str[100]; pim_inet4_dump("<upstream?>", upstream, up_str, sizeof(up_str)); - pim_inet4_dump("<src?>", source, src_str, sizeof(src_str)); - pim_inet4_dump("<grp?>", group, grp_str, sizeof(grp_str)); pim_inet4_dump("<neigh?>", neigh->source_addr, neigh_str, sizeof(neigh_str)); - zlog_warn("%s: join (S,G)=(%s,%s) rpt=%d wc=%d upstream=%s holdtime=%d from %s on %s", + zlog_warn("%s: join (S,G)=%s rpt=%d wc=%d upstream=%s holdtime=%d from %s on %s", __PRETTY_FUNCTION__, - src_str, grp_str, + pim_str_sg_dump (&sg), source_flags & PIM_RPT_BIT_MASK, source_flags & PIM_WILDCARD_BIT_MASK, up_str, holdtime, neigh_str, ifp->name); @@ -74,7 +76,7 @@ static void recv_join(struct interface *ifp, /* Restart join expiry timer */ pim_ifchannel_join_add(ifp, neigh->source_addr, upstream, - source, group, source_flags, holdtime); + &sg, source_flags, holdtime); } static void recv_prune(struct interface *ifp, |