diff options
Diffstat (limited to 'pimd/pim_ifchannel.c')
| -rw-r--r-- | pimd/pim_ifchannel.c | 40 |
1 files changed, 16 insertions, 24 deletions
diff --git a/pimd/pim_ifchannel.c b/pimd/pim_ifchannel.c index 4d564e5046..bb56379c14 100644 --- a/pimd/pim_ifchannel.c +++ b/pimd/pim_ifchannel.c @@ -44,8 +44,7 @@ #include "pim_ssm.h" #include "pim_rp.h" -RB_GENERATE(pim_ifchannel_rb, pim_ifchannel, - pim_ifp_rb, pim_ifchannel_compare); +RB_GENERATE(pim_ifchannel_rb, pim_ifchannel, pim_ifp_rb, pim_ifchannel_compare); int pim_ifchannel_compare(const struct pim_ifchannel *ch1, const struct pim_ifchannel *ch2) @@ -642,11 +641,10 @@ static int on_ifjoin_prune_pending_timer(struct thread *t) ch = THREAD_ARG(t); if (PIM_DEBUG_TRACE) - zlog_debug("%s: IFCHANNEL%s %s Prune Pending Timer Popped", - __PRETTY_FUNCTION__, - pim_str_sg_dump(&ch->sg), - pim_ifchannel_ifjoin_name(ch->ifjoin_state, - ch->flags)); + zlog_debug( + "%s: IFCHANNEL%s %s Prune Pending Timer Popped", + __PRETTY_FUNCTION__, pim_str_sg_dump(&ch->sg), + pim_ifchannel_ifjoin_name(ch->ifjoin_state, ch->flags)); if (ch->ifjoin_state == PIM_IFJOIN_PRUNE_PENDING) { ifp = ch->interface; @@ -662,9 +660,8 @@ static int on_ifjoin_prune_pending_timer(struct thread *t) rpf.source_nexthop.interface = ifp; rpf.rpf_addr.u.prefix4 = pim_ifp->primary_address; - pim_jp_agg_single_upstream_send(&rpf, - ch->upstream, - 0); + pim_jp_agg_single_upstream_send( + &rpf, ch->upstream, 0); } ifjoin_to_noinfo(ch, true); @@ -681,8 +678,7 @@ static int on_ifjoin_prune_pending_timer(struct thread *t) ch->upstream); pim_jp_agg_single_upstream_send(&parent->rpf, - parent, - true); + parent, true); } } /* from here ch may have been deleted */ @@ -1374,8 +1370,7 @@ void pim_ifchannel_set_star_g_join_state(struct pim_ifchannel *ch, int eom, if (child->ifjoin_state == PIM_IFJOIN_PRUNE_PENDING_TMP) THREAD_OFF(child->t_ifjoin_prune_pending_timer); THREAD_OFF(child->t_ifjoin_expiry_timer); - struct pim_upstream *parent = - child->upstream->parent; + struct pim_upstream *parent = child->upstream->parent; PIM_IF_FLAG_UNSET_S_G_RPT(child->flags); child->ifjoin_state = PIM_IFJOIN_NOINFO; @@ -1383,19 +1378,16 @@ void pim_ifchannel_set_star_g_join_state(struct pim_ifchannel *ch, int eom, if (I_am_RP(pim, child->sg.grp)) { pim_channel_add_oif( child->upstream->channel_oil, - ch->interface, - PIM_OIF_FLAG_PROTO_STAR); - pim_upstream_switch( - pim, child->upstream, - PIM_UPSTREAM_JOINED); + ch->interface, PIM_OIF_FLAG_PROTO_STAR); + pim_upstream_switch(pim, child->upstream, + PIM_UPSTREAM_JOINED); pim_jp_agg_single_upstream_send( - &child->upstream->rpf, - child->upstream, true); + &child->upstream->rpf, child->upstream, + true); } if (parent) - pim_jp_agg_single_upstream_send( - &parent->rpf, - parent, true); + pim_jp_agg_single_upstream_send(&parent->rpf, + parent, true); delete_on_noinfo(child); break; |