[src/trunk]: src/sys/netinet6 Defopt IPSEC_NAT_T.

[tron <tron%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/40fdbbb0dd33
branches:  trunk
changeset: 582832:40fdbbb0dd33
user:      tron <tron%NetBSD.org@localhost>
date:      Thu Jul 07 16:00:56 2005 +0000

description:
Defopt IPSEC_NAT_T.

diffstat:

 sys/netinet6/ah_input.c     |  5 +++--
 sys/netinet6/esp_input.c    |  5 +++--
 sys/netinet6/esp_output.c   |  5 +++--
 sys/netinet6/files.ipsec    |  3 ++-
 sys/netinet6/ipcomp_input.c |  5 +++--
 5 files changed, 14 insertions(+), 9 deletions(-)

diffs (97 lines):

diff -r 9af8450c01e4 -r 40fdbbb0dd33 sys/netinet6/ah_input.c
--- a/sys/netinet6/ah_input.c   Thu Jul 07 14:26:37 2005 +0000
+++ b/sys/netinet6/ah_input.c   Thu Jul 07 16:00:56 2005 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: ah_input.c,v 1.47 2005/05/20 01:25:17 manu Exp $       */
+/*     $NetBSD: ah_input.c,v 1.48 2005/07/07 16:00:56 tron Exp $       */
 /*     $KAME: ah_input.c,v 1.64 2001/09/04 08:43:19 itojun Exp $       */
 
 /*
@@ -35,9 +35,10 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ah_input.c,v 1.47 2005/05/20 01:25:17 manu Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ah_input.c,v 1.48 2005/07/07 16:00:56 tron Exp $");
 
 #include "opt_inet.h"
+#include "opt_ipsec.h"
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff -r 9af8450c01e4 -r 40fdbbb0dd33 sys/netinet6/esp_input.c
--- a/sys/netinet6/esp_input.c  Thu Jul 07 14:26:37 2005 +0000
+++ b/sys/netinet6/esp_input.c  Thu Jul 07 16:00:56 2005 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: esp_input.c,v 1.37 2005/04/29 10:39:09 yamt Exp $      */
+/*     $NetBSD: esp_input.c,v 1.38 2005/07/07 16:00:56 tron Exp $      */
 /*     $KAME: esp_input.c,v 1.60 2001/09/04 08:43:19 itojun Exp $      */
 
 /*
@@ -35,9 +35,10 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: esp_input.c,v 1.37 2005/04/29 10:39:09 yamt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: esp_input.c,v 1.38 2005/07/07 16:00:56 tron Exp $");
 
 #include "opt_inet.h"
+#include "opt_ipsec.h"
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff -r 9af8450c01e4 -r 40fdbbb0dd33 sys/netinet6/esp_output.c
--- a/sys/netinet6/esp_output.c Thu Jul 07 14:26:37 2005 +0000
+++ b/sys/netinet6/esp_output.c Thu Jul 07 16:00:56 2005 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: esp_output.c,v 1.22 2005/05/29 21:43:51 christos Exp $ */
+/*     $NetBSD: esp_output.c,v 1.23 2005/07/07 16:00:56 tron Exp $     */
 /*     $KAME: esp_output.c,v 1.44 2001/07/26 06:53:15 jinmei Exp $     */
 
 /*
@@ -35,9 +35,10 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: esp_output.c,v 1.22 2005/05/29 21:43:51 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: esp_output.c,v 1.23 2005/07/07 16:00:56 tron Exp $");
 
 #include "opt_inet.h"
+#include "opt_ipsec.h"
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff -r 9af8450c01e4 -r 40fdbbb0dd33 sys/netinet6/files.ipsec
--- a/sys/netinet6/files.ipsec  Thu Jul 07 14:26:37 2005 +0000
+++ b/sys/netinet6/files.ipsec  Thu Jul 07 16:00:56 2005 +0000
@@ -1,7 +1,8 @@
-#      $NetBSD: files.ipsec,v 1.2 2003/09/20 05:14:41 itojun Exp $
+#      $NetBSD: files.ipsec,v 1.3 2005/07/07 16:00:56 tron Exp $
 
 defflag opt_ipsec.h            IPSEC: rijndael, sha2, ripemd160
 defflag opt_ipsec.h            IPSEC_ESP: des, blowfish, cast128, rijndael
+defflag opt_ipsec.h            IPSEC_NAT_T
 
 file   netinet6/ah_aesxcbcmac.c        ipsec
 file   netinet6/ah_core.c              ipsec
diff -r 9af8450c01e4 -r 40fdbbb0dd33 sys/netinet6/ipcomp_input.c
--- a/sys/netinet6/ipcomp_input.c       Thu Jul 07 14:26:37 2005 +0000
+++ b/sys/netinet6/ipcomp_input.c       Thu Jul 07 16:00:56 2005 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: ipcomp_input.c,v 1.25 2005/05/20 01:25:17 manu Exp $   */
+/*     $NetBSD: ipcomp_input.c,v 1.26 2005/07/07 16:00:56 tron Exp $   */
 /*     $KAME: ipcomp_input.c,v 1.29 2001/09/04 08:43:19 itojun Exp $   */
 
 /*
@@ -35,9 +35,10 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ipcomp_input.c,v 1.25 2005/05/20 01:25:17 manu Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ipcomp_input.c,v 1.26 2005/07/07 16:00:56 tron Exp $");
 
 #include "opt_inet.h"
+#include "opt_ipsec.h"
 
 #include <sys/param.h>
 #include <sys/systm.h>