OSPF: Use %zu to print sizeof values

[tcpdump] / print-ip6.c

diff --git a/print-ip6.c b/print-ip6.c
index 6fef7ba9f35caf310e3a81a44473ba963c81756f..525a284ecdb0c4375631c2c123eb16161d9c3030 100644 (file)
--- a/print-ip6.c
+++ b/print-ip6.c
@@ -77,7 +77,6 @@ ip6_finddst(netdissect_options *ndo, nd_ipv6 *dst,
                         * the header, in units of 8 octets, excluding
                         * the first 8 octets.
                         */
                         * the header, in units of 8 octets, excluding
                         * the first 8 octets.
                         */

-                       ND_TCHECK_2(cp);

                        advance = (GET_U_1(cp + 1) + 1) << 3;
                        nh = GET_U_1(cp);
                        break;
                        advance = (GET_U_1(cp + 1) + 1) << 3;
                        nh = GET_U_1(cp);
                        break;


@@ -88,7 +87,6 @@ ip6_finddst(netdissect_options *ndo, nd_ipv6 *dst,
                         * marked as reserved, and the header is always
                         * the same size.
                         */
                         * marked as reserved, and the header is always
                         * the same size.
                         */

-                       ND_TCHECK_1(cp);

                        advance = sizeof(struct ip6_frag);
                        nh = GET_U_1(cp);
                        break;
                        advance = sizeof(struct ip6_frag);
                        nh = GET_U_1(cp);
                        break;


@@ -376,7 +374,7 @@ ip6_print(netdissect_options *ndo, const u_char *bp, u_int length)
                         * XXX - we don't use "advance"; RFC 3775 says that
                         * the next header field in a mobility header
                         * should be IPPROTO_NONE, but speaks of
                         * XXX - we don't use "advance"; RFC 3775 says that
                         * the next header field in a mobility header
                         * should be IPPROTO_NONE, but speaks of

-                        * the possiblity of a future extension in
+                        * the possibility of a future extension in

                         * which payload can be piggybacked atop a
                         * mobility header.
                         */
                         * which payload can be piggybacked atop a
                         * mobility header.
                         */


@@ -469,7 +467,7 @@ ip6_print(netdissect_options *ndo, const u_char *bp, u_int length)
                                }
                        }
                        ip_demux_print(ndo, cp, len, 6, fragmented,
                                }
                        }
                        ip_demux_print(ndo, cp, len, 6, fragmented,

-                           GET_U_1(ip6->ip6_hlim), nh, bp);
+                                      GET_U_1(ip6->ip6_hlim), nh, bp);

                        nd_pop_packet_info(ndo);
                        return;
                }
                        nd_pop_packet_info(ndo);
                        return;
                }