From owner-svn-src-user@FreeBSD.ORG  Wed Dec  4 20:02:17 2013
Return-Path: <owner-svn-src-user@FreeBSD.ORG>
Delivered-To: svn-src-user@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 74047F0D;
 Wed,  4 Dec 2013 20:02:17 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id 610F11CDE;
 Wed,  4 Dec 2013 20:02:17 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rB4K2HVh063715;
 Wed, 4 Dec 2013 20:02:17 GMT (envelope-from ae@svn.freebsd.org)
Received: (from ae@localhost)
 by svn.freebsd.org (8.14.7/8.14.7/Submit) id rB4K2HXT063714;
 Wed, 4 Dec 2013 20:02:17 GMT (envelope-from ae@svn.freebsd.org)
Message-Id: <201312042002.rB4K2HXT063714@svn.freebsd.org>
From: "Andrey V. Elsukov" <ae@FreeBSD.org>
Date: Wed, 4 Dec 2013 20:02:17 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
Subject: svn commit: r258933 - 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.17
Precedence: list
List-Id: "SVN commit messages for the experimental &quot; user&quot;
 src tree" <svn-src-user.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-user>,
 <mailto:svn-src-user-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-user/>
List-Post: <mailto:svn-src-user@freebsd.org>
List-Help: <mailto:svn-src-user-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
 <mailto:svn-src-user-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 04 Dec 2013 20:02:17 -0000

Author: ae
Date: Wed Dec  4 20:02:16 2013
New Revision: 258933
URL: http://svnweb.freebsd.org/changeset/base/258933

Log:
  Compare zone indexes only when connection has link-local scope.

Modified:
  user/ae/inet6/sys/netinet6/in6_pcb.c

Modified: user/ae/inet6/sys/netinet6/in6_pcb.c
==============================================================================
--- user/ae/inet6/sys/netinet6/in6_pcb.c	Wed Dec  4 19:51:44 2013	(r258932)
+++ user/ae/inet6/sys/netinet6/in6_pcb.c	Wed Dec  4 20:02:16 2013	(r258933)
@@ -973,9 +973,8 @@ in6_pcblookup_hash_locked(struct inpcbin
 			continue;
 		if (IN6_ARE_ADDR_EQUAL(&inp->in6p_faddr, faddr) &&
 		    IN6_ARE_ADDR_EQUAL(&inp->in6p_laddr, laddr) &&
-		    inp->inp_fport == fport &&
-		    inp->inp_lport == lport &&
-		    inp->in6p_zoneid == zoneid) {
+		    inp->inp_fport == fport && inp->inp_lport == lport && (
+			inp->in6p_zoneid == 0 || inp->in6p_zoneid == zoneid)) {
 			/*
 			 * XXX We should be able to directly return
 			 * the inp here, without any checks.
@@ -1031,8 +1030,9 @@ in6_pcblookup_hash_locked(struct inpcbin
 					continue;
 			}
 
-			if (IN6_ARE_ADDR_EQUAL(&inp->in6p_laddr, laddr) &&
-			    inp->in6p_zoneid == zoneid) {
+			if (IN6_ARE_ADDR_EQUAL(&inp->in6p_laddr, laddr) && (
+			    inp->in6p_zoneid == 0 ||
+			    inp->in6p_zoneid == zoneid)) {
 				if (injail)
 					return (inp);
 				else