More UNALIGNED_MEM{CPY,CMP} on IP addresses.

[tcpdump] / print-frag6.c

diff --git a/print-frag6.c b/print-frag6.c
index c3cbe2f5f51fe0399f521bf47c7f531d46577853..124124bec30808886e397142c0ee55b90cc1fd56 100644 (file)
--- a/print-frag6.c
+++ b/print-frag6.c
@@ -19,11 +19,6 @@
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  */
 
-#ifndef lint
-static const char rcsid[] =
-    "@(#) $Header: /tcpdump/master/tcpdump/print-frag6.c,v 1.15 2002-12-11 07:14:00 guy Exp $";
-#endif
-
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
@@ -45,33 +40,29 @@ frag6_print(register const u_char *bp, register const u_char *bp2)
 {
        register const struct ip6_frag *dp;
        register const struct ip6_hdr *ip6;
-       register const u_char *ep;
 
        dp = (const struct ip6_frag *)bp;
        ip6 = (const struct ip6_hdr *)bp2;
 
-       /* 'ep' points to the end of available data. */
-       ep = snapend;
-
        TCHECK(dp->ip6f_offlg);
 
        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)",
-                      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 */
-       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
        {
@@ -80,7 +71,7 @@ frag6_print(register const u_char *bp, register const u_char *bp2)
        }
 trunc:
        fputs("[|frag]", stdout);
-       return 65535;
+       return -1;
 #undef TCHECK
 }
 #endif /* INET6 */