From owner-svn-src-projects@freebsd.org  Mon Nov 21 18:13:11 2016
Return-Path: <owner-svn-src-projects@freebsd.org>
Delivered-To: svn-src-projects@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 5E43CC4CB3A
 for <svn-src-projects@mailman.ysv.freebsd.org>;
 Mon, 21 Nov 2016 18:13:11 +0000 (UTC) (envelope-from ae@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 2E9191ABD;
 Mon, 21 Nov 2016 18:13:11 +0000 (UTC) (envelope-from ae@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id uALIDAEF086590;
 Mon, 21 Nov 2016 18:13:10 GMT (envelope-from ae@FreeBSD.org)
Received: (from ae@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id uALIDAsG086589;
 Mon, 21 Nov 2016 18:13:10 GMT (envelope-from ae@FreeBSD.org)
Message-Id: <201611211813.uALIDAsG086589@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: ae set sender to ae@FreeBSD.org
 using -f
From: "Andrey V. Elsukov" <ae@FreeBSD.org>
Date: Mon, 21 Nov 2016 18:13:10 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject: svn commit: r308929 - projects/ipsec/sys/netipsec
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.23
Precedence: list
List-Id: "SVN commit messages for the src &quot; projects&quot;
 tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-projects>, 
 <mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects/>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
 <mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 21 Nov 2016 18:13:11 -0000

Author: ae
Date: Mon Nov 21 18:13:10 2016
New Revision: 308929
URL: https://svnweb.freebsd.org/changeset/base/308929

Log:
  Modify ipsec_address() to print out IPv6 scope zone id for link-local
  IPv6 addresses. Also print "*" for sockaddr with zero sa_family.

Modified:
  projects/ipsec/sys/netipsec/ipsec.c

Modified: projects/ipsec/sys/netipsec/ipsec.c
==============================================================================
--- projects/ipsec/sys/netipsec/ipsec.c	Mon Nov 21 15:42:54 2016	(r308928)
+++ projects/ipsec/sys/netipsec/ipsec.c	Mon Nov 21 18:13:10 2016	(r308929)
@@ -1647,8 +1647,17 @@ ipsec_address(union sockaddr_union* sa, 
 #endif /* INET */
 #ifdef INET6
 	case AF_INET6:
-		return (inet_ntop(AF_INET6, &sa->sin6.sin6_addr, buf, size));
+		if (IN6_IS_SCOPE_LINKLOCAL(&sa->sin6.sin6_addr)) {
+			snprintf(buf, size, "%s%%%u", inet_ntop(AF_INET6,
+			    &sa->sin6.sin6_addr, buf, size),
+			    sa->sin6.sin6_scope_id);
+			return (buf);
+		} else
+			return (inet_ntop(AF_INET6, &sa->sin6.sin6_addr,
+			    buf, size));
 #endif /* INET6 */
+	case 0:
+		return ("*");
 	default:
 		return ("(unknown address family)");
 	}
@@ -1657,7 +1666,7 @@ ipsec_address(union sockaddr_union* sa, 
 char *
 ipsec_logsastr(struct secasvar *sav, char *buf, size_t size)
 {
-	char sbuf[INET6_ADDRSTRLEN], dbuf[INET6_ADDRSTRLEN];
+	char sbuf[IPSEC_ADDRSTRLEN], dbuf[IPSEC_ADDRSTRLEN];
 
 	IPSEC_ASSERT(sav->sah->saidx.src.sa.sa_family ==
 	    sav->sah->saidx.dst.sa.sa_family, ("address family mismatch"));