mirror of
https://git.proxmox.com/git/mirror_frr
synced 2025-08-08 05:27:47 +00:00
Merge pull request #12914 from patrasar/pim_mroute_fix
pimd, pim6d: Don't start KAT timer when traffic received on PIM disabled interface
This commit is contained in:
commit
063c470100
@ -154,11 +154,15 @@ int pim_mroute_msg_nocache(int fd, struct interface *ifp, const kernmsg *msg)
|
|||||||
sg.src = msg->msg_im_src;
|
sg.src = msg->msg_im_src;
|
||||||
sg.grp = msg->msg_im_dst;
|
sg.grp = msg->msg_im_dst;
|
||||||
|
|
||||||
if (!pim_ifp) {
|
|
||||||
|
if (!pim_ifp || !pim_ifp->pim_enable) {
|
||||||
if (PIM_DEBUG_MROUTE)
|
if (PIM_DEBUG_MROUTE)
|
||||||
zlog_debug(
|
zlog_debug(
|
||||||
"%s: PIM not enabled on interface, dropping packet to %pSG",
|
"%s: %s on interface, dropping packet to %pSG",
|
||||||
ifp->name, &sg);
|
ifp->name,
|
||||||
|
!pim_ifp ? "Multicast not enabled"
|
||||||
|
: "PIM not enabled",
|
||||||
|
&sg);
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user