Fix some "unsigned int" vs. "size_t" issues (they're not necessarily the

[tcpdump] / print-ip6.c

diff --git a/print-ip6.c b/print-ip6.c
index 06efeed8cff6d58e0f5566cbe664aa89734fdf0b..f43d61aab2e82e203abd5c09ff646c514fa723e1 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.45 2004-08-27 03:57:41 guy Exp $";
+    "@(#) $Header: /tcpdump/master/tcpdump/print-ip6.c,v 1.50 2005-09-20 06:01:23 guy Exp $";
 #endif
 
 #ifdef HAVE_CONFIG_H
@@ -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,
@@ -116,7 +116,7 @@ ip6_print(register const u_char *bp, register u_int length)
 
                if (cp == (const u_char *)(ip6 + 1) &&
                    nh != IPPROTO_TCP && nh != IPPROTO_UDP &&
-                   nh != IPPROTO_SCTP) {
+                   nh != IPPROTO_DCCP && nh != IPPROTO_SCTP) {
                        (void)printf("%s > %s: ", ip6addr_string(&ip6->ip6_src),
                                     ip6addr_string(&ip6->ip6_dst));
                }
@@ -160,6 +160,9 @@ ip6_print(register const u_char *bp, register u_int length)
                case IPPROTO_SCTP:
                        sctp_print(cp, (const u_char *)ip6, len);
                        return;
+               case IPPROTO_DCCP:
+                       dccp_print(cp, (const u_char *)ip6, len);
+                       return;
                case IPPROTO_TCP:
                        tcp_print(cp, len, (const u_char *)ip6, fragmented);
                        return;
@@ -192,6 +195,7 @@ ip6_print(register const u_char *bp, register u_int length)
                case IPPROTO_PIM:
                        pim_print(cp, len);
                        return;
+
                case IPPROTO_OSPF:
                        ospf6_print(cp, len);
                        return;
@@ -201,7 +205,19 @@ 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_PGM:
+                        pgm_print(cp, len, (const u_char *)ip6);
+                        return;
+
+               case IPPROTO_GRE:
+                       gre_print(cp, len);
+                       return;
+
+               case IPPROTO_RSVP:
+                       rsvp_print(cp, len);
                        return;
 
                case IPPROTO_NONE: