Add prototypes; implement sys_cleanup; ccp_test provides more info;
[ppp.git] / pppstats / pppstats.c
index 8efe48147cf4313ee845d8ed7de941e86be8d6b1..18bb7e6114e12215f727f3a8f8e2dd2103e857b6 100644 (file)
@@ -1,7 +1,18 @@
 /*
  * print PPP statistics:
- *     pppstats [-i interval] [-v] [interface] [system] [core] 
+ *     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
+ *   -a Do not show relative values. Show absolute values at all times.
+ *
+ *
+ * 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
@@ -26,7 +37,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$Id: pppstats.c,v 1.4 1994/06/08 00:38:49 paulus Exp $";
+static char rcsid[] = "$Id: pppstats.c,v 1.11 1995/07/11 06:41:45 paulus Exp $";
 #endif
 
 #include <ctype.h>
@@ -34,218 +45,115 @@ static char rcsid[] = "$Id: pppstats.c,v 1.4 1994/06/08 00:38:49 paulus Exp $";
 #include <nlist.h>
 #include <stdio.h>
 #include <signal.h>
+#include <fcntl.h>
 #include <sys/param.h>
-#include <sys/mbuf.h>
 #include <sys/types.h>
+#include <sys/ioctl.h>
+
+#include <net/ppp_defs.h>
+
+#ifdef __svr4__
+#include <sys/stropts.h>
+#include <net/pppio.h>         /* SVR4, Solaris 2, etc. */
+
+#else
 #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>
-
-#define        VJC     1
-#include <net/slcompress.h>
 
 #ifndef STREAMS
-#include <net/if_ppp.h>
-#endif
+#include <net/if_ppp.h>                /* BSD, Linux, NeXT, etc. */
 
-#ifdef STREAMS
+#else                          /* SunOS 4, AIX 4, OSF/1, etc. */
 #define PPP_STATS      1       /* should be defined iff it is in ppp_if.c */
 #include <sys/stream.h>
 #include <net/ppp_str.h>
 #endif
-
-#ifdef BSD4_4
-#define KVMLIB
-#endif
-
-#ifndef KVMLIB
-
-#include <machine/pte.h>
-#ifdef ultrix
-#include <machine/cpu.h>
-#endif
-
-struct pte *Sysmap;
-int    kmem;
-char   *kmemf = "/dev/kmem";
-extern off_t lseek();
-
-#else  /* KVMLIB */
-
-char   *kmemf;
-
-#ifdef sun
-#include <kvm.h>
-kvm_t  *kd;
-#define KDARG  kd,
-
-#else  /* sun */
-#define KDARG
-#endif /* sun */
-
-#endif /* KVMLIB */
-
-#ifdef STREAMS
-struct nlist nl[] = {
-#define N_SOFTC 0
-       { "_pii" },
-       "",
-};
-#else
-struct nlist nl[] = {
-#define N_SOFTC 0
-       { "_ppp_softc" },
-       "",
-};
-#endif
-
-#ifndef BSD4_4
-char   *system = "/vmunix";
-#else
-#include <paths.h>
-char   *system = _PATH_UNIX;
 #endif
 
-int    kflag;
-int    vflag;
+int    vflag, rflag, cflag, aflag;
 unsigned interval = 5;
 int    unit;
+int    s;                      /* socket file descriptor */
+int    signalled;              /* set if alarm goes off "early" */
 
 extern char *malloc();
+void catchalarm __P((int));
 
 main(argc, argv)
-       int argc;
-       char *argv[];
+    int argc;
+    char *argv[];
 {
-       --argc; ++argv;
-       while (argc > 0) {
-               if (strcmp(argv[0], "-v") == 0) {
-                       ++vflag;
-                       ++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;
-               }
-               if (kflag)
-                       usage();
-
-               system = *argv;
-               ++argv, --argc;
-               if (argc > 0) {
-                       kmemf = *argv++;
-                       --argc;
-                       kflag++;
-               }
+    --argc; ++argv;
+    while (argc > 0) {
+       if (strcmp(argv[0], "-a") == 0) {
+           ++aflag;
+           ++argv, --argc;
+           continue;
        }
-#ifndef KVMLIB
-       if (nlist(system, nl) < 0 || nl[0].n_type == 0) {
-               fprintf(stderr, "%s: no namelist\n", system);
-               exit(1);
+       if (strcmp(argv[0], "-v") == 0) {
+           ++vflag;
+           ++argv, --argc;
+           continue;
        }
-       kmem = open(kmemf, O_RDONLY);
-       if (kmem < 0) {
-               perror(kmemf);
-               exit(1);
+       if (strcmp(argv[0], "-r") == 0) {
+         ++rflag;
+         ++argv, --argc;
+         continue;
        }
-#ifndef ultrix
-       if (kflag) {
-               off_t off;
-
-               Sysmap = (struct pte *)
-                  malloc((u_int)(nl[N_SYSSIZE].n_value * sizeof(struct pte)));
-               if (!Sysmap) {
-                       fputs("netstat: can't get memory for Sysmap.\n", stderr);
-                       exit(1);
-               }
-               off = nl[N_SYSMAP].n_value & ~KERNBASE;
-               (void)lseek(kmem, off, L_SET);
-               (void)read(kmem, (char *)Sysmap,
-                   (int)(nl[N_SYSSIZE].n_value * sizeof(struct pte)));
+       if (strcmp(argv[0], "-c") == 0) {
+         ++cflag;
+         ++argv, --argc;
+         continue;
        }
-#endif
-#else
-#ifdef sun
-       /* SunOS */
-       if ((kd = kvm_open(system, kmemf, (char *)0, O_RDONLY, NULL)) == NULL) {
-           perror("kvm_open");
-           exit(1);
+       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;
        }
-#else
-       /* BSD4.3+ */
-       if (kvm_openfiles(system, kmemf, (char *)0) == -1) {
-           fprintf(stderr, "kvm_openfiles: %s", kvm_geterr());
-           exit(1);
-       }
-#endif
-
-       if (kvm_nlist(KDARG nl)) {
-           fprintf(stderr, "pppstats: can't find symbols in nlist\n");
-           exit(1);
+       if (isdigit(argv[0][0])) {
+           unit = atoi(argv[0]);
+           if (unit < 0)
+               usage();
+           ++argv, --argc;
+           continue;
        }
-#endif
-       intpr();
-       exit(0);
-}
+       usage();
+    }
 
-#ifndef KVMLIB
-/*
- * Seek into the kernel for a value.
- */
-off_t
-klseek(fd, base, off)
-       int fd, off;
-       off_t base;
-{
-       if (kflag) {
-#ifdef ultrix
-               base = K0_TO_PHYS(base);
+#ifdef __svr4__
+    if ((s = open("/dev/ppp", O_RDONLY)) < 0) {
+       perror("pppstats: Couldn't open /dev/ppp: ");
+       exit(1);
+    }
+    if (strioctl(s, PPPIO_ATTACH, &unit, sizeof(int), 0) < 0) {
+       fprintf(stderr, "pppstats: ppp%d is not available\n", unit);
+       exit(1);
+    }
 #else
-               /* get kernel pte */
-               base &= ~KERNBASE;
-                base = ctob(Sysmap[btop(base)].pg_pfnum) + (base & PGOFSET);
+    if ((s = socket(AF_INET, SOCK_DGRAM, 0)) < 0) {
+       perror("couldn't create IP socket");
+       exit(1);
+    }
 #endif
-       }
-       return (lseek(fd, base, off));
+    intpr();
+    exit(0);
 }
-#endif
 
 usage()
 {
-       fprintf(stderr,"usage: pppstats [-i interval] [-v] [unit] [system] [core]\n");
-       exit(1);
+    fprintf(stderr, "Usage: pppstats [-v] [-r] [-c] [-i interval] [unit]\n");
+    exit(1);
 }
 
-u_char signalled;                      /* set if alarm goes off "early" */
+#define V(offset) (line % 20? cur.offset - old.offset: cur.offset)
+#define W(offset) (line % 20? ccs.offset - ocs.offset: ccs.offset)
 
-#define V(offset) ((line % 20)? sc->offset - osc->offset : sc->offset)
-
-#ifdef STREAMS
-#define STRUCT struct ppp_if_info
-#define        COMP    pii_sc_comp
-#define        STATS   pii_ifnet
-#else
-#define STRUCT struct ppp_softc
-#define        COMP    sc_comp
-#define        STATS   sc_if
-#endif
+#define CRATE(comp, inc, unc)  ((unc) == 0? 0.0: \
+                                1.0 - (double)((comp) + (inc)) / (unc))
 
 /*
  * Print a running summary of interface statistics.
@@ -255,115 +163,123 @@ u_char  signalled;                      /* set if alarm goes off "early" */
  */
 intpr()
 {
-       register int line = 0;
-       int oldmask;
-#ifdef __STDC__
-       void catchalarm(int);
-#else
-       void catchalarm();
-#endif
-
-       STRUCT *sc, *osc;
-
-       nl[N_SOFTC].n_value += unit * sizeof(STRUCT);
-       sc = (STRUCT *)malloc(sizeof(STRUCT));
-       osc = (STRUCT *)malloc(sizeof(STRUCT));
-
-       bzero((char *)osc, sizeof(STRUCT));
-
-       while (1) {
-#ifndef KVMLIB
-           if (klseek(kmem, (off_t)nl[N_SOFTC].n_value, 0) == -1) {
-               perror("kmem seek");
-               exit(1);
-           }
-           if (read(kmem, (char *)sc, sizeof(STRUCT)) <= 0) {
-               perror("kmem read");
-               exit(1);
-           }
-#else
-           if (kvm_read(KDARG nl[N_SOFTC].n_value, sc,
-                        sizeof(STRUCT)) != sizeof(STRUCT)) {
-               perror("kvm_read");
-               exit(1);
-           }
-#endif
-
-           (void)signal(SIGALRM, catchalarm);
-           signalled = 0;
-           (void)alarm(interval);
+    register int line = 0;
+    sigset_t oldmask, mask;
+    struct ppp_stats cur, old;
+    struct ppp_comp_stats ccs, ocs;
+
+    memset(&old, 0, sizeof(old));
+    memset(&ocs, 0, sizeof(ocs));
+
+    while (1) {
+       get_ppp_stats(&cur);
+       if (cflag || 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');
+           } else {
 
-           if ((line % 20) == 0) {
                printf("%6.6s %6.6s %6.6s %6.6s %6.6s",
                       "in", "pack", "comp", "uncomp", "err");
                if (vflag)
                    printf(" %6.6s %6.6s", "toss", "ip");
-               printf(" | %6.6s %6.6s %6.6s %6.6s %6.6s",
+               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");
                if (vflag)
                    printf(" %6.6s %6.6s", "search", "miss");
+               if(rflag)
+                   printf("   %6.6s %6.6s", "ratio", "ubyte");
                putchar('\n');
            }
+           memset(&old, 0, sizeof(old));
+           memset(&ocs, 0, sizeof(ocs));
+       }
+       
+       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) == 0? 0.0: 1 - 1.0 / 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(d.ratio) == 0? 0.0: 1 - 1.0 / W(d.ratio) * 256.0);
+       
+           putchar('\n');
+       } else {
 
            printf("%6d %6d %6d %6d %6d",
-#ifdef BSD4_4
-                  V(STATS.if_ibytes),
-#else
-#ifndef STREAMS
-                  V(sc_bytesrcvd),
-#else
-#ifdef PPP_STATS
-                  V(pii_stats.ppp_ibytes),
-#else
-                  0,
-#endif
-#endif
-#endif
-                  V(STATS.if_ipackets),
-                  V(COMP.sls_compressedin),
-                  V(COMP.sls_uncompressedin),
-                  V(COMP.sls_errorin));
+                  V(p.ppp_ibytes),
+                  V(p.ppp_ipackets), V(vj.vjs_compressedin),
+                  V(vj.vjs_uncompressedin), V(vj.vjs_errorin));
            if (vflag)
-               printf(" %6d %6d",
-                      V(COMP.sls_tossed),
-                      V(STATS.if_ipackets) - V(COMP.sls_compressedin) -
-                       V(COMP.sls_uncompressedin) - V(COMP.sls_errorin));
-           printf(" | %6d %6d %6d %6d %6d",
-#ifdef BSD4_4
-                  V(STATS.if_obytes),
-#else
-#ifndef STREAMS
-                  V(sc_bytessent),
-#else
-#ifdef PPP_STATS
-                  V(pii_stats.ppp_obytes),
-#else
-                  0,
-#endif
-#endif
-#endif
-                  V(STATS.if_opackets),
-                  V(COMP.sls_compressed),
-                  V(COMP.sls_packets) - V(COMP.sls_compressed),
-                  V(STATS.if_opackets) - V(COMP.sls_packets));
+               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));
            if (vflag)
-               printf(" %6d %6d",
-                      V(COMP.sls_searches),
-                      V(COMP.sls_misses));
+               printf(" %6d %6d", V(vj.vjs_searches), V(vj.vjs_misses));
 
+           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');
-           fflush(stdout);
-           line++;
+       }
 
-           oldmask = sigblock(sigmask(SIGALRM));
-           if (! signalled) {
-               sigpause(0);
-           }
-           sigsetmask(oldmask);
-           signalled = 0;
-           (void)alarm(interval);
-           bcopy((char *)sc, (char *)osc, sizeof(STRUCT));
+       fflush(stdout);
+       line++;
+       if (interval == 0)
+           exit(0);
+
+       sigemptyset(&mask);
+       sigaddset(&mask, SIGALRM);
+       sigprocmask(SIG_BLOCK, &mask, &oldmask);
+       if (! signalled) {
+           sigemptyset(&mask);
+           sigsuspend(&mask);
        }
+       sigprocmask(SIG_SETMASK, &oldmask, NULL);
+       signalled = 0;
+       (void)alarm(interval);
+
+       if (aflag==0) {
+           old = cur;
+           ocs = ccs;
+       }
+    }
 }
 
 /*
@@ -371,7 +287,109 @@ intpr()
  * Sets a flag to not wait for the alarm.
  */
 void catchalarm(arg)
-int arg;
+    int arg;
+{
+    signalled = 1;
+}
+
+#ifndef __svr4__
+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
+
+    sprintf(req.ifr_name, "ppp%d", unit);
+    if (ioctl(s, SIOCGPPPSTATS, &req) < 0) {
+       if (errno == ENOTTY)
+           fprintf(stderr, "pppstats: kernel support missing\n");
+       else
+           perror("ioctl(SIOCGPPPSTATS)");
+       exit(1);
+    }
+    *curp = req.stats;
+}
+
+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
+
+    sprintf(creq.ifr_name, "ppp%d", unit);
+    if (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);
+       }
+    }
+    *csp = creq.stats;
+}
+
+#else  /* __svr4__ */
+get_ppp_stats(curp)
+    struct ppp_stats *curp;
+{
+    if (strioctl(s, PPPIO_GETSTAT, curp, 0, sizeof(*curp)) < 0) {
+       if (errno == EINVAL)
+           fprintf(stderr, "pppstats: kernel support missing\n");
+       else
+           perror("pppstats: Couldn't get statistics");
+       exit(1);
+    }
+}
+
+get_ppp_cstats(csp)
+    struct ppp_comp_stats *csp;
+{
+    if (strioctl(s, PPPIO_GETCSTAT, csp, 0, sizeof(*csp)) < 0) {
+       if (errno == ENOTTY) {
+           fprintf(stderr, "pppstats: no kernel compression support\n");
+           if (cflag)
+               exit(1);
+           rflag = 0;
+       } else {
+           perror("pppstats: Couldn't get compression statistics");
+           exit(1);
+       }
+    }
+}
+
+int
+strioctl(fd, cmd, ptr, ilen, olen)
+    int fd, cmd, ilen, olen;
+    char *ptr;
 {
-       signalled = 1;
+    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;
 }
+#endif /* __svr4__ */