Check for vendor code before trying to interpret RADIUS attributes.

[ppp.git] / pppdump / pppdump.c

diff --git a/pppdump/pppdump.c b/pppdump/pppdump.c
index d7a39f78a7bf78ffab178394709b3459ad3c4a9e..a8e69d4bf731f9b8a1abb2d30feb00c859ed0267 100644 (file)
--- a/pppdump/pppdump.c
+++ b/pppdump/pppdump.c
@@ -4,13 +4,18 @@
  *
  * Copyright (C) 1999  Paul Mackerras.  All rights reserved.
  *
- *  This program is free software; you can redistribute it and/or
- *  modify it under the terms of the GNU General Public License
- *  as published by the Free Software Foundation; either version
- *  2 of the License, or (at your option) any later version.
+ * 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.  The name of the author
+ * 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.
  */
 #include <stdio.h>
 #include <unistd.h>
+#include <time.h>
 #include <sys/types.h>
 #include "ppp_defs.h"
 #include "ppp-comp.h"
@@ -20,8 +25,13 @@ int pppmode;
 int reverse;
 int decompress;
 int mru = 1500;
+int abs_times;
+time_t start_time;
+int start_time_tenths;
+int tot_sent, tot_rcvd;
 
 extern int optind;
+extern char *optarg;
 
 main(ac, av)
     int ac;
@@ -31,7 +41,7 @@ main(ac, av)
     char *p;
     FILE *f;
 
-    while ((i = getopt(ac, av, "hprdm:")) != -1) {
+    while ((i = getopt(ac, av, "hprdm:a")) != -1) {
        switch (i) {
        case 'h':
            hexmode = 1;
@@ -48,8 +58,11 @@ main(ac, av)
        case 'm':
            mru = atoi(optarg);
            break;
+       case 'a':
+           abs_times = 1;
+           break;
        default:
-           fprintf(stderr, "Usage: %s [-h | -p[d]] [-r] [-m mru] [file ...]\n", av[0]);
+           fprintf(stderr, "Usage: %s [-h | -p[d]] [-r] [-m mru] [-a] [file ...]\n", av[0]);
            exit(1);
        }
     }
@@ -72,14 +85,12 @@ main(ac, av)
     exit(0);
 }
 
-
 dumplog(f)
     FILE *f;
 {
     int c, n, k, col;
     int nb, c2;
     unsigned char buf[16];
-    time_t t;
 
     while ((c = getc(f)) != EOF) {
        switch (c) {
@@ -91,6 +102,7 @@ dumplog(f)
            col = 6;
            n = getc(f);
            n = (n << 8) + getc(f);
+           *(c==1? &tot_sent: &tot_rcvd) += n;
            nb = 0;
            for (; n > 0; --n) {
                c = getc(f);
@@ -147,19 +159,8 @@ dumplog(f)
            break;
        case 5:
        case 6:
-           n = getc(f);
-           if (c == 5) {
-               for (c = 3; c > 0; --c)
-                   n = (n << 8) + getc(f);
-           }
-           printf("time %.1fs\n", (double) n / 10);
-           break;
        case 7:
-           t = getc(f);
-           t = (t << 8) + getc(f);
-           t = (t << 8) + getc(f);
-           t = (t << 8) + getc(f);
-           printf("start %s", ctime(&t));
+           show_time(f, c);
            break;
        default:
            printf("?%.2x\n");
@@ -233,7 +234,6 @@ dumpppp(f)
     unsigned char *d;
     unsigned short fcs;
     struct pkt *pkt;
-    time_t t;
 
     spkt.cnt = rpkt.cnt = 0;
     spkt.esc = rpkt.esc = 0;
@@ -247,6 +247,7 @@ dumpppp(f)
            pkt = c==1? &spkt: &rpkt;
            n = getc(f);
            n = (n << 8) + getc(f);
+           *(c==1? &tot_sent: &tot_rcvd) += n;
            for (; n > 0; --n) {
                c = getc(f);
                switch (c) {
@@ -387,19 +388,8 @@ dumpppp(f)
            break;
        case 5:
        case 6:
-           n = getc(f);
-           if (c == 5) {
-               for (c = 3; c > 0; --c)
-                   n = (n << 8) + getc(f);
-           }
-           printf("time %.1fs\n", (double) n / 10);
-           break;
        case 7:
-           t = getc(f);
-           t = (t << 8) + getc(f);
-           t = (t << 8) + getc(f);
-           t = (t << 8) + getc(f);
-           printf("start %s", ctime(&t));
+           show_time(f, c);
            break;
        default:
            printf("?%.2x\n");
@@ -474,3 +464,39 @@ handle_ccp(cp, dp, len)
        break;
     }
 }
+
+show_time(f, c)
+    FILE *f;
+    int c;
+{
+    time_t t;
+    int n;
+    struct tm *tm;
+
+    if (c == 7) {
+       t = getc(f);
+       t = (t << 8) + getc(f);
+       t = (t << 8) + getc(f);
+       t = (t << 8) + getc(f);
+       printf("start %s", ctime(&t));
+       start_time = t;
+       start_time_tenths = 0;
+       tot_sent = tot_rcvd = 0;
+    } else {
+       n = getc(f);
+       if (c == 5) {
+           for (c = 3; c > 0; --c)
+               n = (n << 8) + getc(f);
+       }
+       if (abs_times) {
+           n += start_time_tenths;
+           start_time += n / 10;
+           start_time_tenths = n % 10;
+           tm = localtime(&start_time);
+           printf("time  %.2d:%.2d:%.2d.%d", tm->tm_hour, tm->tm_min,
+                  tm->tm_sec, start_time_tenths);
+           printf("  (sent %d, rcvd %d)\n", tot_sent, tot_rcvd);
+       } else
+           printf("time  %.1fs\n", (double) n / 10);
+    }
+}