pppstats now handles slstats
This commit is contained in:
christos
parent
f696f0c430
commit
9867ff4817
@ -1,4 +1,4 @@
|
|||||||
# $NetBSD: Makefile,v 1.211 2006/02/08 18:59:39 agc Exp $
|
# $NetBSD: Makefile,v 1.212 2006/03/02 17:34:17 christos Exp $
|
||||||
# from: @(#)Makefile 5.20 (Berkeley) 6/12/93
|
# from: @(#)Makefile 5.20 (Berkeley) 6/12/93
|
||||||
|
|
||||||
.include <bsd.own.mk>
|
.include <bsd.own.mk>
|
||||||
@ -17,7 +17,7 @@ SUBDIR= ac accton altq amd apm apmd arp bad144 bind bootp catman \
|
|||||||
rarpd rbootd rdate \
|
rarpd rbootd rdate \
|
||||||
repquota rmt rpc.bootparamd rpc.lockd rpc.pcnfsd \
|
repquota rmt rpc.bootparamd rpc.lockd rpc.pcnfsd \
|
||||||
rpc.statd rpcbind rwhod sa screenblank sesd \
|
rpc.statd rpcbind rwhod sa screenblank sesd \
|
||||||
sliplogin slstats sntp \
|
sliplogin sntp \
|
||||||
spray sti sunlabel sup syslogd tadpolectl tcpdchk \
|
spray sti sunlabel sup syslogd tadpolectl tcpdchk \
|
||||||
tcpdmatch tcpdump timed tpctl traceroute trpt trsp unlink \
|
tcpdmatch tcpdump timed tpctl traceroute trpt trsp unlink \
|
||||||
usbdevs user videomode vipw vnconfig wiconfig wlanctl wpa \
|
usbdevs user videomode vipw vnconfig wiconfig wlanctl wpa \
|
||||||
|
|||||||
@ -1,12 +0,0 @@
|
|||||||
# $NetBSD: Makefile,v 1.6 1996/06/07 00:44:18 thorpej Exp $
|
|
||||||
# from: @(#)Makefile 5.6 (Berkeley) 4/23/91
|
|
||||||
|
|
||||||
PROG= slstats
|
|
||||||
SRCS= slstats.c
|
|
||||||
MAN= slstats.8
|
|
||||||
DPADD= ${LIBKVM}
|
|
||||||
LDADD= -lkvm
|
|
||||||
BINGRP= kmem
|
|
||||||
BINMODE=2555
|
|
||||||
|
|
||||||
.include <bsd.prog.mk>
|
|
||||||
@ -1,101 +0,0 @@
|
|||||||
.\" $NetBSD: slstats.8,v 1.9 2002/02/02 01:52:32 wiz Exp $
|
|
||||||
.\"
|
|
||||||
.Dd July 5, 1993
|
|
||||||
.Dt SLSTATS 8
|
|
||||||
.Sh NAME
|
|
||||||
.Nm slstats
|
|
||||||
.Nd report slip statistics
|
|
||||||
.Sh SYNOPSIS
|
|
||||||
.Nm
|
|
||||||
.Op Fl M Ar core
|
|
||||||
.Op Fl N Ar system
|
|
||||||
.Op Fl v
|
|
||||||
.Op Fl i Ar interval
|
|
||||||
.Op Ar unit-number
|
|
||||||
.Sh DESCRIPTION
|
|
||||||
The
|
|
||||||
.Nm
|
|
||||||
utility reports slip-related statistics for the
|
|
||||||
.Ic sl Ns So
|
|
||||||
.Ar unit-number
|
|
||||||
.Sc
|
|
||||||
interface. If the
|
|
||||||
.Ar unit-number
|
|
||||||
is unspecified, it defaults to 0. These statistics are displayed at
|
|
||||||
regular intervals.
|
|
||||||
.Pp
|
|
||||||
The display is split horizontally into input and output sections
|
|
||||||
containing columns of statistics describing the properties and volume
|
|
||||||
of packets received and transmitted by the specified interface.
|
|
||||||
.Pp
|
|
||||||
The first report will consist of a snapshot of the interface's present
|
|
||||||
statistics. All further output will describe activity between report
|
|
||||||
intervals.
|
|
||||||
.Pp
|
|
||||||
The options are as follows:
|
|
||||||
.Bl -tag -width "system "
|
|
||||||
.It Fl v
|
|
||||||
Display additional statistics demonstrating the efficacy of VJ header
|
|
||||||
compression and providing more explicit information on failure
|
|
||||||
distribution.
|
|
||||||
.It Fl i
|
|
||||||
Specifies the interval between reports. The default interval is 5 seconds.
|
|
||||||
.It Fl M Ar core
|
|
||||||
Extract values associated with the name list from the specified.
|
|
||||||
.It Fl N Ar system
|
|
||||||
Extract the name list from the specified system instead of the default
|
|
||||||
.Pa /netbsd .
|
|
||||||
.El
|
|
||||||
.Pp
|
|
||||||
The following fields are printed on the input side:
|
|
||||||
.Bl -tag -width search
|
|
||||||
.It Li IN
|
|
||||||
The total number of bytes received by this interface.
|
|
||||||
.It Li PACK
|
|
||||||
The total number of packets received by this interface.
|
|
||||||
.It Li COMP
|
|
||||||
The number of compressed TCP packets received by this interface.
|
|
||||||
.It Li UNCOMP
|
|
||||||
The number of uncompressed TCP packets received by this interface.
|
|
||||||
.It Li ERR
|
|
||||||
The number of packets received by this interface of unknown type.
|
|
||||||
.It Li TOSS
|
|
||||||
The number of packets dropped on reception by this interface. Only
|
|
||||||
reported when the
|
|
||||||
.Fl v
|
|
||||||
option is specified.
|
|
||||||
.It Li IP
|
|
||||||
The total number of non-TCP packets received by this interface. Only
|
|
||||||
reported when the
|
|
||||||
.Fl v
|
|
||||||
option is specified.
|
|
||||||
.El
|
|
||||||
.Pp
|
|
||||||
The following fields are printed on the output side:
|
|
||||||
.Bl -tag -width search
|
|
||||||
.It Li OUT
|
|
||||||
The total number of bytes transmitted from this interface.
|
|
||||||
.It Li PACK
|
|
||||||
The total number of packets transmitted from this interface.
|
|
||||||
.It Li COMP
|
|
||||||
The number of TCP packets compressed and then transmitted from this interface.
|
|
||||||
.It Li UNCOMP
|
|
||||||
The number of uncompressed TCP packets transmitted from this interface.
|
|
||||||
.It Li IP
|
|
||||||
The total number of non-TCP packets transmitted from this interface.
|
|
||||||
.It Li SEARCH
|
|
||||||
The number of searches for the cached header entry for a compressed
|
|
||||||
packet. Only reported when the
|
|
||||||
.Fl v
|
|
||||||
option is specified.
|
|
||||||
.It Li MISS
|
|
||||||
The number of failed searches for the cached header entry for a
|
|
||||||
compressed packet. Only reported when the
|
|
||||||
.Fl v
|
|
||||||
option is specified.
|
|
||||||
.El
|
|
||||||
.Sh SEE ALSO
|
|
||||||
.Xr sl 4 ,
|
|
||||||
.Xr sliplogin 8
|
|
||||||
.Sh BUGS
|
|
||||||
Should take an interface name and not a unit number.
|
|
||||||
@ -1,272 +0,0 @@
|
|||||||
/* $NetBSD: slstats.c,v 1.15 2004/10/30 15:44:39 dsl Exp $ */
|
|
||||||
|
|
||||||
/*
|
|
||||||
* print serial line IP statistics:
|
|
||||||
* slstats [-i interval] [-v] [interface] [system [core]]
|
|
||||||
*
|
|
||||||
* Contributed by Van Jacobson (van@ee.lbl.gov), Dec 31, 1989.
|
|
||||||
*
|
|
||||||
* Copyright (c) 1989, 1990, 1991, 1992 Regents of the University of
|
|
||||||
* California. All rights reserved.
|
|
||||||
*
|
|
||||||
* Redistribution and use in source and binary forms, with or without
|
|
||||||
* modification, are permitted provided that the following conditions
|
|
||||||
* are met:
|
|
||||||
* 1. Redistributions of source code must retain the above copyright
|
|
||||||
* notice, this list of conditions and the following disclaimer.
|
|
||||||
* 2. Redistributions in binary form must reproduce the above copyright
|
|
||||||
* notice, this list of conditions and the following disclaimer in the
|
|
||||||
* documentation and/or other materials provided with the distribution.
|
|
||||||
* 3. Neither the name of the University nor the names of its contributors
|
|
||||||
* may be used to endorse or promote products derived from this software
|
|
||||||
* without specific prior written permission.
|
|
||||||
*
|
|
||||||
* THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
|
|
||||||
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
|
|
||||||
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
|
|
||||||
* ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
|
|
||||||
* FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
|
|
||||||
* DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
|
|
||||||
* OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
|
|
||||||
* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
|
|
||||||
* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
|
|
||||||
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
|
|
||||||
* SUCH DAMAGE.
|
|
||||||
*/
|
|
||||||
|
|
||||||
#include <sys/cdefs.h>
|
|
||||||
#ifndef lint
|
|
||||||
__RCSID("$NetBSD: slstats.c,v 1.15 2004/10/30 15:44:39 dsl Exp $");
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#define INET
|
|
||||||
|
|
||||||
#include <sys/param.h>
|
|
||||||
#include <sys/mbuf.h>
|
|
||||||
#include <sys/types.h>
|
|
||||||
#include <sys/socket.h>
|
|
||||||
#include <sys/file.h>
|
|
||||||
|
|
||||||
#include <net/if.h>
|
|
||||||
#include <netinet/in.h>
|
|
||||||
#include <netinet/in_systm.h>
|
|
||||||
#include <netinet/ip.h>
|
|
||||||
#include <netinet/ip_var.h>
|
|
||||||
|
|
||||||
#include <net/slcompress.h>
|
|
||||||
#include <net/if_slvar.h>
|
|
||||||
|
|
||||||
#include <ctype.h>
|
|
||||||
#include <err.h>
|
|
||||||
#include <errno.h>
|
|
||||||
#include <fcntl.h>
|
|
||||||
#include <kvm.h>
|
|
||||||
#include <limits.h>
|
|
||||||
#include <nlist.h>
|
|
||||||
#include <paths.h>
|
|
||||||
#include <signal.h>
|
|
||||||
#include <stdio.h>
|
|
||||||
#include <stdlib.h>
|
|
||||||
#include <string.h>
|
|
||||||
#include <unistd.h>
|
|
||||||
|
|
||||||
struct nlist nl[] = {
|
|
||||||
#define N_SOFTC 0
|
|
||||||
{ "_sl_softc" },
|
|
||||||
{ "" },
|
|
||||||
};
|
|
||||||
|
|
||||||
char *kernel; /* kernel for namelist */
|
|
||||||
char *kmemf; /* memory file */
|
|
||||||
|
|
||||||
kvm_t *kd;
|
|
||||||
|
|
||||||
int vflag;
|
|
||||||
unsigned interval = 5;
|
|
||||||
int unit;
|
|
||||||
|
|
||||||
void catchalarm __P((int));
|
|
||||||
void intpr __P((void));
|
|
||||||
int main __P((int, char **));
|
|
||||||
void usage __P((void));
|
|
||||||
|
|
||||||
int
|
|
||||||
main(argc, argv)
|
|
||||||
int argc;
|
|
||||||
char *argv[];
|
|
||||||
{
|
|
||||||
char errbuf[_POSIX2_LINE_MAX];
|
|
||||||
gid_t egid = getegid();
|
|
||||||
int ch;
|
|
||||||
|
|
||||||
setegid(getgid());
|
|
||||||
while ((ch = getopt(argc, argv, "i:M:N:v")) != -1) {
|
|
||||||
switch (ch) {
|
|
||||||
case 'i':
|
|
||||||
interval = atoi(optarg);
|
|
||||||
if (interval <= 0)
|
|
||||||
usage();
|
|
||||||
break;
|
|
||||||
|
|
||||||
case 'M':
|
|
||||||
kmemf = optarg;
|
|
||||||
break;
|
|
||||||
|
|
||||||
case 'N':
|
|
||||||
kernel = optarg;
|
|
||||||
break;
|
|
||||||
|
|
||||||
case 'v':
|
|
||||||
++vflag;
|
|
||||||
break;
|
|
||||||
|
|
||||||
default:
|
|
||||||
usage();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
argc -= optind;
|
|
||||||
argv += optind;
|
|
||||||
|
|
||||||
if (argc > 1)
|
|
||||||
usage();
|
|
||||||
|
|
||||||
while (argc--) {
|
|
||||||
if (isdigit((unsigned char)*argv[0])) {
|
|
||||||
unit = atoi(*argv);
|
|
||||||
if (unit < 0)
|
|
||||||
usage();
|
|
||||||
continue;
|
|
||||||
}
|
|
||||||
|
|
||||||
/* Fall to here, we have bogus arguments. */
|
|
||||||
usage();
|
|
||||||
}
|
|
||||||
|
|
||||||
/*
|
|
||||||
* Discard setgid privileges. If not the running kernel, we toss
|
|
||||||
* them away totally so that bad guys can't print interesting stuff
|
|
||||||
* from kernel memory, otherwise switch back to kmem for the
|
|
||||||
* duration of the kvm_openfiles() call.
|
|
||||||
*/
|
|
||||||
if (kmemf != NULL || kernel != NULL)
|
|
||||||
(void)setgid(getgid());
|
|
||||||
else
|
|
||||||
(void)setegid(egid);
|
|
||||||
|
|
||||||
memset(errbuf, 0, sizeof(errbuf));
|
|
||||||
if ((kd = kvm_openfiles(kernel, kmemf, NULL, O_RDONLY, errbuf)) == NULL)
|
|
||||||
errx(1, "can't open kvm: %s", errbuf);
|
|
||||||
|
|
||||||
/* get rid of it now anyway */
|
|
||||||
if (kmemf == NULL && kernel == NULL)
|
|
||||||
setgid(getgid());
|
|
||||||
|
|
||||||
if (kvm_nlist(kd, nl) < 0 || nl[0].n_type == 0)
|
|
||||||
errx(1, "%s: SLIP symbols not in namelist",
|
|
||||||
kernel == NULL ? _PATH_UNIX : kernel);
|
|
||||||
|
|
||||||
intpr();
|
|
||||||
exit(0);
|
|
||||||
}
|
|
||||||
|
|
||||||
#define V(offset) ((line % 20)? sc->offset - osc->offset : sc->offset)
|
|
||||||
#define AMT (sizeof(*sc) - 2 * sizeof(sc->sc_comp.tstate))
|
|
||||||
|
|
||||||
void
|
|
||||||
usage()
|
|
||||||
{
|
|
||||||
|
|
||||||
(void)fprintf(stderr, "usage: %s [-M core] [-N system] [-i interval] %s",
|
|
||||||
getprogname(), "[-v] [unit]\n");
|
|
||||||
exit(1);
|
|
||||||
}
|
|
||||||
|
|
||||||
u_char signalled; /* set if alarm goes off "early" */
|
|
||||||
|
|
||||||
/*
|
|
||||||
* Print a running summary of interface statistics.
|
|
||||||
* Repeat display every interval seconds, showing statistics
|
|
||||||
* collected over that interval. Assumes that interval is non-zero.
|
|
||||||
* First line printed at top of screen is always cumulative.
|
|
||||||
*/
|
|
||||||
void
|
|
||||||
intpr()
|
|
||||||
{
|
|
||||||
int line = 0;
|
|
||||||
int oldmask;
|
|
||||||
struct sl_softc *sc, *osc;
|
|
||||||
u_long addr;
|
|
||||||
|
|
||||||
addr = nl[N_SOFTC].n_value + unit * sizeof(struct sl_softc);
|
|
||||||
sc = (struct sl_softc *)malloc(AMT);
|
|
||||||
osc = (struct sl_softc *)malloc(AMT);
|
|
||||||
memset((char *)osc, 0, AMT);
|
|
||||||
|
|
||||||
while (1) {
|
|
||||||
if (kvm_read(kd, addr, (char *)sc, AMT) != AMT)
|
|
||||||
errx(1, "kvm_read: %s", kvm_geterr(kd));
|
|
||||||
|
|
||||||
(void)signal(SIGALRM, catchalarm);
|
|
||||||
signalled = 0;
|
|
||||||
(void)alarm(interval);
|
|
||||||
|
|
||||||
if ((line % 20) == 0) {
|
|
||||||
(void)printf("%8.8s %6.6s %6.6s %6.6s %6.6s",
|
|
||||||
"IN", "PACK", "COMP", "UNCOMP", "ERR");
|
|
||||||
if (vflag)
|
|
||||||
printf(" %6.6s %6.6s", "TOSS", "IP");
|
|
||||||
(void)printf(" | %8.8s %6.6s %6.6s %6.6s %6.6s",
|
|
||||||
"OUT", "PACK", "COMP", "UNCOMP", "IP");
|
|
||||||
if (vflag)
|
|
||||||
(void)printf(" %6.6s %6.6s", "SEARCH", "MISS");
|
|
||||||
(void)putchar('\n');
|
|
||||||
}
|
|
||||||
(void)printf("%8llu %6ld %6u %6u %6u",
|
|
||||||
(unsigned long long)V(sc_if.if_ibytes),
|
|
||||||
(long)V(sc_if.if_ipackets),
|
|
||||||
V(sc_comp.sls_compressedin),
|
|
||||||
V(sc_comp.sls_uncompressedin),
|
|
||||||
V(sc_comp.sls_errorin));
|
|
||||||
if (vflag)
|
|
||||||
(void)printf(" %6u %6llu",
|
|
||||||
V(sc_comp.sls_tossed),
|
|
||||||
(unsigned long long)(V(sc_if.if_ipackets) -
|
|
||||||
V(sc_comp.sls_compressedin) -
|
|
||||||
V(sc_comp.sls_uncompressedin) -
|
|
||||||
V(sc_comp.sls_errorin)));
|
|
||||||
(void)printf(" | %8llu %6llu %6u %6u %6llu",
|
|
||||||
(unsigned long long)V(sc_if.if_obytes),
|
|
||||||
(unsigned long long)V(sc_if.if_opackets),
|
|
||||||
V(sc_comp.sls_compressed),
|
|
||||||
V(sc_comp.sls_packets) - V(sc_comp.sls_compressed),
|
|
||||||
(unsigned long long)(V(sc_if.if_opackets) -
|
|
||||||
V(sc_comp.sls_packets)));
|
|
||||||
if (vflag)
|
|
||||||
(void)printf(" %6u %6u",
|
|
||||||
V(sc_comp.sls_searches),
|
|
||||||
V(sc_comp.sls_misses));
|
|
||||||
|
|
||||||
(void)putchar('\n');
|
|
||||||
fflush(stdout);
|
|
||||||
line++;
|
|
||||||
oldmask = sigblock(sigmask(SIGALRM));
|
|
||||||
if (!signalled)
|
|
||||||
sigpause(0);
|
|
||||||
sigsetmask(oldmask);
|
|
||||||
signalled = 0;
|
|
||||||
(void)alarm(interval);
|
|
||||||
memmove((char *)osc, (char *)sc, AMT);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/*
|
|
||||||
* Called if an interval expires before sidewaysintpr has completed a loop.
|
|
||||||
* Sets a flag to not wait for the alarm.
|
|
||||||
*/
|
|
||||||
void
|
|
||||||
catchalarm(dummy)
|
|
||||||
int dummy;
|
|
||||||
{
|
|
||||||
|
|
||||||
signalled = 1;
|
|
||||||
}
|
|
||||||
Loading…
Reference in New Issue
Block a user