]> The Tcpdump Group git mirrors - tcpdump/blobdiff - print-chdlc.c
Backout CHANGES update - wrong branch
[tcpdump] / print-chdlc.c
index 41a4d521beff38aaf156a0ca387dec3c64ff5b2c..0b0f499702371894db3900afdf74805247d74ec5 100644 (file)
@@ -20,8 +20,8 @@
  */
 
 #ifndef lint
-static const char rcsid[] =
-    "@(#) $Header: /tcpdump/master/tcpdump/print-chdlc.c,v 1.25 2002-12-18 08:53:20 guy Exp $ (LBL)";
+static const char rcsid[] _U_ =
+    "@(#) $Header: /tcpdump/master/tcpdump/print-chdlc.c,v 1.32.2.11 2005-11-29 08:57:10 hannes Exp $ (LBL)";
 #endif
 
 #ifdef HAVE_CONFIG_H
@@ -42,139 +42,130 @@ static const char rcsid[] =
 
 static void chdlc_slarp_print(const u_char *, u_int);
 
+const struct tok chdlc_cast_values[] = { 
+    { CHDLC_UNICAST, "unicast" },
+    { CHDLC_BCAST, "bcast" },
+    { 0, NULL}
+};
+
+
 /* Standard CHDLC printer */
-void
-chdlc_if_print(u_char *user _U_, const struct pcap_pkthdr *h,
-            register const u_char *p)
+u_int
+chdlc_if_print(const struct pcap_pkthdr *h, register const u_char *p)
 {
        register u_int length = h->len;
        register u_int caplen = h->caplen;
 
-       ++infodelay;
-       ts_print(&h->ts);
-
-       /*
-        * Some printers want to check that they're not walking off the
-        * end of the packet.
-        * Rather than pass it all the way down, we set this global.
-        */
-       snapend = p + caplen;
-
-       chdlc_print(p, length, caplen);
-
-       putchar('\n');
-       --infodelay;
-       if (infoprint)
-               info(0);
-}
-
-void
-chdlc_print(register const u_char *p, u_int length, u_int caplen)
-{
-       const struct ip *ip;
-       u_int proto;
-
        if (caplen < CHDLC_HDRLEN) {
                printf("[|chdlc]");
-               return;
+               return (caplen);
        }
+        return (chdlc_print(p,length));
+}
+
+u_int
+chdlc_print(register const u_char *p, u_int length) {
+       u_int proto;
 
        proto = EXTRACT_16BITS(&p[2]);
        if (eflag) {
-               switch (p[0]) {
-               case CHDLC_UNICAST:
-                       printf("unicast ");
-                       break;
-               case CHDLC_BCAST:
-                       printf("bcast ");
-                       break;
-               default:
-                       printf("0x%02x ", p[0]);
-                       break;
-               }
-               printf("%d %04x: ", length, proto);
+                printf("%s, ethertype %s (0x%04x), length %u: ",
+                       tok2str(chdlc_cast_values, "0x%02x", p[0]),
+                       tok2str(ethertype_values, "Unknown", proto),
+                       proto,
+                       length);
        }
 
        length -= CHDLC_HDRLEN;
-       ip = (const struct ip *)(p + CHDLC_HDRLEN);
+       p += CHDLC_HDRLEN;
+
        switch (proto) {
        case ETHERTYPE_IP:
-               ip_print((const u_char *)ip, length);
+               ip_print(gndo, p, length);
                break;
 #ifdef INET6
        case ETHERTYPE_IPV6:
-               ip6_print((const u_char *)ip, length);
+               ip6_print(p, length);
                break;
 #endif
        case CHDLC_TYPE_SLARP:
-               chdlc_slarp_print((const u_char *)ip, length);
+               chdlc_slarp_print(p, length);
                break;
 #if 0
        case CHDLC_TYPE_CDP:
-               chdlc_cdp_print((const u_char *)ip, length);
+               chdlc_cdp_print(p, length);
                break;
 #endif
         case ETHERTYPE_MPLS:
         case ETHERTYPE_MPLS_MULTI:
-                mpls_print((const u_char *)(ip), length);
+                mpls_print(p, length);
                break;
         case ETHERTYPE_ISO:
                 /* is the fudge byte set ? lets verify by spotting ISO headers */
-                if (*(p+CHDLC_HDRLEN+1) == 0x81 ||
-                    *(p+CHDLC_HDRLEN+1) == 0x82 ||
-                    *(p+CHDLC_HDRLEN+1) == 0x83)
-                    isoclns_print(p+CHDLC_HDRLEN+1, length-1, length-1, NULL, NULL);
+                if (*(p+1) == 0x81 ||
+                    *(p+1) == 0x82 ||
+                    *(p+1) == 0x83)
+                    isoclns_print(p+1, length-1, length-1);
                 else
-                    isoclns_print(p+CHDLC_HDRLEN, length, length, NULL, NULL);
+                    isoclns_print(p, length, length);
                 break;
        default:
-                printf("unknown CHDLC protocol (0x%04x)", proto);
+                if (!eflag)
+                        printf("unknown CHDLC protocol (0x%04x)", proto);
                 break;
        }
-       if (xflag)
-               default_print((const u_char *)ip, caplen - CHDLC_HDRLEN);
+
+       return (CHDLC_HDRLEN);
 }
 
+/*
+ * The fixed-length portion of a SLARP packet.
+ */
 struct cisco_slarp {
-       u_int32_t code;
+       u_int8_t code[4];
 #define SLARP_REQUEST  0
 #define SLARP_REPLY    1
 #define SLARP_KEEPALIVE        2
        union {
                struct {
-                       struct in_addr addr;
-                       struct in_addr mask;
-                       u_int16_t unused[3];
+                       u_int8_t addr[4];
+                       u_int8_t mask[4];
                } addr;
                struct {
-                       u_int32_t myseq;
-                       u_int32_t yourseq;
-                       u_int16_t rel;
-                       u_int16_t t1;
-                       u_int16_t t2;
+                       u_int8_t myseq[4];
+                       u_int8_t yourseq[4];
+                       u_int8_t rel[2];
                } keep;
        } un;
 };
 
-#define SLARP_LEN      18
+#define SLARP_MIN_LEN  14
+#define SLARP_MAX_LEN  18
 
 static void
 chdlc_slarp_print(const u_char *cp, u_int length)
 {
        const struct cisco_slarp *slarp;
+        u_int sec,min,hrs,days;
 
-       if (length < SLARP_LEN) {
-               printf("[|slarp]");
-               return;
-       }
+        printf("SLARP (length: %u), ",length);
+       if (length < SLARP_MIN_LEN)
+               goto trunc;
 
        slarp = (const struct cisco_slarp *)cp;
-        printf("SLARP (length: %u), ",length);
+       TCHECK2(*slarp, SLARP_MIN_LEN);
        switch (EXTRACT_32BITS(&slarp->code)) {
        case SLARP_REQUEST:
                printf("request");
-                /* ok we do not know it - but lets at least dump it */
-                print_unknown_data(cp+4,"\n\t",length-4);
+               /*
+                * At least according to William "Chops" Westfield's
+                * message in
+                *
+                *      http://www.nethelp.no/net/cisco-hdlc.txt
+                *
+                * the address and mask aren't used in requests -
+                * they're just zero.
+                */
                break;
        case SLARP_REPLY:
                printf("reply %s/%s",
@@ -182,13 +173,21 @@ chdlc_slarp_print(const u_char *cp, u_int length)
                        ipaddr_string(&slarp->un.addr.mask));
                break;
        case SLARP_KEEPALIVE:
-               printf("keepalive: mineseen=0x%08x, yourseen=0x%08x",
-                       EXTRACT_32BITS(&slarp->un.keep.myseq),
-                       EXTRACT_32BITS(&slarp->un.keep.yourseq));
-               printf(", reliability=0x%04x, t1=%d.%d",
-                       EXTRACT_16BITS(&slarp->un.keep.rel),
-                       EXTRACT_16BITS(&slarp->un.keep.t1),
-                       EXTRACT_16BITS(&slarp->un.keep.t2));
+               printf("keepalive: mineseen=0x%08x, yourseen=0x%08x, reliability=0x%04x",
+                       EXTRACT_32BITS(&slarp->un.keep.myseq),
+                       EXTRACT_32BITS(&slarp->un.keep.yourseq),
+                       EXTRACT_16BITS(&slarp->un.keep.rel));
+
+                if (length >= SLARP_MAX_LEN) { /* uptime-stamp is optional */
+                        cp += SLARP_MIN_LEN;
+                        if (!TTEST2(*cp, 4))
+                                goto trunc;
+                        sec = EXTRACT_32BITS(cp) / 1000;
+                        min = sec / 60; sec -= min * 60;
+                        hrs = min / 60; min -= hrs * 60;
+                        days = hrs / 24; hrs -= days * 24;
+                        printf(", link uptime=%ud%uh%um%us",days,hrs,min,sec);
+                }
                break;
        default:
                printf("0x%02x unknown", EXTRACT_32BITS(&slarp->code));
@@ -197,8 +196,20 @@ chdlc_slarp_print(const u_char *cp, u_int length)
                break;
        }
 
-       if (SLARP_LEN < length && vflag)
-               printf(", (trailing junk: %d bytes)", length - SLARP_LEN);
+       if (SLARP_MAX_LEN < length && vflag)
+               printf(", (trailing junk: %d bytes)", length - SLARP_MAX_LEN);
         if (vflag > 1)
             print_unknown_data(cp+4,"\n\t",length-4);
+       return;
+
+trunc:
+       printf("[|slarp]");
 }
+
+
+/*
+ * Local Variables:
+ * c-style: whitesmith
+ * c-basic-offset: 8
+ * End:
+ */