From owner-svn-src-user@FreeBSD.ORG  Fri Oct 25 02:55:05 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 ESMTP id 1410BED6;
 Fri, 25 Oct 2013 02:55:05 +0000 (UTC) (envelope-from ae@FreeBSD.org)
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 0279A2353;
 Fri, 25 Oct 2013 02:55:05 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r9P2t4R3055679;
 Fri, 25 Oct 2013 02:55:04 GMT (envelope-from ae@svn.freebsd.org)
Received: (from ae@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r9P2t4Zj055678;
 Fri, 25 Oct 2013 02:55:04 GMT (envelope-from ae@svn.freebsd.org)
Message-Id: <201310250255.r9P2t4Zj055678@svn.freebsd.org>
From: "Andrey V. Elsukov" <ae@FreeBSD.org>
Date: Fri, 25 Oct 2013 02:55:04 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
Subject: svn commit: r257091 - user/ae/inet6/sys/netinet
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 &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: Fri, 25 Oct 2013 02:55:05 -0000

Author: ae
Date: Fri Oct 25 02:55:04 2013
New Revision: 257091
URL: http://svnweb.freebsd.org/changeset/base/257091

Log:
  Refactor sysctl_drop():
  * remove sa6_embedscope() calls,  use sa6_checkzone() instead;
  * determine interface by zone id and pass it to in6_pcblookup.

Modified:
  user/ae/inet6/sys/netinet/tcp_subr.c

Modified: user/ae/inet6/sys/netinet/tcp_subr.c
==============================================================================
--- user/ae/inet6/sys/netinet/tcp_subr.c	Fri Oct 25 02:40:56 2013	(r257090)
+++ user/ae/inet6/sys/netinet/tcp_subr.c	Fri Oct 25 02:55:04 2013	(r257091)
@@ -2189,7 +2189,9 @@ sysctl_drop(SYSCTL_HANDLER_ARGS)
 	struct tcptw *tw;
 	struct sockaddr_in *fin, *lin;
 #ifdef INET6
+	struct ifnet *ifp;
 	struct sockaddr_in6 *fin6, *lin6;
+	uint32_t zoneid;
 #endif
 	int error;
 
@@ -2227,12 +2229,26 @@ sysctl_drop(SYSCTL_HANDLER_ARGS)
 			lin = (struct sockaddr_in *)&addrs[1];
 			break;
 		}
-		error = sa6_embedscope(fin6, V_ip6_use_defzone);
+		error = sa6_checkzone(fin6);
 		if (error)
 			return (error);
-		error = sa6_embedscope(lin6, V_ip6_use_defzone);
+		error = sa6_checkzone(lin6);
 		if (error)
 			return (error);
+		ifp = NULL;
+		zoneid = 0;
+		if (fin6->sin6_scope_id != 0)
+			zoneid = fin6->sin6_scope_id;
+		if (lin6->sin6_scope_id != 0) {
+			if (zoneid != 0 && zoneid != lin6->sin6_scope_id)
+				return (EINVAL);
+			zoneid = lin6->sin6_scope_id;
+		}
+		if (zoneid != 0) {
+			ifp = in6_getlinkifnet(zoneid);
+			if (ifp == NULL)
+				return (ENOENT);
+		}
 		break;
 #endif
 #ifdef INET
@@ -2253,7 +2269,7 @@ sysctl_drop(SYSCTL_HANDLER_ARGS)
 	case AF_INET6:
 		inp = in6_pcblookup(&V_tcbinfo, &fin6->sin6_addr,
 		    fin6->sin6_port, &lin6->sin6_addr, lin6->sin6_port,
-		    INPLOOKUP_WLOCKPCB, NULL);
+		    INPLOOKUP_WLOCKPCB, ifp);
 		break;
 #endif
 #ifdef INET