/*
* print PPP statistics:
- * pppstats [-a] [-v] [-r] [-z] [-c count] [-w wait] [interface]
+ * pppstats [-a|-d] [-v|-r|-z] [-c count] [-w wait] [interface]
*
* -a Show absolute values rather than deltas
- * -v Verbose mode for default display
- * -r Show compression ratio in default display
+ * -d Show data rate (kB/s) rather than bytes
+ * -v Show more stats for VJ TCP header compression
+ * -r Show compression ratio
* -z Show compression statistics instead of default display
*
* History:
*/
#ifndef lint
-static char rcsid[] = "$Id: pppstats.c,v 1.13 1996/07/01 01:22:36 paulus Exp $";
+static char rcsid[] = "$Id: pppstats.c,v 1.22 1998/03/31 23:48:03 paulus Exp $";
#endif
#include <stdio.h>
#include <sys/param.h>
#include <sys/types.h>
#include <sys/ioctl.h>
-#include <net/ppp_defs.h>
#ifndef STREAMS
#include <sys/socket.h> /* *BSD, Linux, NeXT, Ultrix etc. */
+#ifndef _linux_
#include <net/if.h>
+#include <net/ppp_defs.h>
#include <net/if_ppp.h>
+#else
+/* Linux */
+#if __GLIBC__ >= 2
+#include <net/if.h>
+#else
+#include <linux/if.h>
+#endif
+#include <linux/types.h>
+#include <linux/ppp_defs.h>
+#include <linux/if_ppp.h>
+#endif /* _linux_ */
#else /* STREAMS */
#include <sys/stropts.h> /* SVR4, Solaris 2, SunOS 4, OSF/1, etc. */
+#include <net/ppp_defs.h>
#include <net/pppio.h>
#endif /* STREAMS */
int vflag, rflag, zflag; /* select type of display */
int aflag; /* print absolute values, not deltas */
+int dflag; /* print data rates, not bytes */
int interval, count;
int infinite;
int unit;
char *progname;
char *interface;
-void
+#if defined(SUNOS4) || defined(ULTRIX) || defined(NeXT)
+extern int optind;
+extern char *optarg;
+#endif
+
+static void usage __P((void));
+static void catchalarm __P((int));
+static void get_ppp_stats __P((struct ppp_stats *));
+static void get_ppp_cstats __P((struct ppp_comp_stats *));
+static void intpr __P((void));
+
+int main __P((int, char *argv[]));
+
+static void
usage()
{
- fprintf(stderr, "Usage: %s [-v|-r|-z] [-a] [-c count] [-w wait] [interface]\n",
+ fprintf(stderr, "Usage: %s [-a|-d] [-v|-r|-z] [-c count] [-w wait] [interface]\n",
progname);
exit(1);
}
* Called if an interval expires before intpr has completed a loop.
* Sets a flag to not wait for the alarm.
*/
-void
+static void
catchalarm(arg)
int arg;
{
#ifndef STREAMS
-void
+static void
get_ppp_stats(curp)
struct ppp_stats *curp;
{
*curp = req.stats;
}
-void
+static void
get_ppp_cstats(csp)
struct ppp_comp_stats *csp;
{
return 0;
}
-void
+static void
get_ppp_stats(curp)
struct ppp_stats *curp;
{
}
}
-void
+static void
get_ppp_cstats(csp)
struct ppp_comp_stats *csp;
{
#define RATIO(c, i, u) ((c) == 0? 1.0: (u) / ((double)(c) + (i)))
#define CRATE(x) RATIO(W(x.comp_bytes), W(x.inc_bytes), W(x.unc_bytes))
+#define KBPS(n) ((n) / (interval * 1000.0))
+
/*
* 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 is cumulative.
*/
-void
+static void
intpr()
{
register int line = 0;
sigset_t oldmask, mask;
+ char *bunit;
+ int ratef = 0;
struct ppp_stats cur, old;
struct ppp_comp_stats ccs, ocs;
if (zflag) {
printf("IN: COMPRESSED INCOMPRESSIBLE COMP | ");
printf("OUT: COMPRESSED INCOMPRESSIBLE COMP\n");
- printf(" BYTE PACK BYTE PACK RATIO | ");
- printf(" BYTE PACK BYTE PACK RATIO");
+ bunit = dflag? "KB/S": "BYTE";
+ printf(" %s PACK %s PACK RATIO | ", bunit, bunit);
+ printf(" %s PACK %s PACK RATIO", bunit, bunit);
} else {
printf("%8.8s %6.6s %6.6s",
"IN", "PACK", "VJCOMP");
}
if (zflag) {
- printf("%8u %6u %8u %6u %6.2f",
- W(d.comp_bytes),
- W(d.comp_packets),
- W(d.inc_bytes),
- W(d.inc_packets),
- ccs.d.ratio * 256.0);
-
- printf(" | %8u %6u %8u %6u %6.2f",
- W(c.comp_bytes),
- W(c.comp_packets),
- W(c.inc_bytes),
- W(c.inc_packets),
- ccs.c.ratio * 256.0);
+ if (ratef) {
+ printf("%8.3f %6u %8.3f %6u %6.2f",
+ KBPS(W(d.comp_bytes)),
+ W(d.comp_packets),
+ KBPS(W(d.inc_bytes)),
+ W(d.inc_packets),
+ ccs.d.ratio * 256.0);
+ printf(" | %8.3f %6u %8.3f %6u %6.2f",
+ KBPS(W(c.comp_bytes)),
+ W(c.comp_packets),
+ KBPS(W(c.inc_bytes)),
+ W(c.inc_packets),
+ ccs.c.ratio * 256.0);
+ } else {
+ printf("%8u %6u %8u %6u %6.2f",
+ W(d.comp_bytes),
+ W(d.comp_packets),
+ W(d.inc_bytes),
+ W(d.inc_packets),
+ ccs.d.ratio * 256.0);
+ printf(" | %8u %6u %8u %6u %6.2f",
+ W(c.comp_bytes),
+ W(c.comp_packets),
+ W(c.inc_bytes),
+ W(c.inc_packets),
+ ccs.c.ratio * 256.0);
+ }
} else {
-
- printf("%8u %6u %6u",
- V(p.ppp_ibytes),
+ if (ratef)
+ printf("%8.3f", KBPS(V(p.ppp_ibytes)));
+ else
+ printf("%8u", V(p.ppp_ibytes));
+ printf(" %6u %6u",
V(p.ppp_ipackets),
V(vj.vjs_compressedin));
if (!rflag)
V(vj.vjs_tossed),
V(p.ppp_ipackets) - V(vj.vjs_compressedin)
- V(vj.vjs_uncompressedin) - V(vj.vjs_errorin));
- if (rflag)
- printf(" %6.2f %6u",
- CRATE(d),
- W(d.unc_bytes));
- printf(" | %8u %6u %6u",
- V(p.ppp_obytes),
+ if (rflag) {
+ printf(" %6.2f ", CRATE(d));
+ if (ratef)
+ printf("%6.2f", KBPS(W(d.unc_bytes)));
+ else
+ printf("%6u", W(d.unc_bytes));
+ }
+ if (ratef)
+ printf(" | %8.3f", KBPS(V(p.ppp_obytes)));
+ else
+ printf(" | %8u", V(p.ppp_obytes));
+ printf(" %6u %6u",
V(p.ppp_opackets),
V(vj.vjs_compressed));
if (!rflag)
printf(" %6u %6u",
V(vj.vjs_searches),
V(vj.vjs_misses));
-
- if (rflag)
- printf(" %6.2f %6u",
- CRATE(c),
- W(c.unc_bytes));
+ if (rflag) {
+ printf(" %6.2f ", CRATE(c));
+ if (ratef)
+ printf("%6.2f", KBPS(W(c.unc_bytes)));
+ else
+ printf("%6u", W(c.unc_bytes));
+ }
}
if (!aflag) {
old = cur;
ocs = ccs;
+ ratef = dflag;
}
}
}
char *argv[];
{
int c;
+#ifdef STREAMS
+ char *dev;
+#endif
interface = "ppp0";
if ((progname = strrchr(argv[0], '/')) == NULL)
else
++progname;
- while ((c = getopt(argc, argv, "avrzc:w:")) != -1) {
+ while ((c = getopt(argc, argv, "advrzc:w:")) != -1) {
switch (c) {
case 'a':
++aflag;
break;
+ case 'd':
+ ++dflag;
+ break;
case 'v':
++vflag;
break;
infinite = 1;
if (!interval && !count)
count = 1;
+ if (aflag)
+ dflag = 0;
if (argc > 1)
usage();
perror("couldn't create IP socket");
exit(1);
}
+
+#ifdef _linux_
+#undef ifr_name
+#define ifr_name ifr_ifrn.ifrn_name
+#endif
strncpy(ifr.ifr_name, interface, sizeof(ifr.ifr_name));
if (ioctl(s, SIOCGIFFLAGS, (caddr_t)&ifr) < 0) {
fprintf(stderr, "%s: nonexistent interface '%s' specified\n",
}
#else /* STREAMS */
- if ((s = open("/dev/ppp", O_RDONLY)) < 0) {
- fprintf(stderr, "%s: ", progname);
- perror("couldn't open /dev/ppp");
+#ifdef __osf__
+ dev = "/dev/streams/ppp";
+#else
+ dev = "/dev/ppp";
+#endif
+ if ((s = open(dev, O_RDONLY)) < 0) {
+ fprintf(stderr, "%s: couldn't open ", progname);
+ perror(dev);
exit(1);
}
if (strioctl(s, PPPIO_ATTACH, &unit, sizeof(int), 0) < 0) {
projects / ppp.git / blobdiff