]> git.ozlabs.org Git - ppp.git/blobdiff - pppstats/pppstats.c
use standard cc
[ppp.git] / pppstats / pppstats.c
index 270ca65b851c49a7522b9918312e15bd3b323388..2149f2567a4665d1b8061b82f4eeba861a0e7f11 100644 (file)
@@ -1,20 +1,19 @@
 /*
  * print PPP statistics:
- *     pppstats [-i interval] [-v] [-r] [-c] [interface]
- *
- *   -i <update interval in seconds>
- *   -v Verbose mode for default display
- *   -r Show compression ratio in default display
- *   -c Show Compression statistics instead of default display
+ *     pppstats [-a|-d] [-v|-r|-z] [-c count] [-w wait] [interface]
  *
+ *   -a Show absolute values rather than deltas
+ *   -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:
  *      perkins@cps.msu.edu: Added compression statistics and alternate 
  *                display. 11/94
-
  *     Brad Parker (brad@cayman.com) 6/92
  *
- * from the original "slstats" by Van Jaconson
+ * from the original "slstats" by Van Jacobson
  *
  * Copyright (c) 1989 Regents of the University of California.
  * All rights reserved.
  * 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@helios.ee.lbl.gov), Dec 31, 1989:
- *     - Initial distribution.
  */
 
 #ifndef lint
-static char rcsid[] = "$Id: pppstats.c,v 1.7 1995/05/02 04:18:40 paulus Exp $";
+static char rcsid[] = "$Id: pppstats.c,v 1.14 1996/07/01 05:32:57 paulus Exp $";
 #endif
 
+#include <stdio.h>
+#include <stddef.h>
+#include <stdlib.h>
+#include <string.h>
 #include <ctype.h>
 #include <errno.h>
-#include <nlist.h>
-#include <stdio.h>
 #include <signal.h>
+#include <fcntl.h>
+#include <unistd.h>
 #include <sys/param.h>
-#include <sys/mbuf.h>
 #include <sys/types.h>
 #include <sys/ioctl.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/ppp_defs.h>
 
 #ifndef STREAMS
+#include <sys/socket.h>                /* *BSD, Linux, NeXT, Ultrix etc. */
+#include <net/if.h>
 #include <net/if_ppp.h>
-#endif
 
-#ifdef STREAMS
-#define PPP_STATS      1       /* should be defined iff it is in ppp_if.c */
-#include <sys/stream.h>
-#include <net/ppp_str.h>
-#endif
+#else  /* STREAMS */
+#include <sys/stropts.h>       /* SVR4, Solaris 2, SunOS 4, OSF/1, etc. */
+#include <net/pppio.h>
+
+#endif /* STREAMS */
 
-int    vflag, rflag, cflag;
-unsigned interval = 5;
+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;
-int    s;                      /* socket file descriptor */
+int    s;                      /* socket or /dev/ppp file descriptor */
 int    signalled;              /* set if alarm goes off "early" */
+char   *progname;
+char   *interface;
 
-extern char *malloc();
-void catchalarm __P((int));
+void
+usage()
+{
+    fprintf(stderr, "Usage: %s [-a|-d] [-v|-r|-z] [-c count] [-w wait] [interface]\n",
+           progname);
+    exit(1);
+}
 
-main(argc, argv)
-    int argc;
-    char *argv[];
+/*
+ * Called if an interval expires before intpr has completed a loop.
+ * Sets a flag to not wait for the alarm.
+ */
+void
+catchalarm(arg)
+    int arg;
 {
-    --argc; ++argv;
-    while (argc > 0) {
-       if (strcmp(argv[0], "-v") == 0) {
-           ++vflag;
-           ++argv, --argc;
-           continue;
-       }
-       if (strcmp(argv[0], "-r") == 0) {
-         ++rflag;
-         ++argv, --argc;
-         continue;
-       }
-       if (strcmp(argv[0], "-c") == 0) {
-         ++cflag;
-         ++argv, --argc;
-         continue;
-       }
-       if (strcmp(argv[0], "-i") == 0 && argv[1] &&
-           isdigit(argv[1][0])) {
-           interval = atoi(argv[1]);
-           if (interval < 0)
-               usage();
-           ++argv, --argc;
-           ++argv, --argc;
-           continue;
-       }
-       if (isdigit(argv[0][0])) {
-           unit = atoi(argv[0]);
-           if (unit < 0)
-               usage();
-           ++argv, --argc;
-           continue;
+    signalled = 1;
+}
+
+
+#ifndef STREAMS
+void
+get_ppp_stats(curp)
+    struct ppp_stats *curp;
+{
+    struct ifpppstatsreq req;
+
+    memset (&req, 0, sizeof (req));
+
+#ifdef _linux_
+    req.stats_ptr = (caddr_t) &req.stats;
+#undef ifr_name
+#define ifr_name ifr__name
+#endif
+
+    strncpy(req.ifr_name, interface, sizeof(req.ifr_name));
+    if (ioctl(s, SIOCGPPPSTATS, &req) < 0) {
+       fprintf(stderr, "%s: ", progname);
+       if (errno == ENOTTY)
+           fprintf(stderr, "kernel support missing\n");
+       else
+           perror("couldn't get PPP statistics");
+       exit(1);
+    }
+    *curp = req.stats;
+}
+
+void
+get_ppp_cstats(csp)
+    struct ppp_comp_stats *csp;
+{
+    struct ifpppcstatsreq creq;
+
+    memset (&creq, 0, sizeof (creq));
+
+#ifdef _linux_
+    creq.stats_ptr = (caddr_t) &creq.stats;
+#undef  ifr_name
+#define ifr_name ifr__name
+#endif
+
+    strncpy(creq.ifr_name, interface, sizeof(creq.ifr_name));
+    if (ioctl(s, SIOCGPPPCSTATS, &creq) < 0) {
+       fprintf(stderr, "%s: ", progname);
+       if (errno == ENOTTY) {
+           fprintf(stderr, "no kernel compression support\n");
+           if (zflag)
+               exit(1);
+           rflag = 0;
+       } else {
+           perror("couldn't get PPP compression stats");
+           exit(1);
        }
-       usage();
     }
 
-    if ((s = socket(AF_INET, SOCK_DGRAM, 0)) < 0) {
-       perror("couldn't create IP socket");
+#ifdef _linux_
+    if (creq.stats.c.bytes_out == 0)
+       creq.stats.c.ratio = 0.0;
+    else
+       creq.stats.c.ratio = (double) creq.stats.c.in_count /
+                            (double) creq.stats.c.bytes_out;
+
+    if (creq.stats.d.bytes_out == 0)
+       creq.stats.d.ratio = 0.0;
+    else
+       creq.stats.d.ratio = (double) creq.stats.d.in_count /
+                            (double) creq.stats.d.bytes_out;
+#endif
+
+    *csp = creq.stats;
+}
+
+#else  /* STREAMS */
+
+int
+strioctl(fd, cmd, ptr, ilen, olen)
+    int fd, cmd, ilen, olen;
+    char *ptr;
+{
+    struct strioctl str;
+
+    str.ic_cmd = cmd;
+    str.ic_timout = 0;
+    str.ic_len = ilen;
+    str.ic_dp = ptr;
+    if (ioctl(fd, I_STR, &str) == -1)
+       return -1;
+    if (str.ic_len != olen)
+       fprintf(stderr, "strioctl: expected %d bytes, got %d for cmd %x\n",
+              olen, str.ic_len, cmd);
+    return 0;
+}
+
+void
+get_ppp_stats(curp)
+    struct ppp_stats *curp;
+{
+    if (strioctl(s, PPPIO_GETSTAT, curp, 0, sizeof(*curp)) < 0) {
+       fprintf(stderr, "%s: ", progname);
+       if (errno == EINVAL)
+           fprintf(stderr, "kernel support missing\n");
+       else
+           perror("couldn't get PPP statistics");
        exit(1);
     }
-    intpr();
-    exit(0);
 }
 
-usage()
+void
+get_ppp_cstats(csp)
+    struct ppp_comp_stats *csp;
 {
-    fprintf(stderr, "Usage: pppstats [-v] [-r] [-c] [-i interval] [unit]\n");
-    exit(1);
+    if (strioctl(s, PPPIO_GETCSTAT, csp, 0, sizeof(*csp)) < 0) {
+       fprintf(stderr, "%s: ", progname);
+       if (errno == ENOTTY) {
+           fprintf(stderr, "no kernel compression support\n");
+           if (zflag)
+               exit(1);
+           rflag = 0;
+       } else {
+           perror("couldn't get PPP compression statistics");
+           exit(1);
+       }
+    }
 }
 
-#define V(offset) (line % 20? req.stats.offset - osc.offset: req.stats.offset)
-#define W(offset) (line % 20? creq.stats.offset - csc.offset: creq.stats.offset)
+#endif /* STREAMS */
+
+#define MAX0(a)                ((int)(a) > 0? (a): 0)
+#define V(offset)      MAX0(cur.offset - old.offset)
+#define W(offset)      MAX0(ccs.offset - ocs.offset)
+
+#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 CRATE(comp, inc, unc)  ((unc) == 0? 0.0: \
-                                1.0 - (double)((comp) + (inc)) / (unc))
+#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 at top of screen is always cumulative.
+ * First line printed is cumulative.
  */
+void
 intpr()
 {
     register int line = 0;
-    int oldmask;
-    struct ifpppstatsreq req;
-    struct ifpppcstatsreq creq;
-    struct ppp_stats osc;
-    struct ppp_comp_stats csc;
+    sigset_t oldmask, mask;
+    char *bunit;
+    int ratef = 0;
+    struct ppp_stats cur, old;
+    struct ppp_comp_stats ccs, ocs;
 
-    bzero(&osc, sizeof(osc));
-    bzero(&csc, sizeof(csc));
+    memset(&old, 0, sizeof(old));
+    memset(&ocs, 0, sizeof(ocs));
 
-    sprintf(req.ifr_name, "ppp%d", unit);
-    sprintf(creq.ifr_name, "ppp%d", unit);
     while (1) {
-       if (ioctl(s, SIOCGPPPSTATS, &req) < 0) {
-           if (errno == ENOTTY)
-               fprintf(stderr, "pppstats: kernel support missing\n");
-           else
-               perror("ioctl(SIOCGPPPSTATS)");
-           exit(1);
-       }
-       if ((cflag || rflag) && ioctl(s, SIOCGPPPCSTATS, &creq) < 0) {
-           if (errno == ENOTTY) {
-               fprintf(stderr, "pppstats: no kernel compression support\n");
-               if (cflag)
-                   exit(1);
-               rflag = 0;
-           } else {
-               perror("ioctl(SIOCGPPPCSTATS)");
-               exit(1);
-           }
-       }
+       get_ppp_stats(&cur);
+       if (zflag || rflag)
+           get_ppp_cstats(&ccs);
+
        (void)signal(SIGALRM, catchalarm);
        signalled = 0;
        (void)alarm(interval);
-    
+
        if ((line % 20) == 0) {
-           if (line > 0)
-               putchar('\n');
-           if (cflag) {
-           
-               printf("%6.6s %6.6s %6.6s %6.6s %6.6s %6.6s %6.6s",
-                      "ubyte", "upack", "cbyte", "cpack", "ibyte", "ipack", "ratio");
-               printf(" | %6.6s %6.6s %6.6s %6.6s %6.6s %6.6s %6.6s",
-                      "ubyte", "upack", "cbyte", "cpack", "ibyte", "ipack", "ratio");
-               putchar('\n');
+           if (zflag) {
+               printf("IN:  COMPRESSED  INCOMPRESSIBLE   COMP | ");
+               printf("OUT: COMPRESSED  INCOMPRESSIBLE   COMP\n");
+               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");
 
-               printf("%6.6s %6.6s %6.6s %6.6s %6.6s",
-                      "in", "pack", "comp", "uncomp", "err");
+               if (!rflag)
+                   printf(" %6.6s %6.6s", "VJUNC", "VJERR");
                if (vflag)
-                   printf(" %6.6s %6.6s", "toss", "ip");
+                   printf(" %6.6s %6.6s", "VJTOSS", "NON-VJ");
                if (rflag)
-                   printf("   %6.6s %6.6s", "ratio", "ubyte");
-               printf("  | %6.6s %6.6s %6.6s %6.6s %6.6s",
-                      "out", "pack", "comp", "uncomp", "ip");
+                   printf(" %6.6s %6.6s", "RATIO", "UBYTE");
+               printf("  | %8.8s %6.6s %6.6s",
+                      "OUT", "PACK", "VJCOMP");
+
+               if (!rflag)
+                   printf(" %6.6s %6.6s", "VJUNC", "NON-VJ");
                if (vflag)
-                   printf(" %6.6s %6.6s", "search", "miss");
-               if(rflag)
-                   printf("   %6.6s %6.6s", "ratio", "ubyte");
-               putchar('\n');
+                   printf(" %6.6s %6.6s", "VJSRCH", "VJMISS");
+               if (rflag)
+                   printf(" %6.6s %6.6s", "RATIO", "UBYTE");
            }
-           bzero(&osc, sizeof(osc));
-           bzero(&csc, sizeof(csc));
+           putchar('\n');
        }
+
+       if (zflag) {
+           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);
+           }
        
-       if (cflag) {
-           printf("%6d %6d %6d %6d %6d %6d %6.2f",
-                  W(d.unc_bytes),
-                  W(d.unc_packets),
-                  W(d.comp_bytes),
-                  W(d.comp_packets),
-                  W(d.inc_bytes),
-                  W(d.inc_packets),
-                  W(d.ratio) / 256.0);
-
-           printf(" | %6d %6d %6d %6d %6d %6d %6.2f",
-                  W(c.unc_bytes),
-                  W(c.unc_packets),
-                  W(c.comp_bytes),
-                  W(c.comp_packets),
-                  W(c.inc_bytes),
-                  W(c.inc_packets),
-                  W(c.ratio) / 256.0);
-       
-           putchar('\n');
        } else {
-
-           printf("%6d %6d %6d %6d %6d",
-                  V(p.ppp_ibytes),
-                  V(p.ppp_ipackets), V(vj.vjs_compressedin),
-                  V(vj.vjs_uncompressedin), V(vj.vjs_errorin));
+           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)
+               printf(" %6u %6u",
+                      V(vj.vjs_uncompressedin),
+                      V(vj.vjs_errorin));
            if (vflag)
-               printf(" %6d %6d", 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 %6d",
-                      CRATE(W(d.comp_bytes), W(d.unc_bytes), W(d.unc_bytes)),
-                      W(d.unc_bytes));
-           printf("  | %6d %6d %6d %6d %6d", V(p.ppp_obytes),
-                  V(p.ppp_opackets), V(vj.vjs_compressed),
-                  V(vj.vjs_packets) - V(vj.vjs_compressed),
-                  V(p.ppp_opackets) - V(vj.vjs_packets));
+               printf(" %6u %6u",
+                      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 ", 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_obytes),
+                  V(p.ppp_opackets),
+                  V(vj.vjs_compressed));
+           if (!rflag)
+               printf(" %6u %6u",
+                      V(vj.vjs_packets) - V(vj.vjs_compressed),
+                      V(p.ppp_opackets) - V(vj.vjs_packets));
            if (vflag)
-               printf(" %6d %6d", V(vj.vjs_searches), V(vj.vjs_misses));
+               printf(" %6u %6u",
+                      V(vj.vjs_searches),
+                      V(vj.vjs_misses));
+           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 (rflag)
-               printf("   %6.2f %6d",
-                      CRATE(W(d.comp_bytes), W(d.unc_bytes), W(d.unc_bytes)),
-                      W(c.unc_bytes));
-           
-           putchar('\n');
        }
 
+       putchar('\n');
        fflush(stdout);
        line++;
-       if (interval == 0)
-           exit(0);
-    
-       oldmask = sigblock(sigmask(SIGALRM));
-       if (! signalled) {
-           sigpause(0);
+
+       count--;
+       if (!infinite && !count)
+           break;
+
+       sigemptyset(&mask);
+       sigaddset(&mask, SIGALRM);
+       sigprocmask(SIG_BLOCK, &mask, &oldmask);
+       if (!signalled) {
+           sigemptyset(&mask);
+           sigsuspend(&mask);
        }
-       sigsetmask(oldmask);
+       sigprocmask(SIG_SETMASK, &oldmask, NULL);
        signalled = 0;
        (void)alarm(interval);
-       osc = req.stats;
-       csc = creq.stats;
+
+       if (!aflag) {
+           old = cur;
+           ocs = ccs;
+           ratef = dflag;
+       }
     }
 }
 
-/*
- * Called if an interval expires before sidewaysintpr has completed a loop.
- * Sets a flag to not wait for the alarm.
- */
-void catchalarm(arg)
-    int arg;
+int
+main(argc, argv)
+    int argc;
+    char *argv[];
 {
-    signalled = 1;
+    int c;
+
+    interface = "ppp0";
+    if ((progname = strrchr(argv[0], '/')) == NULL)
+       progname = argv[0];
+    else
+       ++progname;
+
+    while ((c = getopt(argc, argv, "advrzc:w:")) != -1) {
+       switch (c) {
+       case 'a':
+           ++aflag;
+           break;
+       case 'd':
+           ++dflag;
+           break;
+       case 'v':
+           ++vflag;
+           break;
+       case 'r':
+           ++rflag;
+           break;
+       case 'z':
+           ++zflag;
+           break;
+       case 'c':
+           count = atoi(optarg);
+           if (count <= 0)
+               usage();
+           break;
+       case 'w':
+           interval = atoi(optarg);
+           if (interval <= 0)
+               usage();
+           break;
+       default:
+           usage();
+       }
+    }
+    argc -= optind;
+    argv += optind;
+
+    if (!interval && count)
+       interval = 5;
+    if (interval && !count)
+       infinite = 1;
+    if (!interval && !count)
+       count = 1;
+    if (aflag)
+       dflag = 0;
+
+    if (argc > 1)
+       usage();
+    if (argc > 0)
+       interface = argv[0];
+
+    if (sscanf(interface, "ppp%d", &unit) != 1) {
+       fprintf(stderr, "%s: invalid interface '%s' specified\n",
+               progname, interface);
+    }
+
+#ifndef STREAMS
+    {
+       struct ifreq ifr;
+
+       s = socket(AF_INET, SOCK_DGRAM, 0);
+       if (s < 0) {
+           fprintf(stderr, "%s: ", progname);
+           perror("couldn't create IP socket");
+           exit(1);
+       }
+       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",
+                   progname, interface);
+           exit(1);
+       }
+    }
+
+#else  /* STREAMS */
+    if ((s = open("/dev/ppp", O_RDONLY)) < 0) {
+       fprintf(stderr, "%s: ", progname);
+       perror("couldn't open /dev/ppp");
+       exit(1);
+    }
+    if (strioctl(s, PPPIO_ATTACH, &unit, sizeof(int), 0) < 0) {
+       fprintf(stderr, "%s: ppp%d is not available\n", progname, unit);
+       exit(1);
+    }
+
+#endif /* STREAMS */
+
+    intpr();
+    exit(0);
 }