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

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

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

description:
Pull up revision 1.5 (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-atalk.c |  19 ++-----------------
 1 files changed, 2 insertions(+), 17 deletions(-)

diffs (40 lines):

diff -r 5c3f7345d62f -r 5fcc75a59de9 dist/tcpdump/print-atalk.c
--- a/dist/tcpdump/print-atalk.c        Sat Dec 07 22:33:15 2002 +0000
+++ b/dist/tcpdump/print-atalk.c        Sat Dec 07 22:46:07 2002 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: print-atalk.c,v 1.3 2002/02/18 09:37:05 itojun Exp $   */
+/*     $NetBSD: print-atalk.c,v 1.3.2.1 2002/12/07 22:46:07 he Exp $   */
 
 /*
  * Copyright (c) 1988, 1989, 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997
@@ -29,7 +29,7 @@
 static const char rcsid[] =
     "@(#) Header: /tcpdump/master/tcpdump/print-atalk.c,v 1.70 2001/11/15 08:23:12 itojun Exp (LBL)";
 #else
-__RCSID("$NetBSD: print-atalk.c,v 1.3 2002/02/18 09:37:05 itojun Exp $");
+__RCSID("$NetBSD: print-atalk.c,v 1.3.2.1 2002/12/07 22:46:07 he Exp $");
 #endif
 #endif
 
@@ -193,21 +193,6 @@
               ddpskt_string(dp->dstSkt));
        bp += ddpSize;
        length -= ddpSize;
-#ifdef LBL_ALIGN
-       if ((long)bp & 3) {
-               static u_char *abuf = NULL;
-
-               if (abuf == NULL) {
-                       abuf = (u_char *)malloc(snaplen);
-                       if (abuf == NULL)
-                               error("atalk_print: malloc");
-               }
-               memcpy((char *)abuf, (char *)bp, min(length, snaplen));
-               snapend += abuf - (u_char *)bp;
-               packetp = abuf;
-               bp = abuf;
-       }
-#endif
        ddp_print(bp, length, dp->type, snet, dp->srcNode, dp->srcSkt);
 }