From owner-svn-src-all@FreeBSD.ORG  Sat Jun 11 21:40:37 2011
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id A277E10656AD;
	Sat, 11 Jun 2011 21:40:37 +0000 (UTC) (envelope-from hrs@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 92C538FC08;
	Sat, 11 Jun 2011 21:40:37 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id p5BLebLA093131;
	Sat, 11 Jun 2011 21:40:37 GMT (envelope-from hrs@svn.freebsd.org)
Received: (from hrs@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id p5BLebvH093128;
	Sat, 11 Jun 2011 21:40:37 GMT (envelope-from hrs@svn.freebsd.org)
Message-Id: <201106112140.p5BLebvH093128@svn.freebsd.org>
From: Hiroki Sato <hrs@FreeBSD.org>
Date: Sat, 11 Jun 2011 21:40:37 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r222996 - head/etc
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 11 Jun 2011 21:40:37 -0000

Author: hrs
Date: Sat Jun 11 21:40:37 2011
New Revision: 222996
URL: http://svn.freebsd.org/changeset/base/222996

Log:
  Add a helper function to check kern.features.* sysctls.
  
  Discussed with:	dougb

Modified:
  head/etc/network.subr
  head/etc/rc.subr

Modified: head/etc/network.subr
==============================================================================
--- head/etc/network.subr	Sat Jun 11 21:27:14 2011	(r222995)
+++ head/etc/network.subr	Sat Jun 11 21:40:37 2011	(r222996)
@@ -349,11 +349,8 @@ afexists()
 	_af=$1
 
 	case ${_af} in
-	inet)
-		${SYSCTL_N} kern.features.inet > /dev/null 2>&1
-		;;
-	inet6)
-		${SYSCTL_N} kern.features.inet6 > /dev/null 2>&1
+	inet|inet6)
+		check_kern_features ${_af}
 		;;
 	ipx)
 		${SYSCTL_N} net.ipx > /dev/null 2>&1

Modified: head/etc/rc.subr
==============================================================================
--- head/etc/rc.subr	Sat Jun 11 21:27:14 2011	(r222995)
+++ head/etc/rc.subr	Sat Jun 11 21:40:37 2011	(r222996)
@@ -1734,6 +1734,28 @@ check_required_after()
 
 fi
 
+# check_kern_features mib
+#	Return existence of kern.features.* sysctl MIB as true or
+#	false.  The result will be cached in $_rc_cache_kern_features_
+#	namespace.  "0" means the kern.features.X exists.
+
+check_kern_features()
+{
+	local _v
+
+	[ -n "$1" ] || return 1;
+	_v=`eval echo "\\$_rc_cache_kern_features_$1"`
+	[ -n "$_v" ] && return "$_v";
+
+	if ${SYSCTL_N} kern.features.$1 > /dev/null 2>&1; then
+		eval _rc_cache_kern_features_$1=0
+		return 0
+	else
+		eval _rc_cache_kern_features_$1=1
+		return 1
+	fi
+}
+
 # _echoonce var msg mode
 #	mode=0: Echo $msg if ${$var} is empty.
 #	        After doing echo, a string is set to ${$var}.