Mirror/frr
0
0
Fork 1
mirror of https://github.com/FRRouting/frr.git synced 2025-05-01 05:57:15 +02:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

pimd: Trust the recvfromto ifindex information

Browse source 
The vrf interface is receiving the pim packet
instead of the slave interface that is bound.

Lookup the ifindex ifp pointer from that.

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
This commit is contained in:
Donald Sharp 2017-06-02 20:22:39 -04:00
parent 11699c4788
commit e2d451e2ee
1 changed files with 7 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
pimd/pim_pim.c
View file

@ -320,35 +320,13 @@ static int pim_sock_read(struct thread *t)
goto done; goto done;
} }
#ifdef PIM_CHECK_RECV_IFINDEX_SANITY /*
/* ifindex sanity check */ * What? So with vrf's the incoming packet is received
if (ifindex != (int)ifp->ifindex) { * on the vrf interface but recvfromto above returns
char from_str[INET_ADDRSTRLEN]; * the right ifindex, so just use it. We know
char to_str[INET_ADDRSTRLEN]; * it's the right interface because we bind to it
struct interface *recv_ifp; */
ifp = if_lookup_by_index(ifindex, pim_ifp->pim->vrf_id);
if (!inet_ntop(AF_INET, &from.sin_addr, from_str,
sizeof(from_str)))
sprintf(from_str, "<from?>");
if (!inet_ntop(AF_INET, &to.sin_addr, to_str,
sizeof(to_str)))
sprintf(to_str, "<to?>");
recv_ifp = if_lookup_by_index(ifindex, ifp->vrf_id);
if (recv_ifp) {
zassert(ifindex == (int)recv_ifp->ifindex);
}
#ifdef PIM_REPORT_RECV_IFINDEX_MISMATCH
zlog_warn(
"Interface mismatch: recv PIM pkt from %s to %s on fd=%d: recv_ifindex=%d (%s) sock_ifindex=%d (%s)",
from_str, to_str, fd, ifindex,
recv_ifp ? recv_ifp->name : "<if-notfound>",
ifp->ifindex, ifp->name);
#endif
goto done;
}
#endif
int fail = pim_pim_packet(ifp, buf, len); int fail = pim_pim_packet(ifp, buf, len);
if (fail) { if (fail) {