From owner-svn-src-head@freebsd.org  Tue Feb 11 20:41:52 2020
Return-Path: <owner-svn-src-head@freebsd.org>
Delivered-To: svn-src-head@mailman.nyi.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
 by mailman.nyi.freebsd.org (Postfix) with ESMTP id 85D782436D6;
 Tue, 11 Feb 2020 20:41:52 +0000 (UTC)
 (envelope-from lwhsu@FreeBSD.org)
Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org
 [IPv6:2610:1c1:1:606c::19:3])
 (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
 server-signature RSA-PSS (4096 bits)
 client-signature RSA-PSS (4096 bits) client-digest SHA256)
 (Client CN "mxrelay.nyi.freebsd.org",
 Issuer "Let's Encrypt Authority X3" (verified OK))
 by mx1.freebsd.org (Postfix) with ESMTPS id 48HF7N32LHz4dkx;
 Tue, 11 Feb 2020 20:41:52 +0000 (UTC)
 (envelope-from lwhsu@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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 62F96DF47;
 Tue, 11 Feb 2020 20:41:52 +0000 (UTC)
 (envelope-from lwhsu@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 01BKfqMn058936;
 Tue, 11 Feb 2020 20:41:52 GMT (envelope-from lwhsu@FreeBSD.org)
Received: (from lwhsu@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id 01BKfqhk058935;
 Tue, 11 Feb 2020 20:41:52 GMT (envelope-from lwhsu@FreeBSD.org)
Message-Id: <202002112041.01BKfqhk058935@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: lwhsu set sender to
 lwhsu@FreeBSD.org using -f
From: Li-Wen Hsu <lwhsu@FreeBSD.org>
Date: Tue, 11 Feb 2020 20:41:52 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r357778 - head/tests/sys/mac/portacl
X-SVN-Group: head
X-SVN-Commit-Author: lwhsu
X-SVN-Commit-Paths: head/tests/sys/mac/portacl
X-SVN-Commit-Revision: 357778
X-SVN-Commit-Repository: base
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.29
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 11 Feb 2020 20:41:52 -0000

Author: lwhsu
Date: Tue Feb 11 20:41:51 2020
New Revision: 357778
URL: https://svnweb.freebsd.org/changeset/base/357778

Log:
  Reduce nc timeout in sys.mac.portacl.*
  
  It is not necessary to wait that long for localhost.
  
  Sponsored by:	The FreeBSD Foundation

Modified:
  head/tests/sys/mac/portacl/misc.sh

Modified: head/tests/sys/mac/portacl/misc.sh
==============================================================================
--- head/tests/sys/mac/portacl/misc.sh	Tue Feb 11 20:15:49 2020	(r357777)
+++ head/tests/sys/mac/portacl/misc.sh	Tue Feb 11 20:41:51 2020	(r357778)
@@ -17,6 +17,7 @@ check_bind() {
 	local host idtype name proto port udpflag
 
 	host="127.0.0.1"
+	timeout=1
 
 	idtype=${1}
 	name=${2}
@@ -28,7 +29,7 @@ check_bind() {
 	out=$(
 		case "${idtype}" in
 		uid|gid)
-			( echo -n | su -m ${name} -c "nc ${udpflag} -l -w 10 $host $port" 2>&1 ) &
+			( echo -n | su -m ${name} -c "nc ${udpflag} -l -w ${timeout} $host $port" 2>&1 ) &
 			;;
 		jail)
 			kill $$
@@ -37,7 +38,7 @@ check_bind() {
 			kill $$
 		esac
 		sleep 0.3
-		echo | nc ${udpflag} -w 10 $host $port >/dev/null 2>&1
+		echo | nc ${udpflag} -w ${timeout} $host $port >/dev/null 2>&1
 		wait
 	)
 	case "${out}" in