added papcrypt option
[ppp.git] / pppstats / pppstats.c
index 97239de90db642369352582f0ef56ab5ac608c17..e80b568f3dd2b37bb25820f49b31b01c0031d0fc 100644 (file)
@@ -1,6 +1,6 @@
 /*
  * print PPP statistics:
- *     pppstats [-i interval] [-v] [interface] [system] [core] 
+ *     pppstats [-i interval] [-v] [interface]
  *
  *     Brad Parker (brad@cayman.com) 6/92
  *
  */
 
 #ifndef lint
-static char rcsid[] = "$Id: pppstats.c,v 1.2 1993/12/15 05:00:47 paulus Exp $";
+static char rcsid[] = "$Id: pppstats.c,v 1.6 1994/09/21 01:52:58 paulus Exp $";
 #endif
 
-#include <sys/param.h>
-#include <sys/mbuf.h>
-#include <sys/types.h>
-#include <sys/socket.h>
-#include <sys/file.h>
-#ifdef sun
-#include <kvm.h>
-#endif
 #include <ctype.h>
 #include <errno.h>
 #include <nlist.h>
 #include <stdio.h>
 #include <signal.h>
-#ifndef sun
-#include <paths.h>
-#endif
-
+#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>
 
-#define        VJC     1
-#include <net/slcompress.h>
+#include <net/ppp_defs.h>
+
+#ifndef STREAMS
 #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
 
-#ifdef STREAMS
-struct nlist nl[] = {
-#define N_SOFTC 0
-       { "_pii" },
-       "",
-};
-#else
-struct nlist nl[] = {
-#define N_SOFTC 0
-       { "_ppp_softc" },
-       "",
-};
-#endif
-
-#ifdef sun
-kvm_t  *kd;
-#endif
-
-#ifdef sun
-char   *system = "/vmunix";
-#else
-char   *system = _PATH_UNIX;
-#endif
-
-char   *kmemf;
-int    kflag;
 int    vflag;
 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], "-v") == 0) {
+           ++vflag;
+           ++argv, --argc;
+           continue;
        }
-#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);
+       if (isdigit(argv[0][0])) {
+           unit = atoi(argv[0]);
+           if (unit < 0)
+               usage();
+           ++argv, --argc;
+           continue;
        }
-#endif
-
-#ifdef sun
-       if (kvm_nlist(kd, nl)) {
-#else
-       if (kvm_nlist(nl)) {
-#endif
-         fprintf(stderr, "pppstats: can't find symbols in nlist\n");
-         exit(1);
-       }
-       intpr();
-       exit(0);
+       usage();
+    }
+    if ((s = socket(AF_INET, SOCK_DGRAM, 0)) < 0) {
+       perror("couldn't create IP socket");
+       exit(1);
+    }
+    intpr();
+    exit(0);
 }
 
 usage()
 {
-       fprintf(stderr,"usage: pppstats [-i interval] [-v] [unit] [system] [core]\n");
-       exit(1);
+    fprintf(stderr, "Usage: pppstats [-v] [-i interval] [unit]\n");
+    exit(1);
 }
 
-u_char signalled;                      /* set if alarm goes off "early" */
-
-#define V(offset) ((line % 20)? sc->offset - osc->offset : sc->offset)
+#define V(offset) (line % 20? req.stats.offset - osc.offset: req.stats.offset)
 
 /*
  * Print a running summary of interface statistics.
@@ -175,106 +120,65 @@ 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
-
-#ifdef STREAMS
-#define STRUCT struct ppp_if_info
-#else
-#define STRUCT struct ppp_softc
-#endif
-
-       STRUCT *sc, *osc;
-
-       nl[N_SOFTC].n_value += unit * sizeof(struct ppp_softc);
-       sc = (STRUCT *)malloc(sizeof(STRUCT));
-       osc = (STRUCT *)malloc(sizeof(STRUCT));
-
-       bzero((char *)osc, sizeof(STRUCT));
-
-       while (1) {
-#ifdef sun
-               if (kvm_read(kd, nl[N_SOFTC].n_value,
-#else
-               if (kvm_read(nl[N_SOFTC].n_value,
-#endif
-                            sc, sizeof(STRUCT)) !=
-                   sizeof(STRUCT))
-                 perror("kvm_read");
-
-               (void)signal(SIGALRM, catchalarm);
-               signalled = 0;
-               (void)alarm(interval);
-
-               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",
-                               "out", "pack", "comp", "uncomp", "ip");
-                       if (vflag)
-                               printf(" %6.6s %6.6s", "search", "miss");
-                       putchar('\n');
-               }
-
-#ifdef STREAMS
-#define        COMP    pii_sc_comp
-#define        STATS   pii_ifnet
-#else
-#define        COMP    sc_comp
-#define        STATS   sc_if
-#endif
-
-               printf("%6d %6d %6d %6d %6d",
-#if BSD > 43
-                       V(STATS.if_ibytes),
-#else
-                       0,
-#endif
-                       V(STATS.if_ipackets),
-                       V(COMP.sls_compressedin),
-                       V(COMP.sls_uncompressedin),
-                       V(COMP.sls_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",
-#if BSD > 43
-                       V(STATS.if_obytes),
-#else
-                       0,
-#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));
-               if (vflag)
-                       printf(" %6d %6d",
-                               V(COMP.sls_searches),
-                               V(COMP.sls_misses));
+    register int line = 0;
+    int oldmask;
+    struct ifpppstatsreq req;
+    struct ppp_stats osc;
+
+    bzero(&osc, sizeof(osc));
+
+    sprintf(req.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);
+       }
+       (void)signal(SIGALRM, catchalarm);
+       signalled = 0;
+       (void)alarm(interval);
+
+       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",
+                  "out", "pack", "comp", "uncomp", "ip");
+           if (vflag)
+               printf(" %6.6s %6.6s", "search", "miss");
+           putchar('\n');
+       }
 
-               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));
+       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 (vflag)
+           printf(" %6d %6d", V(vj.vjs_tossed),
+                  V(p.ppp_ipackets) - V(vj.vjs_compressedin) -
+                    V(vj.vjs_uncompressedin) - V(vj.vjs_errorin));
+       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(vj.vjs_searches), V(vj.vjs_misses));
+
+       putchar('\n');
+       fflush(stdout);
+       line++;
+
+       oldmask = sigblock(sigmask(SIGALRM));
+       if (! signalled) {
+           sigpause(0);
        }
+       sigsetmask(oldmask);
+       signalled = 0;
+       (void)alarm(interval);
+       osc = req.stats;
+    }
 }
 
 /*
@@ -282,7 +186,7 @@ intpr()
  * Sets a flag to not wait for the alarm.
  */
 void catchalarm(arg)
-int arg;
+    int arg;
 {
-       signalled = 1;
+    signalled = 1;
 }