From owner-svn-src-head@FreeBSD.ORG  Sat Oct 30 18:52:45 2010
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 2FCEA1065674;
	Sat, 30 Oct 2010 18:52:45 +0000 (UTC) (envelope-from bz@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 1DCD38FC08;
	Sat, 30 Oct 2010 18:52:45 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o9UIqjr5012019;
	Sat, 30 Oct 2010 18:52:45 GMT (envelope-from bz@svn.freebsd.org)
Received: (from bz@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o9UIqjeR012017;
	Sat, 30 Oct 2010 18:52:45 GMT (envelope-from bz@svn.freebsd.org)
Message-Id: <201010301852.o9UIqjeR012017@svn.freebsd.org>
From: "Bjoern A. Zeeb" <bz@FreeBSD.org>
Date: Sat, 30 Oct 2010 18:52:44 +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: r214565 - head/sys/netipsec
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
	<svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/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: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 30 Oct 2010 18:52:45 -0000

Author: bz
Date: Sat Oct 30 18:52:44 2010
New Revision: 214565
URL: http://svn.freebsd.org/changeset/base/214565

Log:
  Announce both IPsec and UDP Encap (NAT-T) if available for
  feature_present(3) checks.
  
  This will help to run-time detect and conditionally handle specific
  optionas of either feature in user space (i.e. in libipsec).
  
  Descriptions read by:	rwatson
  MFC after:		2 weeks

Modified:
  head/sys/netipsec/ipsec.c

Modified: head/sys/netipsec/ipsec.c
==============================================================================
--- head/sys/netipsec/ipsec.c	Sat Oct 30 18:00:53 2010	(r214564)
+++ head/sys/netipsec/ipsec.c	Sat Oct 30 18:52:44 2010	(r214565)
@@ -126,6 +126,11 @@ VNET_DEFINE(int, ip4_esp_randpad) = -1;
  */
 VNET_DEFINE(int, crypto_support) = CRYPTOCAP_F_HARDWARE | CRYPTOCAP_F_SOFTWARE;
 
+FEATURE(ipsec, "Internet Protocol Security (IPsec)");
+#ifdef IPSEC_NAT_T
+FEATURE(ipsec_natt, "UDP Encapsulation of IPsec ESP Packets ('NAT-T')");
+#endif
+
 SYSCTL_DECL(_net_inet_ipsec);
 
 /* net.inet.ipsec */