Module Name: src
Committed By: drochner
Date: Fri Jan 6 14:08:09 UTC 2012
Modified Files:
src/usr.bin/systat: Makefile cmdtab.c extern.h systat.1
Removed Files:
src/usr.bin/systat: ipsec.c
Log Message:
kill ipsec support which hasn't been working for a long time
(neither for KAME nor for FAST_IPSEC)
To generate a diff of this commit:
cvs rdiff -u -r1.36 -r1.37 src/usr.bin/systat/Makefile
cvs rdiff -u -r1.23 -r1.24 src/usr.bin/systat/cmdtab.c
cvs rdiff -u -r1.41 -r1.42 src/usr.bin/systat/extern.h
cvs rdiff -u -r1.10 -r0 src/usr.bin/systat/ipsec.c
cvs rdiff -u -r1.40 -r1.41 src/usr.bin/systat/systat.1
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.bin/systat/Makefile
diff -u src/usr.bin/systat/Makefile:1.36 src/usr.bin/systat/Makefile:1.37
--- src/usr.bin/systat/Makefile:1.36 Sat Feb 6 23:45:26 2010
+++ src/usr.bin/systat/Makefile Fri Jan 6 14:08:08 2012
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.36 2010/02/06 23:45:26 he Exp $
+# $NetBSD: Makefile,v 1.37 2012/01/06 14:08:08 drochner Exp $
# @(#)Makefile 8.1 (Berkeley) 6/6/93
.include <bsd.own.mk>
@@ -22,9 +22,6 @@ BINMODE=2555
LINKS= ${BINDIR}/systat ${BINDIR}/sysstat
MLINKS+=systat.1 sysstat.1
-CPPFLAGS+=-DIPSEC
-SRCS+= ipsec.c
-
.if (${USE_INET6} != "no")
CPPFLAGS+=-DINET6
SRCS+= ip6.c
Index: src/usr.bin/systat/cmdtab.c
diff -u src/usr.bin/systat/cmdtab.c:1.23 src/usr.bin/systat/cmdtab.c:1.24
--- src/usr.bin/systat/cmdtab.c:1.23 Sun Feb 18 17:00:08 2007
+++ src/usr.bin/systat/cmdtab.c Fri Jan 6 14:08:08 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: cmdtab.c,v 1.23 2007/02/18 17:00:08 dsl Exp $ */
+/* $NetBSD: cmdtab.c,v 1.24 2012/01/06 14:08:08 drochner Exp $ */
/*-
* Copyright (c) 1980, 1992, 1993
@@ -34,7 +34,7 @@
#if 0
static char sccsid[] = "@(#)cmdtab.c 8.1 (Berkeley) 6/6/93";
#endif
-__RCSID("$NetBSD: cmdtab.c,v 1.23 2007/02/18 17:00:08 dsl Exp $");
+__RCSID("$NetBSD: cmdtab.c,v 1.24 2012/01/06 14:08:08 drochner Exp $");
#endif /* not lint */
#include "systat.h"
@@ -100,16 +100,6 @@ struct command ip6_commands[] = {
};
#endif
-#ifdef IPSEC
-struct command ipsec_commands[] = {
- { "boot", ipsec_boot, "show total stats since boot"},
- { "run", ipsec_run, "show running total stats"},
- { "time", ipsec_time, "show stats for each sample time"},
- { "zero", ipsec_zero, "re-zero running totals"},
- { .c_name = NULL }
-};
-#endif
-
struct command netstat_commands[] = {
{ "all", netstat_all, "include server sockets"},
{ "display", netstat_display, "show specified hosts or ports"},
@@ -186,11 +176,6 @@ struct mode modes[] = {
initip6, openip6, closeip6, ip6_commands,
CF_LOADAV },
#endif
-#ifdef IPSEC
- { "ipsec", showipsec, fetchipsec, labelipsec,
- initipsec, openipsec, closeipsec, ipsec_commands,
- CF_LOADAV },
-#endif
{ "iostat", showiostat, fetchiostat, labeliostat,
initiostat, openiostat, closeiostat, iostat_commands,
CF_LOADAV },
Index: src/usr.bin/systat/extern.h
diff -u src/usr.bin/systat/extern.h:1.41 src/usr.bin/systat/extern.h:1.42
--- src/usr.bin/systat/extern.h:1.41 Tue Sep 6 18:31:44 2011
+++ src/usr.bin/systat/extern.h Fri Jan 6 14:08:08 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: extern.h,v 1.41 2011/09/06 18:31:44 joerg Exp $ */
+/* $NetBSD: extern.h,v 1.42 2012/01/06 14:08:08 drochner Exp $ */
/*-
* Copyright (c) 1991, 1993
@@ -221,16 +221,3 @@ void ip6_run(char *);
void ip6_time(char *);
void ip6_zero(char *);
#endif
-
-#ifdef IPSEC
-void closeipsec(WINDOW *);
-void fetchipsec(void);
-int initipsec(void);
-void labelipsec(void);
-WINDOW *openipsec(void);
-void showipsec(void);
-void ipsec_boot(char *);
-void ipsec_run(char *);
-void ipsec_time(char *);
-void ipsec_zero(char *);
-#endif
Index: src/usr.bin/systat/systat.1
diff -u src/usr.bin/systat/systat.1:1.40 src/usr.bin/systat/systat.1:1.41
--- src/usr.bin/systat/systat.1:1.40 Wed Oct 21 22:18:37 2009
+++ src/usr.bin/systat/systat.1 Fri Jan 6 14:08:08 2012
@@ -1,4 +1,4 @@
-.\" $NetBSD: systat.1,v 1.40 2009/10/21 22:18:37 wiz Exp $
+.\" $NetBSD: systat.1,v 1.41 2012/01/06 14:08:08 drochner Exp $
.\"
.\" Copyright (c) 1985, 1990, 1993
.\" The Regents of the University of California. All rights reserved.
@@ -29,7 +29,7 @@
.\"
.\" @(#)systat.1 8.2 (Berkeley) 12/30/93
.\"
-.Dd October 22, 2009
+.Dd January 5, 2012
.Dt SYSTAT 1
.Os
.Sh NAME
@@ -120,7 +120,6 @@ argument expects to be one of:
.Ic inet.tcp ,
.Ic inet.tcpsyn ,
.Ic inet6.ip6 ,
-.Ic ipsec ,
.Ic iostat ,
.Ic mbufs ,
.Ic netstat ,
@@ -239,8 +238,6 @@ Display statistics about the
``syncache''.
.It Ic inet6.ip6
Display IPv6 statistics.
-.It Ic ipsec
-Display IPsec statistics for both IPv4 and v6.
.It Ic iostat
Display, in the lower window, statistics about processor use
and disk throughput.
@@ -520,7 +517,6 @@ with the ones specified.
The following commands are specific to the
.Ic inet.* ,
.Ic inet6.* ,
-.Ic ipsec ,
.Ic syscall
and
.Ic vmstat
