From owner-svn-src-user@FreeBSD.ORG  Tue Jan 22 18:25:56 2013
Return-Path: <owner-svn-src-user@FreeBSD.ORG>
Delivered-To: svn-src-user@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by hub.freebsd.org (Postfix) with ESMTP id 8210D5D9;
 Tue, 22 Jan 2013 18:25:56 +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 5ECD2B3E;
 Tue, 22 Jan 2013 18:25:56 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id r0MIPuPZ065238;
 Tue, 22 Jan 2013 18:25:56 GMT (envelope-from ae@svn.freebsd.org)
Received: (from ae@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id r0MIPuhC065236;
 Tue, 22 Jan 2013 18:25:56 GMT (envelope-from ae@svn.freebsd.org)
Message-Id: <201301221825.r0MIPuhC065236@svn.freebsd.org>
From: "Andrey V. Elsukov" <ae@FreeBSD.org>
Date: Tue, 22 Jan 2013 18:25:56 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
Subject: svn commit: r245812 - 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 &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, 22 Jan 2013 18:25:56 -0000

Author: ae
Date: Tue Jan 22 18:25:55 2013
New Revision: 245812
URL: http://svnweb.freebsd.org/changeset/base/245812

Log:
  Automatically fill sin6_scope_id for loopback address.

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

Modified: user/ae/inet6/sys/netinet6/scope6.c
==============================================================================
--- user/ae/inet6/sys/netinet6/scope6.c	Tue Jan 22 18:23:07 2013	(r245811)
+++ user/ae/inet6/sys/netinet6/scope6.c	Tue Jan 22 18:25:55 2013	(r245812)
@@ -466,6 +466,20 @@ sa6_checkzone(struct sockaddr_in6 *sa6)
 
 	scope = in6_addrscope(&sa6->sin6_addr);
 	if (scope == IPV6_ADDR_SCOPE_GLOBAL) {
+		/*
+		 * Since ::1 address always configured on the lo0, we can
+		 * automagically set its zone id, when it is not specified.
+		 * Return error, when specified zone id doesn't match with
+		 * actual value.
+		 */
+		if (IN6_IS_ADDR_LOOPBACK(&sa6->sin6_addr)) {
+			if (sa6.sin6_scope_id == 0) {
+				sa6.sin6_scope_id = in6_getlinkzone(V_loif);
+				return (0);
+			}
+			if (sa6.sin6_scope_id == in6_getlinkzone(V_loif))
+				return (0);
+		}
 		/* We don't want zone id for global scope */
 		return (sa6.sin6_scope_id ? EINVAL: 0);
 	}