From cbc9217301d7d6d1aa586239c163d0dbf8287609 Mon Sep 17 00:00:00 2001 From: bms Date: Mon, 2 Jul 2012 10:06:00 +0000 Subject: [PATCH] Merge r237734 from HEAD: In MLDv2 general query processing, do not enforce the strict check on query origins. Submitted by: Gu Yong git-svn-id: svn://svn.freebsd.org/base/stable/9@237990 ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f --- sys/netinet6/mld6.c | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/sys/netinet6/mld6.c b/sys/netinet6/mld6.c index aeb20efb4..fa9b49217 100644 --- a/sys/netinet6/mld6.c +++ b/sys/netinet6/mld6.c @@ -866,16 +866,10 @@ mld_v2_input_query(struct ifnet *ifp, const struct ip6_hdr *ip6, */ if (IN6_IS_ADDR_UNSPECIFIED(&mld->mld_addr)) { /* - * General Queries SHOULD be directed to ff02::1. * A general query with a source list has undefined * behaviour; discard it. */ - struct in6_addr dst; - - dst = ip6->ip6_dst; - in6_clearscope(&dst); - if (!IN6_ARE_ADDR_EQUAL(&dst, &in6addr_linklocal_allnodes) || - nsrc > 0) + if (nsrc > 0) return (EINVAL); is_general_query = 1; } else { -- 2.45.0