[src/trunk]: src/sys defopt IPSEC and IPSEC_ESP (both into opt_ipsec.h).

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

details:   https://anonhg.NetBSD.org/src/rev/a9a955e32682
branches:  trunk
changeset: 474525:a9a955e32682
user:      thorpej <thorpej%NetBSD.org@localhost>
date:      Fri Jul 09 22:57:15 1999 +0000

description:
defopt IPSEC and IPSEC_ESP (both into opt_ipsec.h).

diffstat:

 sys/conf/files             |  3 ++-
 sys/kern/uipc_domain.c     |  3 ++-
 sys/netinet/igmp.c         |  3 ++-
 sys/netinet/in_gif.c       |  3 ++-
 sys/netinet/in_pcb.c       |  4 +++-
 sys/netinet/in_proto.c     |  3 ++-
 sys/netinet/ip_icmp.c      |  4 +++-
 sys/netinet/ip_input.c     |  3 ++-
 sys/netinet/ip_mroute.c    |  4 +++-
 sys/netinet/ip_output.c    |  3 ++-
 sys/netinet/raw_ip.c       |  3 ++-
 sys/netinet/tcp_input.c    |  3 ++-
 sys/netinet/tcp_output.c   |  3 ++-
 sys/netinet/tcp_subr.c     |  3 ++-
 sys/netinet/tcp_usrreq.c   |  3 ++-
 sys/netinet/udp_usrreq.c   |  5 ++++-
 sys/netinet6/ah_core.c     |  3 ++-
 sys/netinet6/icmp6.c       |  3 ++-
 sys/netinet6/in6_gif.c     |  3 ++-
 sys/netinet6/in6_pcb.c     |  4 +++-
 sys/netinet6/in6_proto.c   |  3 ++-
 sys/netinet6/ip6_input.c   |  3 ++-
 sys/netinet6/ip6_output.c  |  3 ++-
 sys/netinet6/ipsec.c       |  5 +++--
 sys/netinet6/mld6.c        |  3 ++-
 sys/netinet6/nd6_nbr.c     |  3 ++-
 sys/netinet6/raw_ip6.c     |  4 +++-
 sys/netinet6/udp6_usrreq.c |  4 +++-
 sys/netkey/key.c           |  3 ++-
 29 files changed, 67 insertions(+), 30 deletions(-)

diffs (truncated from 503 to 300 lines):

diff -r 33b3bac59742 -r a9a955e32682 sys/conf/files
--- a/sys/conf/files    Fri Jul 09 20:14:26 1999 +0000
+++ b/sys/conf/files    Fri Jul 09 22:57:15 1999 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: files,v 1.300 1999/07/09 06:51:47 thorpej Exp $
+#      $NetBSD: files,v 1.301 1999/07/09 22:57:15 thorpej Exp $
 
 #      @(#)files.newconf       7.5 (Berkeley) 5/10/93
 
@@ -51,6 +51,7 @@
 
 # networking protocols
 defopt INET
+defopt opt_ipsec.h     IPSEC IPSEC_ESP
 defopt opt_inet_conf.h SUBNETSARELOCAL HOSTZEROBROADCAST
 defopt opt_atalk.h     NETATALK
 defopt opt_ns.h        NSIP            # XNS tunneled over IP
diff -r 33b3bac59742 -r a9a955e32682 sys/kern/uipc_domain.c
--- a/sys/kern/uipc_domain.c    Fri Jul 09 20:14:26 1999 +0000
+++ b/sys/kern/uipc_domain.c    Fri Jul 09 22:57:15 1999 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: uipc_domain.c,v 1.26 1999/07/01 08:12:47 itojun Exp $  */
+/*     $NetBSD: uipc_domain.c,v 1.27 1999/07/09 22:57:16 thorpej Exp $ */
 
 /*
  * Copyright (c) 1982, 1986, 1993
@@ -36,6 +36,7 @@
  */
 
 #include "opt_inet.h"
+#include "opt_ipsec.h"
 #include "opt_atalk.h"
 #include "opt_ccitt.h"
 #include "opt_iso.h"
diff -r 33b3bac59742 -r a9a955e32682 sys/netinet/igmp.c
--- a/sys/netinet/igmp.c        Fri Jul 09 20:14:26 1999 +0000
+++ b/sys/netinet/igmp.c        Fri Jul 09 22:57:15 1999 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: igmp.c,v 1.21 1999/07/01 08:12:49 itojun Exp $ */
+/*     $NetBSD: igmp.c,v 1.22 1999/07/09 22:57:16 thorpej Exp $        */
 
 /*
  * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@@ -39,6 +39,7 @@
  * MULTICAST Revision: 1.3
  */
 
+#include "opt_ipsec.h"
 #include "opt_mrouting.h"
 
 #include <sys/param.h>
diff -r 33b3bac59742 -r a9a955e32682 sys/netinet/in_gif.c
--- a/sys/netinet/in_gif.c      Fri Jul 09 20:14:26 1999 +0000
+++ b/sys/netinet/in_gif.c      Fri Jul 09 22:57:15 1999 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: in_gif.c,v 1.4 1999/07/06 12:23:20 itojun Exp $        */
+/*     $NetBSD: in_gif.c,v 1.5 1999/07/09 22:57:17 thorpej Exp $       */
 
 /*
  * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@@ -38,6 +38,7 @@
 #endif
 #if (defined(__FreeBSD__) && __FreeBSD__ >= 3) || defined(__NetBSD__)
 #include "opt_inet.h"
+#include "opt_ipsec.h"
 #endif
 
 #include <sys/param.h>
diff -r 33b3bac59742 -r a9a955e32682 sys/netinet/in_pcb.c
--- a/sys/netinet/in_pcb.c      Fri Jul 09 20:14:26 1999 +0000
+++ b/sys/netinet/in_pcb.c      Fri Jul 09 22:57:15 1999 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: in_pcb.c,v 1.59 1999/07/01 08:12:50 itojun Exp $       */
+/*     $NetBSD: in_pcb.c,v 1.60 1999/07/09 22:57:17 thorpej Exp $      */
 
 /*
  * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@@ -101,6 +101,8 @@
  *     @(#)in_pcb.c    8.4 (Berkeley) 5/24/95
  */
 
+#include "opt_ipsec.h"
+
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/malloc.h>
diff -r 33b3bac59742 -r a9a955e32682 sys/netinet/in_proto.c
--- a/sys/netinet/in_proto.c    Fri Jul 09 20:14:26 1999 +0000
+++ b/sys/netinet/in_proto.c    Fri Jul 09 22:57:15 1999 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: in_proto.c,v 1.32 1999/07/01 08:12:50 itojun Exp $     */
+/*     $NetBSD: in_proto.c,v 1.33 1999/07/09 22:57:18 thorpej Exp $    */
 
 /*
  * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@@ -69,6 +69,7 @@
 #include "opt_iso.h"                   /* ISO TP tunneled over IP */
 #include "opt_ns.h"                    /* NSIP: XNS tunneled over IP */
 #include "opt_inet.h"
+#include "opt_ipsec.h"
 
 #include <sys/param.h>
 #include <sys/socket.h>
diff -r 33b3bac59742 -r a9a955e32682 sys/netinet/ip_icmp.c
--- a/sys/netinet/ip_icmp.c     Fri Jul 09 20:14:26 1999 +0000
+++ b/sys/netinet/ip_icmp.c     Fri Jul 09 22:57:15 1999 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: ip_icmp.c,v 1.37 1999/07/01 08:12:50 itojun Exp $      */
+/*     $NetBSD: ip_icmp.c,v 1.38 1999/07/09 22:57:18 thorpej Exp $     */
 
 /*
  * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@@ -101,6 +101,8 @@
  *     @(#)ip_icmp.c   8.2 (Berkeley) 1/4/94
  */
 
+#include "opt_ipsec.h"
+
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/malloc.h>
diff -r 33b3bac59742 -r a9a955e32682 sys/netinet/ip_input.c
--- a/sys/netinet/ip_input.c    Fri Jul 09 20:14:26 1999 +0000
+++ b/sys/netinet/ip_input.c    Fri Jul 09 22:57:15 1999 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: ip_input.c,v 1.90 1999/07/06 12:23:20 itojun Exp $     */
+/*     $NetBSD: ip_input.c,v 1.91 1999/07/09 22:57:18 thorpej Exp $    */
 
 /*
  * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@@ -103,6 +103,7 @@
 
 #include "opt_gateway.h"
 #include "opt_pfil_hooks.h"
+#include "opt_ipsec.h"
 #include "opt_mrouting.h"
 
 #include <sys/param.h>
diff -r 33b3bac59742 -r a9a955e32682 sys/netinet/ip_mroute.c
--- a/sys/netinet/ip_mroute.c   Fri Jul 09 20:14:26 1999 +0000
+++ b/sys/netinet/ip_mroute.c   Fri Jul 09 22:57:15 1999 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: ip_mroute.c,v 1.43 1999/07/01 08:12:50 itojun Exp $    */
+/*     $NetBSD: ip_mroute.c,v 1.44 1999/07/09 22:57:19 thorpej Exp $   */
 
 /*
  * IP multicast forwarding procedures
@@ -14,6 +14,8 @@
  * MROUTING Revision: 1.2
  */
 
+#include "opt_ipsec.h"
+
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/mbuf.h>
diff -r 33b3bac59742 -r a9a955e32682 sys/netinet/ip_output.c
--- a/sys/netinet/ip_output.c   Fri Jul 09 20:14:26 1999 +0000
+++ b/sys/netinet/ip_output.c   Fri Jul 09 22:57:15 1999 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: ip_output.c,v 1.61 1999/07/01 08:12:51 itojun Exp $    */
+/*     $NetBSD: ip_output.c,v 1.62 1999/07/09 22:57:19 thorpej Exp $   */
 
 /*
  * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@@ -102,6 +102,7 @@
  */
 
 #include "opt_pfil_hooks.h"
+#include "opt_ipsec.h"
 #include "opt_mrouting.h"
 
 #include <sys/param.h>
diff -r 33b3bac59742 -r a9a955e32682 sys/netinet/raw_ip.c
--- a/sys/netinet/raw_ip.c      Fri Jul 09 20:14:26 1999 +0000
+++ b/sys/netinet/raw_ip.c      Fri Jul 09 22:57:15 1999 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: raw_ip.c,v 1.44 1999/07/05 07:24:38 darrenr Exp $      */
+/*     $NetBSD: raw_ip.c,v 1.45 1999/07/09 22:57:20 thorpej Exp $      */
 
 /*
  * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@@ -64,6 +64,7 @@
  *     @(#)raw_ip.c    8.7 (Berkeley) 5/15/95
  */
 
+#include "opt_ipsec.h"
 #include "opt_mrouting.h"
 
 #include <sys/param.h>
diff -r 33b3bac59742 -r a9a955e32682 sys/netinet/tcp_input.c
--- a/sys/netinet/tcp_input.c   Fri Jul 09 20:14:26 1999 +0000
+++ b/sys/netinet/tcp_input.c   Fri Jul 09 22:57:15 1999 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: tcp_input.c,v 1.84 1999/07/02 12:45:32 itojun Exp $    */
+/*     $NetBSD: tcp_input.c,v 1.85 1999/07/09 22:57:20 thorpej Exp $   */
 
 /*
 %%% portions-copyright-nrl-95
@@ -125,6 +125,7 @@
  */
 
 #include "opt_inet.h"
+#include "opt_ipsec.h"
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff -r 33b3bac59742 -r a9a955e32682 sys/netinet/tcp_output.c
--- a/sys/netinet/tcp_output.c  Fri Jul 09 20:14:26 1999 +0000
+++ b/sys/netinet/tcp_output.c  Fri Jul 09 22:57:15 1999 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: tcp_output.c,v 1.50 1999/07/02 21:02:05 fvdl Exp $     */
+/*     $NetBSD: tcp_output.c,v 1.51 1999/07/09 22:57:21 thorpej Exp $  */
 
 /*
 %%% portions-copyright-nrl-95
@@ -115,6 +115,7 @@
  */
 
 #include "opt_inet.h"
+#include "opt_ipsec.h"
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff -r 33b3bac59742 -r a9a955e32682 sys/netinet/tcp_subr.c
--- a/sys/netinet/tcp_subr.c    Fri Jul 09 20:14:26 1999 +0000
+++ b/sys/netinet/tcp_subr.c    Fri Jul 09 22:57:15 1999 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: tcp_subr.c,v 1.69 1999/07/02 21:02:05 fvdl Exp $       */
+/*     $NetBSD: tcp_subr.c,v 1.70 1999/07/09 22:57:22 thorpej Exp $    */
 
 /*
  * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@@ -102,6 +102,7 @@
  */
 
 #include "opt_inet.h"
+#include "opt_ipsec.h"
 #include "opt_tcp_compat_42.h"
 #include "rnd.h"
 
diff -r 33b3bac59742 -r a9a955e32682 sys/netinet/tcp_usrreq.c
--- a/sys/netinet/tcp_usrreq.c  Fri Jul 09 20:14:26 1999 +0000
+++ b/sys/netinet/tcp_usrreq.c  Fri Jul 09 22:57:15 1999 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: tcp_usrreq.c,v 1.41 1999/07/02 12:45:32 itojun Exp $   */
+/*     $NetBSD: tcp_usrreq.c,v 1.42 1999/07/09 22:57:23 thorpej Exp $  */
 
 /*
  * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@@ -102,6 +102,7 @@
  */
 
 #include "opt_inet.h"
+#include "opt_ipsec.h"
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff -r 33b3bac59742 -r a9a955e32682 sys/netinet/udp_usrreq.c
--- a/sys/netinet/udp_usrreq.c  Fri Jul 09 20:14:26 1999 +0000
+++ b/sys/netinet/udp_usrreq.c  Fri Jul 09 22:57:15 1999 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: udp_usrreq.c,v 1.49 1999/07/06 14:37:47 drochner Exp $ */
+/*     $NetBSD: udp_usrreq.c,v 1.50 1999/07/09 22:57:23 thorpej Exp $  */
 
 /*
  * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@@ -63,6 +63,9 @@
  *
  *     @(#)udp_usrreq.c        8.6 (Berkeley) 5/23/95
  */
+
+#include "opt_ipsec.h"
+
 #include "ipkdb.h"
 
 /* XXX MAPPED_ADDR_ENABLED should be revisited */
diff -r 33b3bac59742 -r a9a955e32682 sys/netinet6/ah_core.c
--- a/sys/netinet6/ah_core.c    Fri Jul 09 20:14:26 1999 +0000
+++ b/sys/netinet6/ah_core.c    Fri Jul 09 22:57:15 1999 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: ah_core.c,v 1.5 1999/07/06 05:09:22 itojun Exp $       */
+/*     $NetBSD: ah_core.c,v 1.6 1999/07/09 22:57:26 thorpej Exp $      */
 
 /*
  * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@@ -35,6 +35,7 @@
 
 #if (defined(__FreeBSD__) && __FreeBSD__ >= 3) || defined(__NetBSD__)
 #include "opt_inet.h"
+#include "opt_ipsec.h"
 #endif
 
 /* Some of operating systems have standard crypto checksum library */
diff -r 33b3bac59742 -r a9a955e32682 sys/netinet6/icmp6.c
--- a/sys/netinet6/icmp6.c      Fri Jul 09 20:14:26 1999 +0000
+++ b/sys/netinet6/icmp6.c      Fri Jul 09 22:57:15 1999 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: icmp6.c,v 1.5 1999/07/06 12:23:21 itojun Exp $ */
+/*     $NetBSD: icmp6.c,v 1.6 1999/07/09 22:57:26 thorpej Exp $        */