[src/trunk]: src remove obsolete sysctl MIB net.inet.ipsec.inbound_call_ike.

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

details:   https://anonhg.NetBSD.org/src/rev/37125b24ea42
branches:  trunk
changeset: 487924:37125b24ea42
user:      itojun <itojun%NetBSD.org@localhost>
date:      Thu Jun 15 05:01:06 2000 +0000

description:
remove obsolete sysctl MIB net.inet.ipsec.inbound_call_ike.
(sync with kame)

diffstat:

 share/man/man4/ipsec.4 |   6 +-----
 sys/netinet6/ipsec.c   |  12 ++----------
 sys/netinet6/ipsec.h   |  12 ++++++------
 3 files changed, 9 insertions(+), 21 deletions(-)

diffs (133 lines):

diff -r 3c3fa92b6640 -r 37125b24ea42 share/man/man4/ipsec.4
--- a/share/man/man4/ipsec.4    Thu Jun 15 04:11:18 2000 +0000
+++ b/share/man/man4/ipsec.4    Thu Jun 15 05:01:06 2000 +0000
@@ -1,4 +1,4 @@
-.\"    $NetBSD: ipsec.4,v 1.9 2000/06/14 13:06:30 itojun Exp $
+.\"    $NetBSD: ipsec.4,v 1.10 2000/06/15 05:01:06 itojun Exp $
 .\"    $KAME: ipsec.4,v 1.12 2000/06/14 13:05:29 itojun Exp $
 .\"
 .\" Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@@ -179,21 +179,17 @@
 for tweaking kernel IPsec behavior:
 .Bl -column net.inet6.ipsec6.inbonud_call_ike integerxxx
 .It Sy Name    Type    Changeable
-.It net.inet.ipsec.inbound_call_ike    integer yes
 .It net.inet.ipsec.ah_cleartos integer yes
 .It net.inet.ipsec.ah_offsetmask       integer yes
 .It net.inet.ipsec.dfbit       integer yes
 .It net.inet.ipsec.ecn integer yes
 .It net.inet.ipsec.debug       integer yes
-.It net.inet6.ipsec6.inbound_call_ike  integer yes
 .It net.inet6.ipsec6.ecn       integer yes
 .It net.inet6.ipsec6.debug     integer yes
 .El
 .Pp
 The variables are interpreted as follows:
 .Bl -tag -width "123456"
-.It Li ipsec.inbound_call_ike
-Obsolete.
 .It Li ipsec.ah_cleartos
 If set to non-zero, the kernel clears type-of-service field in the IPv4 header
 during AH authentication data computation.
diff -r 3c3fa92b6640 -r 37125b24ea42 sys/netinet6/ipsec.c
--- a/sys/netinet6/ipsec.c      Thu Jun 15 04:11:18 2000 +0000
+++ b/sys/netinet6/ipsec.c      Thu Jun 15 05:01:06 2000 +0000
@@ -1,5 +1,5 @@
-/*     $NetBSD: ipsec.c,v 1.22 2000/06/12 10:40:46 itojun Exp $        */
-/*     $KAME: ipsec.c,v 1.65 2000/06/03 15:51:28 itojun Exp $  */
+/*     $NetBSD: ipsec.c,v 1.23 2000/06/15 05:01:07 itojun Exp $        */
+/*     $KAME: ipsec.c,v 1.66 2000/06/15 04:08:54 itojun Exp $  */
 
 /*
  * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@@ -98,7 +98,6 @@
 #endif
 
 struct ipsecstat ipsecstat;
-int ip4_inbound_call_ike = 0;
 int ip4_ah_cleartos = 1;
 int ip4_ah_offsetmask = 0;     /* maybe IP_DF? */
 int ip4_ipsec_dfbit = 0;       /* DF bit on encap. 0: clear 1: set 2: copy */
@@ -112,7 +111,6 @@
 
 #ifdef INET6
 struct ipsecstat ipsec6stat;
-int ip6_inbound_call_ike = 0;
 int ip6_esp_trans_deflev = IPSEC_LEVEL_USE;
 int ip6_esp_net_deflev = IPSEC_LEVEL_USE;
 int ip6_ah_trans_deflev = IPSEC_LEVEL_USE;
@@ -3352,9 +3350,6 @@
        case IPSECCTL_DEF_AH_NETLEV:
                return sysctl_int(oldp, oldlenp, newp, newlen,
                                  &ip4_ah_net_deflev);
-       case IPSECCTL_INBOUND_CALL_IKE:
-               return sysctl_int(oldp, oldlenp, newp, newlen,
-                                 &ip4_inbound_call_ike);
        case IPSECCTL_AH_CLEARTOS:
                return sysctl_int(oldp, oldlenp, newp, newlen,
                                  &ip4_ah_cleartos);
@@ -3446,9 +3441,6 @@
        case IPSECCTL_DEF_AH_NETLEV:
                return sysctl_int(oldp, oldlenp, newp, newlen,
                                  &ip6_ah_net_deflev);
-       case IPSECCTL_INBOUND_CALL_IKE:
-               return sysctl_int(oldp, oldlenp, newp, newlen,
-                                 &ip6_inbound_call_ike);
        case IPSECCTL_ECN:
                return sysctl_int(oldp, oldlenp, newp, newlen, &ip6_ipsec_ecn);
        case IPSECCTL_DEBUG:
diff -r 3c3fa92b6640 -r 37125b24ea42 sys/netinet6/ipsec.h
--- a/sys/netinet6/ipsec.h      Thu Jun 15 04:11:18 2000 +0000
+++ b/sys/netinet6/ipsec.h      Thu Jun 15 05:01:06 2000 +0000
@@ -1,5 +1,5 @@
-/*     $NetBSD: ipsec.h,v 1.13 2000/06/03 16:14:03 itojun Exp $        */
-/*     $KAME: ipsec.h,v 1.31 2000/05/18 12:32:32 sumikawa Exp $        */
+/*     $NetBSD: ipsec.h,v 1.14 2000/06/15 05:01:08 itojun Exp $        */
+/*     $KAME: ipsec.h,v 1.32 2000/06/15 04:08:54 itojun Exp $  */
 
 /*
  * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@@ -212,7 +212,9 @@
 #define IPSECCTL_DEF_ESP_NETLEV                4       /* int; ESP tunnel mode */
 #define IPSECCTL_DEF_AH_TRANSLEV       5       /* int; AH transport mode */
 #define IPSECCTL_DEF_AH_NETLEV         6       /* int; AH tunnel mode */
+#if 0  /*obsolete, do not reuse*/
 #define IPSECCTL_INBOUND_CALL_IKE      7
+#endif
 #define        IPSECCTL_AH_CLEARTOS            8
 #define        IPSECCTL_AH_OFFSETMASK          9
 #define        IPSECCTL_DFBIT                  10
@@ -228,7 +230,7 @@
        { "esp_net_deflev", CTLTYPE_INT }, \
        { "ah_trans_deflev", CTLTYPE_INT }, \
        { "ah_net_deflev", CTLTYPE_INT }, \
-       { "inbound_call_ike", CTLTYPE_INT }, \
+       { 0, 0 }, \
        { "ah_cleartos", CTLTYPE_INT }, \
        { "ah_offsetmask", CTLTYPE_INT }, \
        { "dfbit", CTLTYPE_INT }, \
@@ -244,7 +246,7 @@
        { "esp_net_deflev", CTLTYPE_INT }, \
        { "ah_trans_deflev", CTLTYPE_INT }, \
        { "ah_net_deflev", CTLTYPE_INT }, \
-       { "inbound_call_ike", CTLTYPE_INT }, \
+       { 0, 0 }, \
        { 0, 0 }, \
        { 0, 0 }, \
        { 0, 0 }, \
@@ -268,7 +270,6 @@
 extern int ip4_esp_net_deflev;
 extern int ip4_ah_trans_deflev;
 extern int ip4_ah_net_deflev;
-extern int ip4_inbound_call_ike;
 extern int ip4_ah_cleartos;
 extern int ip4_ah_offsetmask;
 extern int ip4_ipsec_dfbit;
@@ -282,7 +283,6 @@
 extern int ip6_esp_net_deflev;
 extern int ip6_ah_trans_deflev;
 extern int ip6_ah_net_deflev;
-extern int ip6_inbound_call_ike;
 extern int ip6_ipsec_ecn;
 #endif