svn commit: r214565 - head/sys/netipsec

[Bjoern A. Zeeb]

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 */