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:
Donatas Abraitis 2023-03-01 09:57:29 +02:00 committed by GitHub
commit 063c470100
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -154,11 +154,15 @@ int pim_mroute_msg_nocache(int fd, struct interface *ifp, const kernmsg *msg)
sg.src = msg->msg_im_src;
sg.grp = msg->msg_im_dst;
if (!pim_ifp) {
if (!pim_ifp || !pim_ifp->pim_enable) {
if (PIM_DEBUG_MROUTE)
zlog_debug(
"%s: PIM not enabled on interface, dropping packet to %pSG",
ifp->name, &sg);
"%s: %s on interface, dropping packet to %pSG",
ifp->name,
!pim_ifp ? "Multicast not enabled"
: "PIM not enabled",
&sg);
return 0;
}