Backout CHANGES update - wrong branch

[tcpdump] / print-chdlc.c

diff --git a/print-chdlc.c b/print-chdlc.c
index 8d272620dfc5bcf0179edf16a5ca8bd3be8a4d35..0b0f499702371894db3900afdf74805247d74ec5 100644 (file)
--- a/print-chdlc.c
+++ b/print-chdlc.c
@@ -21,7 +21,7 @@
 
 #ifndef lint
 static const char rcsid[] _U_ =
-    "@(#) $Header: /tcpdump/master/tcpdump/print-chdlc.c,v 1.32.2.4 2005-04-19 08:07:03 guy Exp $ (LBL)";
+    "@(#) $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,70 +42,76 @@ static const char rcsid[] _U_ =
 
 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 */
 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;
-       const struct ip *ip;
-       u_int proto;
 
        if (caplen < CHDLC_HDRLEN) {
                printf("[|chdlc]");
                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(gndo, (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);
+                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);
+                    isoclns_print(p, length, length);
                 break;
        default:
-                printf("unknown CHDLC protocol (0x%04x)", proto);
+                if (!eflag)
+                        printf("unknown CHDLC protocol (0x%04x)", proto);
                 break;
        }
 
@@ -133,7 +139,8 @@ struct cisco_slarp {
        } un;
 };
 
-#define SLARP_LEN      14
+#define SLARP_MIN_LEN  14
+#define SLARP_MAX_LEN  18
 
 static void
 chdlc_slarp_print(const u_char *cp, u_int length)
@@ -142,11 +149,11 @@ chdlc_slarp_print(const u_char *cp, u_int length)
         u_int sec,min,hrs,days;
 
         printf("SLARP (length: %u), ",length);
-       if (length < SLARP_LEN)
+       if (length < SLARP_MIN_LEN)
                goto trunc;
 
        slarp = (const struct cisco_slarp *)cp;
-       TCHECK2(*slarp, SLARP_LEN);
+       TCHECK2(*slarp, SLARP_MIN_LEN);
        switch (EXTRACT_32BITS(&slarp->code)) {
        case SLARP_REQUEST:
                printf("request");
@@ -171,8 +178,8 @@ chdlc_slarp_print(const u_char *cp, u_int length)
                        EXTRACT_32BITS(&slarp->un.keep.yourseq),
                        EXTRACT_16BITS(&slarp->un.keep.rel));
 
-                if (length >= SLARP_LEN) { /* uptime-stamp is optional */
-                        cp += SLARP_LEN;
+                if (length >= SLARP_MAX_LEN) { /* uptime-stamp is optional */
+                        cp += SLARP_MIN_LEN;
                         if (!TTEST2(*cp, 4))
                                 goto trunc;
                         sec = EXTRACT_32BITS(cp) / 1000;
@@ -189,8 +196,8 @@ 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;