From owner-svn-src-user@FreeBSD.ORG Wed Feb 20 10:58:43 2013 Return-Path: Delivered-To: svn-src-user@freebsd.org Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id 2B9A9AF9; Wed, 20 Feb 2013 10:58:43 +0000 (UTC) (envelope-from ae@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id 1E3586F4; Wed, 20 Feb 2013 10:58:43 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id r1KAwhXX040259; Wed, 20 Feb 2013 10:58:43 GMT (envelope-from ae@svn.freebsd.org) Received: (from ae@localhost) by svn.freebsd.org (8.14.5/8.14.5/Submit) id r1KAwgb1040258; Wed, 20 Feb 2013 10:58:42 GMT (envelope-from ae@svn.freebsd.org) Message-Id: <201302201058.r1KAwgb1040258@svn.freebsd.org> From: "Andrey V. Elsukov" Date: Wed, 20 Feb 2013 10:58:42 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r247024 - user/ae/inet6/sys/netinet6 X-SVN-Group: user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 20 Feb 2013 10:58:43 -0000 Author: ae Date: Wed Feb 20 10:58:42 2013 New Revision: 247024 URL: http://svnweb.freebsd.org/changeset/base/247024 Log: Remove in6_clearscope call. Modified: user/ae/inet6/sys/netinet6/in6_mcast.c Modified: user/ae/inet6/sys/netinet6/in6_mcast.c ============================================================================== --- user/ae/inet6/sys/netinet6/in6_mcast.c Wed Feb 20 10:51:34 2013 (r247023) +++ user/ae/inet6/sys/netinet6/in6_mcast.c Wed Feb 20 10:58:42 2013 (r247024) @@ -330,7 +330,6 @@ im6o_match_source(const struct ip6_mopti psa = (const sockunion_t *)src; find.im6s_addr = psa->sin6.sin6_addr; - in6_clearscope(&find.im6s_addr); /* XXX */ ims = RB_FIND(ip6_msource_tree, &imf->im6f_sources, &find); return ((struct in6_msource *)ims); @@ -1826,8 +1825,7 @@ in6p_join_group(struct inpcb *inp, struc if (mreq.ipv6mr_interface == 0) { ifp = in6p_lookup_mcast_ifp(inp, &gsa->sin6); } else { - if (mreq.ipv6mr_interface < 0 || - V_if_index < mreq.ipv6mr_interface) + if (V_if_index < mreq.ipv6mr_interface) return (EADDRNOTAVAIL); ifp = ifnet_byindex(mreq.ipv6mr_interface); } @@ -1860,7 +1858,7 @@ in6p_join_group(struct inpcb *inp, struc if (IN6_IS_ADDR_MULTICAST(&ssa->sin6.sin6_addr)) return (EINVAL); /* - * TODO: Validate embedded scope ID in source + * XXX: Validate embedded scope ID in source * list entry against passed-in ifp, if and only * if source list filter entry is iface or node local. */