diff options
Diffstat (limited to 'pimd/pim_zebra.c')
| -rw-r--r-- | pimd/pim_zebra.c | 29 |
1 files changed, 16 insertions, 13 deletions
diff --git a/pimd/pim_zebra.c b/pimd/pim_zebra.c index f911293219..e77086059f 100644 --- a/pimd/pim_zebra.c +++ b/pimd/pim_zebra.c @@ -545,10 +545,10 @@ void pim_scan_individual_oil(struct channel_oil *c_oil, int in_vif_index) } if (PIM_DEBUG_ZEBRA) { - struct interface *old_iif = - pim_if_find_by_vif_index(c_oil->oil.mfcc_parent); - struct interface *new_iif = - pim_if_find_by_vif_index(input_iface_vif_index); + struct interface *old_iif = pim_if_find_by_vif_index( + c_oil->pim, c_oil->oil.mfcc_parent); + struct interface *new_iif = pim_if_find_by_vif_index( + c_oil->pim, input_iface_vif_index); char source_str[INET_ADDRSTRLEN]; char group_str[INET_ADDRSTRLEN]; pim_inet4_dump("<source?>", c_oil->oil.mfcc_origin, source_str, @@ -564,8 +564,8 @@ void pim_scan_individual_oil(struct channel_oil *c_oil, int in_vif_index) /* new iif loops to existing oif ? */ if (c_oil->oil.mfcc_ttls[input_iface_vif_index]) { - struct interface *new_iif = - pim_if_find_by_vif_index(input_iface_vif_index); + struct interface *new_iif = pim_if_find_by_vif_index( + c_oil->pim, input_iface_vif_index); if (PIM_DEBUG_ZEBRA) { char source_str[INET_ADDRSTRLEN]; @@ -590,10 +590,10 @@ void pim_scan_individual_oil(struct channel_oil *c_oil, int in_vif_index) if (pim_mroute_add(c_oil, __PRETTY_FUNCTION__)) { if (PIM_DEBUG_MROUTE) { /* just log warning */ - struct interface *old_iif = - pim_if_find_by_vif_index(old_vif_index); - struct interface *new_iif = - pim_if_find_by_vif_index(input_iface_vif_index); + struct interface *old_iif = pim_if_find_by_vif_index( + c_oil->pim, old_vif_index); + struct interface *new_iif = pim_if_find_by_vif_index( + c_oil->pim, input_iface_vif_index); char source_str[INET_ADDRSTRLEN]; char group_str[INET_ADDRSTRLEN]; pim_inet4_dump("<source?>", c_oil->oil.mfcc_origin, @@ -627,7 +627,8 @@ void pim_scan_oil() if (c_oil->up && c_oil->up->rpf.source_nexthop.interface) { ifindex = c_oil->up->rpf.source_nexthop .interface->ifindex; - vif_index = pim_if_find_vifindex_by_ifindex(ifindex); + vif_index = pim_if_find_vifindex_by_ifindex(c_oil->pim, + ifindex); /* Pass Current selected NH vif index to mroute download */ if (vif_index) @@ -917,6 +918,7 @@ void igmp_source_forward_start(struct igmp_source *source) if (nexthop.interface) input_iface_vif_index = pim_if_find_vifindex_by_ifindex( + pimg, nexthop.interface->ifindex); } else { if (PIM_DEBUG_ZEBRA) { @@ -1154,6 +1156,7 @@ void pim_forward_start(struct pim_ifchannel *ch) 0)) input_iface_vif_index = pim_if_find_vifindex_by_ifindex( + pimg, up->rpf.source_nexthop .interface->ifindex); else { @@ -1197,8 +1200,8 @@ void pim_forward_start(struct pim_ifchannel *ch) return; } if (PIM_DEBUG_TRACE) { - struct interface *in_intf = - pim_if_find_by_vif_index(input_iface_vif_index); + struct interface *in_intf = pim_if_find_by_vif_index( + pimg, input_iface_vif_index); zlog_debug( "%s: Update channel_oil IIF %s VIFI %d entry %s ", __PRETTY_FUNCTION__, |