[src/netbsd-1-6]: src/dist/tcpdump Pull up revision 1.4 (requested by itojun ...

[he <he%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/53ff3d716abe
branches:  netbsd-1-6
changeset: 529704:53ff3d716abe
user:      he <he%NetBSD.org@localhost>
date:      Sat Dec 07 22:46:48 2002 +0000

description:
Pull up revision 1.4 (requested by itojun in ticket #933):
  Correct LBL_ALIGN behaviour, sync with tcpdump.org.
  Enable LBL_ALIGN codepath to use byte-by-byte fetch
  in extract.h.  Fixes PR#18688 and PR#18398.

diffstat:

 dist/tcpdump/print-ip6.c |  23 ++---------------------
 1 files changed, 2 insertions(+), 21 deletions(-)

diffs (44 lines):

diff -r 9d98fe166bbc -r 53ff3d716abe dist/tcpdump/print-ip6.c
--- a/dist/tcpdump/print-ip6.c  Sat Dec 07 22:46:26 2002 +0000
+++ b/dist/tcpdump/print-ip6.c  Sat Dec 07 22:46:48 2002 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: print-ip6.c,v 1.3 2002/02/18 09:37:07 itojun Exp $     */
+/*     $NetBSD: print-ip6.c,v 1.3.2.1 2002/12/07 22:46:48 he Exp $     */
 
 /*
  * Copyright (c) 1988, 1989, 1990, 1991, 1992, 1993, 1994
@@ -27,7 +27,7 @@
 static const char rcsid[] =
     "@(#) Header: /tcpdump/master/tcpdump/print-ip6.c,v 1.21 2001/11/16 02:17:36 itojun Exp";
 #else
-__RCSID("$NetBSD: print-ip6.c,v 1.3 2002/02/18 09:37:07 itojun Exp $");
+__RCSID("$NetBSD: print-ip6.c,v 1.3.2.1 2002/12/07 22:46:48 he Exp $");
 #endif
 #endif
 
@@ -70,25 +70,6 @@
        
        ip6 = (const struct ip6_hdr *)bp;
 
-#ifdef LBL_ALIGN
-       /*
-        * The IP6 header is not 16-byte aligned, so copy into abuf.
-        */
-       if ((u_long)ip6 & 15) {
-               static u_char *abuf;
-
-               if (abuf == NULL) {
-                       abuf = malloc(snaplen);
-                       if (abuf == NULL)
-                               error("ip6_print: malloc");
-               }
-               memcpy(abuf, ip6, min(length, snaplen));
-               snapend += abuf - (u_char *)ip6;
-               packetp = abuf;
-               ip6 = (struct ip6_hdr *)abuf;
-               bp = abuf;
-       }
-#endif
        TCHECK(*ip6);
        if (length < sizeof (struct ip6_hdr)) {
                (void)printf("truncated-ip6 %d", length);