proxmox-mirrors/mirror_frr
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_frr synced 2025-04-28 15:36:25 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

pimd: Fix PIM6 MLD VRF support (use recvmsg() pktinfo)

Browse Source 
When receiving MLD messages, prefer pktinfo over msghdr.msg_name for
determining the source interface. The latter is just the VRF master
interface in case of VRF and we need the true interface the packet was
received on instead.

Signed-off-by: Martin Buck <mb-tmp-tvguho.pbz@gromit.dyndns.org>
(cherry picked from commit 374c8dc4dbc8a560036fecdfb3213f690099b869)
This commit is contained in:
Martin Buck 2025-03-04 14:24:33 +01:00 committed by Mergify
parent 9ffd44779b
commit 3802a0b709
1 changed files with 15 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
pimd/pim6_mld.c
View File

@ -1657,18 +1657,6 @@ static void gm_t_recv(struct event *t)
goto out_free;
}
struct interface *ifp;
ifp = if_lookup_by_index(pkt_src->sin6_scope_id, pim->vrf->vrf_id);
if (!ifp || !ifp->info)
goto out_free;
struct pim_interface *pim_ifp = ifp->info;
struct gm_if *gm_ifp = pim_ifp->mld;
if (!gm_ifp)
goto out_free;
for (cmsg = CMSG_FIRSTHDR(mh); cmsg; cmsg = CMSG_NXTHDR(mh, cmsg)) {
if (cmsg->cmsg_level != SOL_IPV6)
continue;
@ -1687,6 +1675,21 @@ static void gm_t_recv(struct event *t)
}
}
/* Prefer pktinfo as that also works in case of VRF */
ifindex_t ifindex = pktinfo ? pktinfo->ipi6_ifindex
: pkt_src->sin6_scope_id;
struct interface *ifp;
ifp = if_lookup_by_index(ifindex, pim->vrf->vrf_id);
if (!ifp || !ifp->info)
goto out_free;
struct pim_interface *pim_ifp = ifp->info;
struct gm_if *gm_ifp = pim_ifp->mld;
if (!gm_ifp)
goto out_free;
if (!pktinfo || !hoplimit) {
zlog_err(log_ifp(
"BUG: packet without IPV6_PKTINFO or IPV6_HOPLIMIT"));