Module Name: src
Committed By: ozaki-r
Date: Mon Mar 30 03:51:50 UTC 2015
Modified Files:
src/sys/netipsec: ipsec_input.c ipsec_output.c key.h key_debug.c
keydb.h keysock.c xform_ah.c xform_esp.c
Log Message:
Tidy up opt_ipsec.h inclusions
Some inclusions of opt_ipsec.h were for IPSEC_NAT_T and are now unnecessary.
Add inclusions to some C files for IPSEC_DEBUG.
To generate a diff of this commit:
cvs rdiff -u -r1.32 -r1.33 src/sys/netipsec/ipsec_input.c
cvs rdiff -u -r1.40 -r1.41 src/sys/netipsec/ipsec_output.c
cvs rdiff -u -r1.13 -r1.14 src/sys/netipsec/key.h src/sys/netipsec/keydb.h
cvs rdiff -u -r1.11 -r1.12 src/sys/netipsec/key_debug.c
cvs rdiff -u -r1.43 -r1.44 src/sys/netipsec/keysock.c \
src/sys/netipsec/xform_ah.c
cvs rdiff -u -r1.45 -r1.46 src/sys/netipsec/xform_esp.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/netipsec/ipsec_input.c
diff -u src/sys/netipsec/ipsec_input.c:1.32 src/sys/netipsec/ipsec_input.c:1.33
--- src/sys/netipsec/ipsec_input.c:1.32 Sat Mar 8 12:18:04 2014
+++ src/sys/netipsec/ipsec_input.c Mon Mar 30 03:51:50 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: ipsec_input.c,v 1.32 2014/03/08 12:18:04 ozaki-r Exp $ */
+/* $NetBSD: ipsec_input.c,v 1.33 2015/03/30 03:51:50 ozaki-r Exp $ */
/* $FreeBSD: /usr/local/www/cvsroot/FreeBSD/src/sys/netipsec/ipsec_input.c,v 1.2.4.2 2003/03/28 20:32:53 sam Exp $ */
/* $OpenBSD: ipsec_input.c,v 1.63 2003/02/20 18:35:43 deraadt Exp $ */
@@ -39,7 +39,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ipsec_input.c,v 1.32 2014/03/08 12:18:04 ozaki-r Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ipsec_input.c,v 1.33 2015/03/30 03:51:50 ozaki-r Exp $");
/*
* IPsec input processing.
@@ -49,7 +49,6 @@ __KERNEL_RCSID(0, "$NetBSD: ipsec_input.
#ifdef __FreeBSD__
#include "opt_inet6.h"
#endif
-#include "opt_ipsec.h"
#include <sys/param.h>
#include <sys/systm.h>
Index: src/sys/netipsec/ipsec_output.c
diff -u src/sys/netipsec/ipsec_output.c:1.40 src/sys/netipsec/ipsec_output.c:1.41
--- src/sys/netipsec/ipsec_output.c:1.40 Sun Nov 3 18:37:10 2013
+++ src/sys/netipsec/ipsec_output.c Mon Mar 30 03:51:50 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: ipsec_output.c,v 1.40 2013/11/03 18:37:10 mrg Exp $ */
+/* $NetBSD: ipsec_output.c,v 1.41 2015/03/30 03:51:50 ozaki-r Exp $ */
/*-
* Copyright (c) 2002, 2003 Sam Leffler, Errno Consulting
@@ -29,7 +29,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ipsec_output.c,v 1.40 2013/11/03 18:37:10 mrg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ipsec_output.c,v 1.41 2015/03/30 03:51:50 ozaki-r Exp $");
/*
* IPsec output processing.
@@ -38,7 +38,6 @@ __KERNEL_RCSID(0, "$NetBSD: ipsec_output
#ifdef __FreeBSD__
#include "opt_inet6.h"
#endif
-#include "opt_ipsec.h"
#include <sys/param.h>
#include <sys/systm.h>
Index: src/sys/netipsec/key.h
diff -u src/sys/netipsec/key.h:1.13 src/sys/netipsec/key.h:1.14
--- src/sys/netipsec/key.h:1.13 Fri May 30 01:39:03 2014
+++ src/sys/netipsec/key.h Mon Mar 30 03:51:50 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: key.h,v 1.13 2014/05/30 01:39:03 christos Exp $ */
+/* $NetBSD: key.h,v 1.14 2015/03/30 03:51:50 ozaki-r Exp $ */
/* $FreeBSD: src/sys/netipsec/key.h,v 1.1.4.1 2003/01/24 05:11:36 sam Exp $ */
/* $KAME: key.h,v 1.21 2001/07/27 03:51:30 itojun Exp $ */
@@ -36,8 +36,6 @@
#ifdef _KERNEL
-#include "opt_ipsec.h"
-
struct secpolicy;
struct secpolicyindex;
struct ipsecrequest;
Index: src/sys/netipsec/keydb.h
diff -u src/sys/netipsec/keydb.h:1.13 src/sys/netipsec/keydb.h:1.14
--- src/sys/netipsec/keydb.h:1.13 Tue Jun 4 22:47:37 2013
+++ src/sys/netipsec/keydb.h Mon Mar 30 03:51:50 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: keydb.h,v 1.13 2013/06/04 22:47:37 christos Exp $ */
+/* $NetBSD: keydb.h,v 1.14 2015/03/30 03:51:50 ozaki-r Exp $ */
/* $FreeBSD: src/sys/netipsec/keydb.h,v 1.1.4.1 2003/01/24 05:11:36 sam Exp $ */
/* $KAME: keydb.h,v 1.14 2000/08/02 17:58:26 sakane Exp $ */
@@ -36,8 +36,6 @@
#ifdef _KERNEL
-#include "opt_ipsec.h"
-
#include <netipsec/key_var.h>
#include <net/route.h>
#include <netinet/in.h>
Index: src/sys/netipsec/key_debug.c
diff -u src/sys/netipsec/key_debug.c:1.11 src/sys/netipsec/key_debug.c:1.12
--- src/sys/netipsec/key_debug.c:1.11 Mon May 23 15:17:25 2011
+++ src/sys/netipsec/key_debug.c Mon Mar 30 03:51:50 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: key_debug.c,v 1.11 2011/05/23 15:17:25 drochner Exp $ */
+/* $NetBSD: key_debug.c,v 1.12 2015/03/30 03:51:50 ozaki-r Exp $ */
/* $FreeBSD: src/sys/netipsec/key_debug.c,v 1.1.4.1 2003/01/24 05:11:36 sam Exp $ */
/* $KAME: key_debug.c,v 1.26 2001/06/27 10:46:50 sakane Exp $ */
@@ -33,14 +33,13 @@
#ifdef _KERNEL
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: key_debug.c,v 1.11 2011/05/23 15:17:25 drochner Exp $");
+__KERNEL_RCSID(0, "$NetBSD: key_debug.c,v 1.12 2015/03/30 03:51:50 ozaki-r Exp $");
#endif
#include "opt_inet.h"
#ifdef __FreeBSD__
#include "opt_inet6.h"
#endif
-#include "opt_ipsec.h"
#include <sys/types.h>
#include <sys/param.h>
Index: src/sys/netipsec/keysock.c
diff -u src/sys/netipsec/keysock.c:1.43 src/sys/netipsec/keysock.c:1.44
--- src/sys/netipsec/keysock.c:1.43 Sat Aug 9 05:33:01 2014
+++ src/sys/netipsec/keysock.c Mon Mar 30 03:51:50 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: keysock.c,v 1.43 2014/08/09 05:33:01 rtr Exp $ */
+/* $NetBSD: keysock.c,v 1.44 2015/03/30 03:51:50 ozaki-r Exp $ */
/* $FreeBSD: src/sys/netipsec/keysock.c,v 1.3.2.1 2003/01/24 05:11:36 sam Exp $ */
/* $KAME: keysock.c,v 1.25 2001/08/13 20:07:41 itojun Exp $ */
@@ -32,9 +32,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: keysock.c,v 1.43 2014/08/09 05:33:01 rtr Exp $");
-
-#include "opt_ipsec.h"
+__KERNEL_RCSID(0, "$NetBSD: keysock.c,v 1.44 2015/03/30 03:51:50 ozaki-r Exp $");
/* This code has derived from sys/net/rtsock.c on FreeBSD2.2.5 */
Index: src/sys/netipsec/xform_ah.c
diff -u src/sys/netipsec/xform_ah.c:1.43 src/sys/netipsec/xform_ah.c:1.44
--- src/sys/netipsec/xform_ah.c:1.43 Fri Mar 27 05:47:37 2015
+++ src/sys/netipsec/xform_ah.c Mon Mar 30 03:51:50 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: xform_ah.c,v 1.43 2015/03/27 05:47:37 ozaki-r Exp $ */
+/* $NetBSD: xform_ah.c,v 1.44 2015/03/30 03:51:50 ozaki-r Exp $ */
/* $FreeBSD: src/sys/netipsec/xform_ah.c,v 1.1.4.1 2003/01/24 05:11:36 sam Exp $ */
/* $OpenBSD: ip_ah.c,v 1.63 2001/06/26 06:18:58 angelos Exp $ */
/*
@@ -39,12 +39,13 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: xform_ah.c,v 1.43 2015/03/27 05:47:37 ozaki-r Exp $");
+__KERNEL_RCSID(0, "$NetBSD: xform_ah.c,v 1.44 2015/03/30 03:51:50 ozaki-r Exp $");
#include "opt_inet.h"
#ifdef __FreeBSD__
#include "opt_inet6.h"
#endif
+#include "opt_ipsec.h"
#include <sys/param.h>
#include <sys/systm.h>
Index: src/sys/netipsec/xform_esp.c
diff -u src/sys/netipsec/xform_esp.c:1.45 src/sys/netipsec/xform_esp.c:1.46
--- src/sys/netipsec/xform_esp.c:1.45 Sun Nov 3 18:37:10 2013
+++ src/sys/netipsec/xform_esp.c Mon Mar 30 03:51:50 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: xform_esp.c,v 1.45 2013/11/03 18:37:10 mrg Exp $ */
+/* $NetBSD: xform_esp.c,v 1.46 2015/03/30 03:51:50 ozaki-r Exp $ */
/* $FreeBSD: src/sys/netipsec/xform_esp.c,v 1.2.2.1 2003/01/24 05:11:36 sam Exp $ */
/* $OpenBSD: ip_esp.c,v 1.69 2001/06/26 06:18:59 angelos Exp $ */
@@ -39,12 +39,13 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: xform_esp.c,v 1.45 2013/11/03 18:37:10 mrg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: xform_esp.c,v 1.46 2015/03/30 03:51:50 ozaki-r Exp $");
#include "opt_inet.h"
#ifdef __FreeBSD__
#include "opt_inet6.h"
#endif
+#include "opt_ipsec.h"
#include <sys/param.h>
#include <sys/systm.h>
