Removed more vestiges of if_sl(4).
This commit is contained in:
Ruslan Ermilov
parent
cd3ef66680
commit
9596b6dea8
@ -15,14 +15,15 @@
|
||||
#
|
||||
|
||||
# 20090405: removal of if_ppp(4) and if_sl(4)
|
||||
OLD_FILES+=sbin/slattach
|
||||
OLD_FILES+=sbin/startslip
|
||||
OLD_FILES+=sbin/slattach rescue/slattach
|
||||
OLD_FILES+=sbin/startslip rescue/startslip
|
||||
OLD_FILES+=usr/include/net/if_ppp.h
|
||||
OLD_FILES+=usr/include/net/if_pppvar.h
|
||||
OLD_FILES+=usr/include/net/if_slvar.h
|
||||
OLD_FILES+=usr/include/net/ppp_comp.h
|
||||
OLD_FILES+=usr/include/net/slip.h
|
||||
OLD_FILES+=usr/sbin/sliplogin
|
||||
OLD_FILES+=usr/sbin/slstat
|
||||
OLD_FILES+=usr/sbin/pppd
|
||||
OLD_FILES+=usr/sbin/pppstats
|
||||
OLD_FILES+=usr/share/man/man1/startslip.1.gz
|
||||
@ -33,7 +34,9 @@ OLD_FILES+=usr/share/man/man4/sl.4.gz
|
||||
OLD_FILES+=usr/share/man/man8/pppd.8.gz
|
||||
OLD_FILES+=usr/share/man/man8/pppstats.8.gz
|
||||
OLD_FILES+=usr/share/man/man8/slattach.8.gz
|
||||
OLD_FILES+=usr/share/man/man8/slip.8.gz
|
||||
OLD_FILES+=usr/share/man/man8/sliplogin.8.gz
|
||||
OLD_FILES+=usr/share/man/man8/slstat.8.gz
|
||||
# 20090321: libpcap upgraded to 1.0.0
|
||||
OLD_LIBS+=lib/libpcap.so.5
|
||||
.if ${TARGET_ARCH} == "amd64"
|
||||
|
||||
@ -164,7 +164,6 @@ SUBDIR= ${_ac} \
|
||||
setfmac \
|
||||
setpmac \
|
||||
${_sicontrol} \
|
||||
${_slstat} \
|
||||
smbmsg \
|
||||
snapinfo \
|
||||
${_spkrtest} \
|
||||
|
||||
@ -1,9 +0,0 @@
|
||||
# from: @(#)Makefile 5.6 (Berkeley) 4/23/91
|
||||
# $FreeBSD$
|
||||
|
||||
PROG= slstat
|
||||
MAN= slstat.8
|
||||
|
||||
WARNS?= 2
|
||||
|
||||
.include <bsd.prog.mk>
|
||||
@ -1,125 +0,0 @@
|
||||
.\" Copyright (c) 1986 The 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.
|
||||
.\" 4. 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.
|
||||
.\"
|
||||
.\" From: @(#)slstat.8 6.8 (Berkeley) 6/20/91
|
||||
.\" $FreeBSD$
|
||||
.\"
|
||||
.Dd October 11, 1996
|
||||
.Dt SLSTAT 8
|
||||
.Os
|
||||
.Sh NAME
|
||||
.Nm slstat
|
||||
.Nd report serial line IP statistics
|
||||
.Sh SYNOPSIS
|
||||
.Nm
|
||||
.Op Fl i Ar interval
|
||||
.Op Fl vr
|
||||
.Op Ar unit
|
||||
.Sh DESCRIPTION
|
||||
The
|
||||
.Nm
|
||||
utility
|
||||
reports certain kernel statistics kept about serial line internet
|
||||
protocol traffic.
|
||||
.Pp
|
||||
The options are as follows:
|
||||
.Bl -tag -width indent
|
||||
.It Fl i
|
||||
Repeat the display indefinitely every
|
||||
.Ar interval
|
||||
seconds.
|
||||
If no
|
||||
.Ar interval
|
||||
is specified, the default is 5 seconds.
|
||||
.It Fl v
|
||||
Verbose display of extra fields of information.
|
||||
.It Fl r
|
||||
Display all values in rate per second rather than amount per interval.
|
||||
.It Ar unit
|
||||
Is number specifying the
|
||||
.Tn SLIP
|
||||
interface, or a
|
||||
.Tn SLIP
|
||||
interface name.
|
||||
The default unit is
|
||||
.Sy 0
|
||||
for interface
|
||||
.Sy sl0 .
|
||||
.El
|
||||
.Pp
|
||||
By default,
|
||||
.Nm
|
||||
displays the following information:
|
||||
.Pp
|
||||
.Bl -tag -width indent
|
||||
.It in
|
||||
bytes received
|
||||
.It out
|
||||
bytes sent
|
||||
.It pack
|
||||
packets received or sent
|
||||
.It comp
|
||||
compressed packets received or sent
|
||||
.It uncomp
|
||||
uncompressed packets received or sent
|
||||
.It unknwn
|
||||
inbound packets of unknown type
|
||||
.It toss
|
||||
inbound packets tossed because of error
|
||||
.It other
|
||||
all other inbound or outbound ip packets
|
||||
.It err
|
||||
input or output errors
|
||||
.It search
|
||||
searches for connection state
|
||||
.It miss
|
||||
times we could not find a connection state
|
||||
.It coll
|
||||
collisions with end of clists.
|
||||
If you get many collisions (more than one or two
|
||||
a day) you probably do not have enough clists
|
||||
and you should increase
|
||||
.Dv nclist
|
||||
in param.c.
|
||||
.El
|
||||
.Sh EXAMPLES
|
||||
The command:
|
||||
.Dl slstat -i 5
|
||||
will print what the system is doing every five
|
||||
seconds.
|
||||
.Sh SEE ALSO
|
||||
.Xr fstat 1 ,
|
||||
.Xr netstat 1 ,
|
||||
.Xr nfsstat 1 ,
|
||||
.Xr ps 1 ,
|
||||
.Xr systat 1 ,
|
||||
.Xr iostat 8 ,
|
||||
.Xr pppstats 8 ,
|
||||
.Xr pstat 8
|
||||
.Pp
|
||||
The sections starting with ``Interpreting system activity'' in
|
||||
.%T "Installing and Operating 4.3BSD" .
|
||||
@ -1,243 +0,0 @@
|
||||
/*
|
||||
* print serial line IP statistics:
|
||||
* slstat [-i interval] [-v] [interface]
|
||||
*
|
||||
* Copyright (c) 1989, 1990, 1991, 1992 Regents of the University of
|
||||
* California. All rights reserved.
|
||||
*
|
||||
* Redistribution and use in source and binary forms are permitted
|
||||
* provided that the above copyright notice and this paragraph are
|
||||
* duplicated in all such forms and that any documentation,
|
||||
* advertising materials, and other materials related to such
|
||||
* distribution and use acknowledge that the software was developed
|
||||
* by the University of California, Berkeley. The name of the
|
||||
* University may not be used to endorse or promote products derived
|
||||
* from this software without specific prior written permission.
|
||||
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR
|
||||
* IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
|
||||
* WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
|
||||
*
|
||||
* Van Jacobson (van@ee.lbl.gov), Dec 31, 1989:
|
||||
* - Initial distribution.
|
||||
*/
|
||||
|
||||
#include <sys/cdefs.h>
|
||||
__FBSDID("$FreeBSD$");
|
||||
|
||||
#include <sys/param.h>
|
||||
#include <sys/socket.h>
|
||||
#include <sys/sysctl.h>
|
||||
#include <sys/time.h>
|
||||
|
||||
#include <ctype.h>
|
||||
#include <err.h>
|
||||
#include <errno.h>
|
||||
#include <signal.h>
|
||||
#include <stdio.h>
|
||||
#include <stdlib.h>
|
||||
#include <string.h>
|
||||
#include <unistd.h>
|
||||
|
||||
#include <net/if.h>
|
||||
#include <net/if_var.h>
|
||||
#include <net/if_mib.h>
|
||||
#include <net/if_types.h>
|
||||
#include <netinet/in.h>
|
||||
#include <netinet/in_systm.h>
|
||||
#include <netinet/ip.h>
|
||||
#include <net/slcompress.h>
|
||||
#include <net/if_slvar.h>
|
||||
|
||||
static void usage(void);
|
||||
static void intpr(void);
|
||||
static void catchalarm(int);
|
||||
|
||||
#define INTERFACE_PREFIX "sl%d"
|
||||
char interface[IFNAMSIZ];
|
||||
|
||||
int rflag;
|
||||
int vflag;
|
||||
unsigned interval = 5;
|
||||
int unit;
|
||||
int name[6];
|
||||
|
||||
int
|
||||
main(int argc, char *argv[])
|
||||
{
|
||||
int c, i;
|
||||
size_t len;
|
||||
int maxifno;
|
||||
int indx;
|
||||
struct ifmibdata ifmd;
|
||||
|
||||
while ((c = getopt(argc, argv, "vri:")) != -1) {
|
||||
switch(c) {
|
||||
case 'v':
|
||||
++vflag;
|
||||
break;
|
||||
case 'r':
|
||||
++rflag;
|
||||
break;
|
||||
case 'i':
|
||||
interval = atoi(optarg);
|
||||
if (interval <= 0)
|
||||
usage();
|
||||
break;
|
||||
default:
|
||||
usage();
|
||||
}
|
||||
}
|
||||
if (optind >= argc)
|
||||
sprintf(interface, INTERFACE_PREFIX, unit);
|
||||
else if (isdigit(argv[optind][0])) {
|
||||
unit = atoi(argv[optind]);
|
||||
if (unit < 0)
|
||||
usage();
|
||||
sprintf(interface, INTERFACE_PREFIX, unit);
|
||||
} else if (strncmp(argv[optind], "sl", 2) == 0
|
||||
&& isdigit(argv[optind][2])
|
||||
&& sscanf(argv[optind], "sl%d", &unit) == 1) {
|
||||
strncpy(interface, argv[optind], IFNAMSIZ);
|
||||
} else
|
||||
usage();
|
||||
|
||||
name[0] = CTL_NET;
|
||||
name[1] = PF_LINK;
|
||||
name[2] = NETLINK_GENERIC;
|
||||
name[3] = IFMIB_SYSTEM;
|
||||
name[4] = IFMIB_IFCOUNT;
|
||||
len = sizeof maxifno;
|
||||
if (sysctl(name, 5, &maxifno, &len, 0, 0) < 0)
|
||||
err(1, "sysctl net.link.generic.system.ifcount");
|
||||
|
||||
name[3] = IFMIB_IFDATA;
|
||||
name[5] = IFDATA_GENERAL;
|
||||
len = sizeof ifmd;
|
||||
for (i = 1; ; i++) {
|
||||
name[4] = i;
|
||||
|
||||
if (sysctl(name, 6, &ifmd, &len, 0, 0) < 0) {
|
||||
if (errno == ENOENT)
|
||||
continue;
|
||||
|
||||
err(1, "sysctl");
|
||||
}
|
||||
if (strncmp(interface, ifmd.ifmd_name, IFNAMSIZ) == 0
|
||||
&& ifmd.ifmd_data.ifi_type == IFT_SLIP) {
|
||||
indx = i;
|
||||
break;
|
||||
}
|
||||
if (i >= maxifno)
|
||||
errx(1, "interface %s does not exist", interface);
|
||||
}
|
||||
|
||||
name[4] = indx;
|
||||
name[5] = IFDATA_LINKSPECIFIC;
|
||||
intpr();
|
||||
exit(0);
|
||||
}
|
||||
|
||||
#define V(offset) ((line % 20)? ((sc->offset - osc->offset) / \
|
||||
(rflag ? interval : 1)) : sc->offset)
|
||||
#define AMT (sizeof(*sc) - 2 * sizeof(sc->sc_comp.tstate))
|
||||
|
||||
static void
|
||||
usage()
|
||||
{
|
||||
fprintf(stderr, "usage: slstat [-i interval] [-vr] [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.
|
||||
*/
|
||||
static void
|
||||
intpr()
|
||||
{
|
||||
register int line = 0;
|
||||
int oldmask;
|
||||
struct sl_softc *sc, *osc;
|
||||
size_t len;
|
||||
|
||||
sc = (struct sl_softc *)malloc(AMT);
|
||||
osc = (struct sl_softc *)malloc(AMT);
|
||||
bzero((char *)osc, AMT);
|
||||
len = AMT;
|
||||
|
||||
while (1) {
|
||||
if (sysctl(name, 6, sc, &len, 0, 0) < 0 &&
|
||||
(errno != ENOMEM || len != AMT))
|
||||
err(1, "sysctl linkspecific");
|
||||
|
||||
(void)signal(SIGALRM, catchalarm);
|
||||
signalled = 0;
|
||||
(void)alarm(interval);
|
||||
|
||||
if ((line % 20) == 0) {
|
||||
printf("%8.8s %6.6s %6.6s %6.6s %6.6s",
|
||||
"in", "pack", "comp", "uncomp", "unknwn");
|
||||
if (vflag)
|
||||
printf(" %6.6s %6.6s %6.6s",
|
||||
"toss", "other", "err");
|
||||
printf(" | %8.8s %6.6s %6.6s %6.6s %6.6s",
|
||||
"out", "pack", "comp", "uncomp", "other");
|
||||
if (vflag)
|
||||
printf(" %6.6s %6.6s %6.6s %6.6s",
|
||||
"search", "miss", "err", "coll");
|
||||
putchar('\n');
|
||||
}
|
||||
printf("%8lu %6ld %6u %6u %6u",
|
||||
V(sc_ifp->if_ibytes),
|
||||
V(sc_ifp->if_ipackets),
|
||||
V(sc_comp.sls_compressedin),
|
||||
V(sc_comp.sls_uncompressedin),
|
||||
V(sc_comp.sls_errorin));
|
||||
if (vflag)
|
||||
printf(" %6u %6lu %6lu",
|
||||
V(sc_comp.sls_tossed),
|
||||
V(sc_ifp->if_ipackets) -
|
||||
V(sc_comp.sls_compressedin) -
|
||||
V(sc_comp.sls_uncompressedin) -
|
||||
V(sc_comp.sls_errorin),
|
||||
V(sc_ifp->if_ierrors));
|
||||
printf(" | %8lu %6ld %6u %6u %6lu",
|
||||
V(sc_ifp->if_obytes) / (rflag ? interval : 1),
|
||||
V(sc_ifp->if_opackets),
|
||||
V(sc_comp.sls_compressed),
|
||||
V(sc_comp.sls_packets) - V(sc_comp.sls_compressed),
|
||||
V(sc_ifp->if_opackets) - V(sc_comp.sls_packets));
|
||||
if (vflag)
|
||||
printf(" %6u %6u %6lu %6lu",
|
||||
V(sc_comp.sls_searches),
|
||||
V(sc_comp.sls_misses),
|
||||
V(sc_ifp->if_oerrors),
|
||||
V(sc_ifp->if_collisions));
|
||||
putchar('\n');
|
||||
fflush(stdout);
|
||||
line++;
|
||||
oldmask = sigblock(sigmask(SIGALRM));
|
||||
if (! signalled) {
|
||||
sigpause(0);
|
||||
}
|
||||
sigsetmask(oldmask);
|
||||
signalled = 0;
|
||||
(void)alarm(interval);
|
||||
bcopy((char *)sc, (char *)osc, AMT);
|
||||
}
|
||||
}
|
||||
|
||||
/*
|
||||
* Called if an interval expires before sidewaysintpr has completed a loop.
|
||||
* Sets a flag to not wait for the alarm.
|
||||
*/
|
||||
static void
|
||||
catchalarm(sig)
|
||||
int sig __unused;
|
||||
{
|
||||
signalled = 1;
|
||||
}
|
||||
Loading…
Reference in New Issue
Block a user