diff options
| author | Donald Sharp <donaldsharp72@gmail.com> | 2022-01-13 09:00:51 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-01-13 09:00:51 -0500 |
| commit | a64abeefdd89e19e77e65e0436725fc0a14f4ca8 (patch) | |
| tree | 3c00f4d84c790cf725b8f7ec297dbb1c30d6a6b9 | |
| parent | 379effbf700f594a12c9da0d15b41742b2db6f43 (diff) | |
| parent | 69b9ea0b496dd02aabda038465ba6b59bf1b3810 (diff) | |
Merge pull request #10334 from mobash-rasool/igmp-conf-fix
pimd: IGMP messages may be longer than 8 octets
| -rw-r--r-- | pimd/pim_igmpv2.c | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/pimd/pim_igmpv2.c b/pimd/pim_igmpv2.c index 2616afca69..a7c7c99ebf 100644 --- a/pimd/pim_igmpv2.c +++ b/pimd/pim_igmpv2.c @@ -115,10 +115,11 @@ int igmp_v2_recv_report(struct gm_sock *igmp, struct in_addr from, return 0; if (igmp_msg_len != IGMP_V12_MSG_SIZE) { - zlog_warn( - "Recv IGMPv2 REPORT from %s on %s: size=%d other than correct=%d", - from_str, ifp->name, igmp_msg_len, IGMP_V12_MSG_SIZE); - return -1; + if (PIM_DEBUG_IGMP_PACKETS) + zlog_debug( + "Recv IGMPv2 REPORT from %s on %s: size=%d other than correct=%d", + from_str, ifp->name, igmp_msg_len, + IGMP_V12_MSG_SIZE); } if (igmp_validate_checksum(igmp_msg, igmp_msg_len) == -1) { @@ -172,10 +173,11 @@ int igmp_v2_recv_leave(struct gm_sock *igmp, struct ip *ip_hdr, return 0; if (igmp_msg_len != IGMP_V12_MSG_SIZE) { - zlog_warn( - "Recv IGMPv2 LEAVE from %s on %s: size=%d other than correct=%d", - from_str, ifp->name, igmp_msg_len, IGMP_V12_MSG_SIZE); - return -1; + if (PIM_DEBUG_IGMP_PACKETS) + zlog_debug( + "Recv IGMPv2 LEAVE from %s on %s: size=%d other than correct=%d", + from_str, ifp->name, igmp_msg_len, + IGMP_V12_MSG_SIZE); } if (igmp_validate_checksum(igmp_msg, igmp_msg_len) == -1) { |