clean up the L3 offset calculation for C-HDLC

diff --git a/print-chdlc.c b/print-chdlc.c
index 8de7374828cadb70f6218415f1a005d32aca6e2b..238e91a98ce107836c90d2d056245d7c830501ad 100644 (file)
--- a/print-chdlc.c
+++ b/print-chdlc.c
@@ -21,7 +21,7 @@
 
 #ifndef lint
 static const char rcsid[] _U_ =
 
 #ifndef lint
 static const char rcsid[] _U_ =

-    "@(#) $Header: /tcpdump/master/tcpdump/print-chdlc.c,v 1.42 2005-11-24 07:42:53 hannes Exp $ (LBL)";
+    "@(#) $Header: /tcpdump/master/tcpdump/print-chdlc.c,v 1.43 2005-11-29 08:56:19 hannes Exp $ (LBL)";

 #endif
 
 #ifdef HAVE_CONFIG_H
 #endif
 
 #ifdef HAVE_CONFIG_H


@@ -66,7 +66,6 @@ chdlc_if_print(const struct pcap_pkthdr *h, register const u_char *p)
 u_int
 chdlc_print(register const u_char *p, u_int length) {
        u_int proto;
 u_int
 chdlc_print(register const u_char *p, u_int length) {
        u_int proto;

-       const struct ip *ip;

 
        proto = EXTRACT_16BITS(&p[2]);
        if (eflag) {
 
        proto = EXTRACT_16BITS(&p[2]);
        if (eflag) {


@@ -78,36 +77,37 @@ chdlc_print(register const u_char *p, u_int length) {
        }
 
        length -= CHDLC_HDRLEN;
        }
 
        length -= CHDLC_HDRLEN;

-       ip = (const struct ip *)(p + CHDLC_HDRLEN);
+       p += CHDLC_HDRLEN;
+

        switch (proto) {
        case ETHERTYPE_IP:
        switch (proto) {
        case ETHERTYPE_IP:

-               ip_print(gndo, (const u_char *)ip, length);
+               ip_print(gndo, p, length);

                break;
 #ifdef INET6
        case ETHERTYPE_IPV6:
                break;
 #ifdef INET6
        case ETHERTYPE_IPV6:

-               ip6_print((const u_char *)ip, length);
+               ip6_print(p, length);

                break;
 #endif
        case CHDLC_TYPE_SLARP:
                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:
                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:
                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 */
                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
                 else

-                    isoclns_print(p+CHDLC_HDRLEN, length, length);
+                    isoclns_print(p, length, length);

                 break;
        default:
                 if (!eflag)
                 break;
        default:
                 if (!eflag)