Get rid of unneeded includes of <netinet/in_systm.h> and <netinet/ip.h>.

[tcpdump] / print-ip6.c

diff --git a/print-ip6.c b/print-ip6.c
index 68d7d6e21c991328273900cc020771dfc85f50cd..d1593995e3597785296018e988638dd3a6333725 100644 (file)
--- a/print-ip6.c
+++ b/print-ip6.c
@@ -21,7 +21,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-    "@(#) $Header: /tcpdump/master/tcpdump/print-ip6.c,v 1.18 2001-09-17 21:58:03 fenner Exp $";
+    "@(#) $Header: /tcpdump/master/tcpdump/print-ip6.c,v 1.21 2001-11-16 02:17:36 itojun Exp $";
 #endif
 
 #ifdef HAVE_CONFIG_H
@@ -66,18 +66,20 @@ ip6_print(register const u_char *bp, register u_int length)
 #ifdef LBL_ALIGN
        /*
         * The IP6 header is not 16-byte aligned, so copy into abuf.
-        * This will never happen with BPF.  It does happen raw packet
-        * dumps from -r.
         */
        if ((u_long)ip6 & 15) {
                static u_char *abuf;
 
-               if (abuf == NULL)
+               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);