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 7b4f31530a72976f3eda73de2329b778c17b55c8..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.10 2000-09-29 04:58:39 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


@@ -30,20 +30,15 @@ static const char rcsid[] =
 
 #ifdef INET6
 
 
 #ifdef INET6
 

-#include <sys/param.h>
-#include <sys/time.h>
-#include <sys/types.h>
-#include <sys/socket.h>
-
-
-#include <netinet/in.h>
+#include <tcpdump-stdinc.h>

 
 #include <stdio.h>
 
 
 #include <stdio.h>
 

-#include <netinet/ip6.h>
+#include "ip6.h"

 
 #include "interface.h"
 #include "addrtoname.h"
 
 #include "interface.h"
 #include "addrtoname.h"

+#include "extract.h"

 
 int
 frag6_print(register const u_char *bp, register const u_char *bp2)
 
 int
 frag6_print(register const u_char *bp, register const u_char *bp2)


@@ -52,35 +47,31 @@ frag6_print(register const u_char *bp, register const u_char *bp2)
        register const struct ip6_hdr *ip6;
        register const u_char *ep;
 
        register const struct ip6_hdr *ip6;
        register const u_char *ep;
 

-#if 0
-#define TCHECK(var) if ((u_char *)&(var) >= ep - sizeof(var)) goto trunc
-#endif
-
-       dp = (struct ip6_frag *)bp;
-       ip6 = (struct ip6_hdr *)bp2;
+       dp = (const struct ip6_frag *)bp;
+       ip6 = (const struct ip6_hdr *)bp2;

 
 

-       /* 'ep' points to the end of avaible data. */
+       /* 'ep' points to the end of available data. */

        ep = snapend;
 
        TCHECK(dp->ip6f_offlg);
 
        if (vflag) {
                printf("frag (0x%08x:%d|%ld)",
        ep = snapend;
 
        TCHECK(dp->ip6f_offlg);
 
        if (vflag) {
                printf("frag (0x%08x:%d|%ld)",

-                      (u_int32_t)ntohl(dp->ip6f_ident),
-                      ntohs(dp->ip6f_offlg & IP6F_OFF_MASK),
-                      sizeof(struct ip6_hdr) + ntohs(ip6->ip6_plen) -
+                      EXTRACT_32BITS(&dp->ip6f_ident),
+                      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)",
                               (long)(bp - bp2) - sizeof(struct ip6_frag));
        } else {
                printf("frag (%d|%ld)",

-                      ntohs(dp->ip6f_offlg & IP6F_OFF_MASK),
-                      sizeof(struct ip6_hdr) + ntohs(ip6->ip6_plen) -
+                      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 */
                               (long)(bp - bp2) - sizeof(struct ip6_frag));
        }
 
 #if 1
        /* it is meaningless to decode non-first fragment */

-       if (ntohs(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
        {


@@ -89,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 */