Module Name: src
Committed By: vanhu
Date: Mon Aug 17 13:52:14 UTC 2009
Modified Files:
src/crypto/dist/ipsec-tools/src/libipsec: libpfkey.h
Log Message:
do not use SADB_X_NAT_T_NEW_MAPPING to check system support for NAT-T, as at
least FreeBSD doesn't have this define anymore
To generate a diff of this commit:
cvs rdiff -u -r1.16 -r1.17 \
src/crypto/dist/ipsec-tools/src/libipsec/libpfkey.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/crypto/dist/ipsec-tools/src/libipsec/libpfkey.h
diff -u src/crypto/dist/ipsec-tools/src/libipsec/libpfkey.h:1.16 src/crypto/dist/ipsec-tools/src/libipsec/libpfkey.h:1.17
--- src/crypto/dist/ipsec-tools/src/libipsec/libpfkey.h:1.16 Fri Jul 3 06:40:10 2009
+++ src/crypto/dist/ipsec-tools/src/libipsec/libpfkey.h Mon Aug 17 13:52:14 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: libpfkey.h,v 1.16 2009/07/03 06:40:10 tteras Exp $ */
+/* $NetBSD: libpfkey.h,v 1.17 2009/08/17 13:52:14 vanhu Exp $ */
/* Id: libpfkey.h,v 1.13 2005/12/04 20:26:43 manubsd Exp */
@@ -161,7 +161,7 @@
/* XXX should be somewhere else !!!
*/
-#ifdef SADB_X_NAT_T_NEW_MAPPING
+#ifdef SADB_X_EXT_NAT_T_TYPE
#define PFKEY_ADDR_X_PORT(ext) (ntohs(((struct sadb_x_nat_t_port *)ext)->sadb_x_nat_t_port_port))
#define PFKEY_ADDR_X_NATTYPE(ext) ( ext != NULL && ((struct sadb_x_nat_t_type *)ext)->sadb_x_nat_t_type_type )
#endif
