From owner-svn-src-user@FreeBSD.ORG  Tue Oct 15 23:28:13 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 D859E337;
 Tue, 15 Oct 2013 23:28:13 +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 C6CBF2FD0;
 Tue, 15 Oct 2013 23:28:13 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r9FNSDuw089443;
 Tue, 15 Oct 2013 23:28:13 GMT (envelope-from ae@svn.freebsd.org)
Received: (from ae@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r9FNSD7Z089442;
 Tue, 15 Oct 2013 23:28:13 GMT (envelope-from ae@svn.freebsd.org)
Message-Id: <201310152328.r9FNSD7Z089442@svn.freebsd.org>
From: "Andrey V. Elsukov" <ae@FreeBSD.org>
Date: Tue, 15 Oct 2013 23:28:13 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
Subject: svn commit: r256567 - 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: Tue, 15 Oct 2013 23:28:13 -0000

Author: ae
Date: Tue Oct 15 23:28:13 2013
New Revision: 256567
URL: http://svnweb.freebsd.org/changeset/base/256567

Log:
  Properly initialie sin6_scope_id.

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

Modified: user/ae/inet6/sys/netinet/tcp_syncache.c
==============================================================================
--- user/ae/inet6/sys/netinet/tcp_syncache.c	Tue Oct 15 23:25:06 2013	(r256566)
+++ user/ae/inet6/sys/netinet/tcp_syncache.c	Tue Oct 15 23:28:13 2013	(r256567)
@@ -776,7 +776,9 @@ syncache_socket(struct syncache *sc, str
 		sin6.sin6_len = sizeof(sin6);
 		sin6.sin6_addr = sc->sc_inc.inc6_faddr;
 		sin6.sin6_port = sc->sc_inc.inc_fport;
-		sin6.sin6_flowinfo = sin6.sin6_scope_id = 0;
+		sin6.sin6_flowinfo = 0;
+		sin6.sin6_scope_id = IN6_IS_ADDR_LINKLOCAL(&sin6.sin6_addr) ?
+		    sc->sc_inc.inc6_zoneid: 0;
 		laddr6 = inp->in6p_laddr;
 		if (IN6_IS_ADDR_UNSPECIFIED(&inp->in6p_laddr))
 			inp->in6p_laddr = sc->sc_inc.inc6_laddr;