Use "len", not "payload_len", as we step through the packet; use

[tcpdump] / print-frag6.c

diff --git a/print-frag6.c b/print-frag6.c
index c3cbe2f5f51fe0399f521bf47c7f531d46577853..11e884b7a2d0f79bd85d28f9188834a5f5746cb8 100644 (file)
--- a/print-frag6.c
+++ b/print-frag6.c
@@ -20,8 +20,8 @@
  */
 
 #ifndef lint
  */
 
 #ifndef lint

-static const char rcsid[] =
-    "@(#) $Header: /tcpdump/master/tcpdump/print-frag6.c,v 1.15 2002-12-11 07:14:00 guy Exp $";
+static const char rcsid[] _U_ =
+    "@(#) $Header: /tcpdump/master/tcpdump/print-frag6.c,v 1.19 2003-11-19 00:36:07 guy Exp $";

 #endif
 
 #ifdef HAVE_CONFIG_H
 #endif
 
 #ifdef HAVE_CONFIG_H


@@ -58,20 +58,20 @@ frag6_print(register const u_char *bp, register const u_char *bp2)
        if (vflag) {
                printf("frag (0x%08x:%d|%ld)",
                       EXTRACT_32BITS(&dp->ip6f_ident),
        if (vflag) {
                printf("frag (0x%08x:%d|%ld)",
                       EXTRACT_32BITS(&dp->ip6f_ident),

-                      EXTRACT_16BITS(&dp->ip6f_offlg & IP6F_OFF_MASK),
+                      EXTRACT_16BITS(&dp->ip6f_offlg) & IP6F_OFF_MASK,

                       sizeof(struct ip6_hdr) + EXTRACT_16BITS(&ip6->ip6_plen) -
                               (long)(bp - bp2) - sizeof(struct ip6_frag));
        } else {
                printf("frag (%d|%ld)",
                       sizeof(struct ip6_hdr) + EXTRACT_16BITS(&ip6->ip6_plen) -
                               (long)(bp - bp2) - sizeof(struct ip6_frag));
        } else {
                printf("frag (%d|%ld)",

-                      EXTRACT_16BITS(&dp->ip6f_offlg & IP6F_OFF_MASK),
+                      EXTRACT_16BITS(&dp->ip6f_offlg) & IP6F_OFF_MASK,

                       sizeof(struct ip6_hdr) + EXTRACT_16BITS(&ip6->ip6_plen) -
                               (long)(bp - bp2) - sizeof(struct ip6_frag));
        }
 
 #if 1
        /* it is meaningless to decode non-first fragment */
                       sizeof(struct ip6_hdr) + EXTRACT_16BITS(&ip6->ip6_plen) -
                               (long)(bp - bp2) - sizeof(struct ip6_frag));
        }
 
 #if 1
        /* it is meaningless to decode non-first fragment */

-       if (EXTRACT_16BITS(&dp->ip6f_offlg & IP6F_OFF_MASK) != 0)
-               return 65535;
+       if ((EXTRACT_16BITS(&dp->ip6f_offlg) & IP6F_OFF_MASK) != 0)
+               return -1;

        else
 #endif
        {
        else
 #endif
        {


@@ -80,7 +80,7 @@ frag6_print(register const u_char *bp, register const u_char *bp2)
        }
 trunc:
        fputs("[|frag]", stdout);
        }
 trunc:
        fputs("[|frag]", stdout);

-       return 65535;
+       return -1;

 #undef TCHECK
 }
 #endif /* INET6 */
 #undef TCHECK
 }
 #endif /* INET6 */