diff options
Diffstat (limited to 'pimd/pim_ifchannel.c')
| -rw-r--r-- | pimd/pim_ifchannel.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/pimd/pim_ifchannel.c b/pimd/pim_ifchannel.c index 3079c25a1c..956ab0d67c 100644 --- a/pimd/pim_ifchannel.c +++ b/pimd/pim_ifchannel.c @@ -306,8 +306,8 @@ void pim_ifchannel_ifjoin_switch(const char *caller, struct pim_ifchannel *ch, * supplying the implied * if channel. So remove it. */ - if (c_oil->oil.mfcc_ttls - [pim_ifp->mroute_vif_index]) + if (oil_if_has(c_oil, + pim_ifp->mroute_vif_index)) pim_channel_del_inherited_oif( c_oil, ch->interface, __func__); @@ -764,8 +764,7 @@ static void check_recv_upstream(int is_join, struct interface *recv_ifp, if (is_join) { /* Join(S,G) to RPF'(S,G) */ - pim_upstream_join_suppress(up, up->rpf.rpf_addr.u.prefix4, - holdtime); + pim_upstream_join_suppress(up, up->rpf.rpf_addr, holdtime); return; } @@ -1287,7 +1286,7 @@ void pim_ifchannel_local_membership_del(struct interface *ifp, pim_sgaddr *sg) if (!pim_upstream_evaluate_join_desired_interface( child, ch, starch) || (!chchannel && - c_oil->oil.mfcc_ttls[pim_ifp->mroute_vif_index])) { + oil_if_has(c_oil, pim_ifp->mroute_vif_index))) { pim_channel_del_inherited_oif(c_oil, ifp, __func__); } |