add boundary, infinite loop checks

[tcpdump] / print-ip6.c

diff --git a/print-ip6.c b/print-ip6.c
index e5cb504b79868724fee3a64939fed9972af34338..05db9d97da2d3d214bb9e874dd4f0f123345b2d0 100644 (file)
--- a/print-ip6.c
+++ b/print-ip6.c
@@ -21,7 +21,7 @@
 
 #ifndef lint
 static const char rcsid[] _U_ =
-    "@(#) $Header: /tcpdump/master/tcpdump/print-ip6.c,v 1.44 2004-07-16 14:06:00 hannes Exp $";
+    "@(#) $Header: /tcpdump/master/tcpdump/print-ip6.c,v 1.47 2005-04-06 21:32:40 mcr Exp $";
 #endif
 
 #ifdef HAVE_CONFIG_H
@@ -63,7 +63,7 @@ ip6_print(register const u_char *bp, register u_int length)
 
        TCHECK(*ip6);
        if (length < sizeof (struct ip6_hdr)) {
-               (void)printf("truncated-ip6 %d", length);
+               (void)printf("truncated-ip6 %u", length);
                return;
        }
 
@@ -73,7 +73,7 @@ ip6_print(register const u_char *bp, register u_int length)
        payload_len = EXTRACT_16BITS(&ip6->ip6_plen);
        len = payload_len + sizeof(struct ip6_hdr);
        if (length < len)
-               (void)printf("truncated-ip6 - %d bytes missing!",
+               (void)printf("truncated-ip6 - %u bytes missing!",
                        len - length);
 
         if (vflag) {
@@ -93,7 +93,7 @@ ip6_print(register const u_char *bp, register u_int length)
                (void)printf("flowlabel 0x%05x, ", flow & 0x000fffff);
 #endif
 
-            (void)printf("hlim %u, next-header: %s (%u), payload-len %u) ",
+            (void)printf("hlim %u, next-header: %s (%u), length: %u) ",
                          ip6->ip6_hlim,
                          tok2str(ipproto_values,"unknown",ip6->ip6_nxt),
                          ip6->ip6_nxt,
@@ -201,7 +201,7 @@ ip6_print(register const u_char *bp, register u_int length)
                        return;
 
                case IPPROTO_IPV4:
-                       ip_print(cp, len);
+                       ip_print(gndo, cp, len);
                        return;
 
                case IPPROTO_NONE: