svn commit: r235697 - stable/8/lib/libipsec

[Bjoern A. Zeeb]

Author: bz
Date: Sun May 20 20:25:57 2012
New Revision: 235697
URL: http://svn.freebsd.org/changeset/base/235697

Log:
  MFC r231532:
  
   MFp4 204292:
  
   Ignore the NAT_T extension types so we can at least dump the SADB from
   the in-base libipsec/setkey without error when NAT_T support is present
   in the kernel, though not printing the additional information yet.
   However in case there is no NAT_T support in kernel still consider them
   to be an error.

Modified:
  stable/8/lib/libipsec/pfkey.c
Directory Properties:
  stable/8/lib/libipsec/   (props changed)

Modified: stable/8/lib/libipsec/pfkey.c
==============================================================================
--- stable/8/lib/libipsec/pfkey.c	Sun May 20 20:25:22 2012	(r235696)
+++ stable/8/lib/libipsec/pfkey.c	Sun May 20 20:25:57 2012	(r235697)
@@ -1778,6 +1778,18 @@ pfkey_align(msg, mhp)
 		case SADB_X_EXT_SA2:
 			mhp[ext->sadb_ext_type] = (caddr_t)ext;
 			break;
+		case SADB_X_EXT_NAT_T_TYPE:
+		case SADB_X_EXT_NAT_T_SPORT:
+		case SADB_X_EXT_NAT_T_DPORT:
+		/* case SADB_X_EXT_NAT_T_OA: is OAI */
+		case SADB_X_EXT_NAT_T_OAI:
+		case SADB_X_EXT_NAT_T_OAR:
+		case SADB_X_EXT_NAT_T_FRAG:
+			if (feature_present("ipsec_natt")) {
+				mhp[ext->sadb_ext_type] = (caddr_t)ext;
+				break;
+			}
+			/* FALLTHROUGH */
 		default:
 			__ipsec_errcode = EIPSEC_INVAL_EXTTYPE;
 			return -1;