svn commit: r215225 - stable/8/sys/netipsec

[Bjoern A. Zeeb]

Author: bz
Date: Sat Nov 13 01:28:56 2010
New Revision: 215225
URL: http://svn.freebsd.org/changeset/base/215225

Log:
  MFC r214565:
  
    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

Modified:
  stable/8/sys/netipsec/ipsec.c
Directory Properties:
  stable/8/sys/   (props changed)
  stable/8/sys/amd64/include/xen/   (props changed)
  stable/8/sys/cddl/contrib/opensolaris/   (props changed)
  stable/8/sys/contrib/dev/acpica/   (props changed)
  stable/8/sys/contrib/pf/   (props changed)
  stable/8/sys/dev/xen/xenpci/   (props changed)

Modified: stable/8/sys/netipsec/ipsec.c
==============================================================================
--- stable/8/sys/netipsec/ipsec.c	Sat Nov 13 01:21:55 2010	(r215224)
+++ stable/8/sys/netipsec/ipsec.c	Sat Nov 13 01:28:56 2010	(r215225)
@@ -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 */