CHANGES: Add/move change(s) backported to 4.99

[tcpdump] / print-ip6.c

diff --git a/print-ip6.c b/print-ip6.c
index 460795c744af0138cf9c2f73d7c59372d4eb89be..269b41fb2a7aabc87b2cf811126734728a49b027 100644 (file)
--- a/print-ip6.c
+++ b/print-ip6.c
@@ -21,9 +21,7 @@
 
 /* \summary: IPv6 printer */
 
 
 /* \summary: IPv6 printer */
 

-#ifdef HAVE_CONFIG_H

 #include <config.h>
 #include <config.h>

-#endif

 
 #include "netdissect-stdinc.h"
 
 
 #include "netdissect-stdinc.h"
 


@@ -275,7 +273,7 @@ ip6_print(netdissect_options *ndo, const u_char *bp, u_int length)
        if (payload_len != 0) {
                len = payload_len + sizeof(struct ip6_hdr);
                if (len > length) {
        if (payload_len != 0) {
                len = payload_len + sizeof(struct ip6_hdr);
                if (len > length) {

-                       ND_PRINT("[payload+header length %u > length %u]",
+                       ND_PRINT("[header+payload length %u > length %u]",

                                 len, length);
                        nd_print_invalid(ndo);
                        ND_PRINT(" ");
                                 len, length);
                        nd_print_invalid(ndo);
                        ND_PRINT(" ");


@@ -294,7 +292,7 @@ ip6_print(netdissect_options *ndo, const u_char *bp, u_int length)
            if (flow & 0x000fffff)
                ND_PRINT("flowlabel 0x%05x, ", flow & 0x000fffff);
 
            if (flow & 0x000fffff)
                ND_PRINT("flowlabel 0x%05x, ", flow & 0x000fffff);
 

-           ND_PRINT("hlim %u, next-header %s (%u) payload length: %u) ",
+           ND_PRINT("hlim %u, next-header %s (%u), payload length %u) ",

                         GET_U_1(ip6->ip6_hlim),
                         tok2str(ipproto_values,"unknown",nh),
                         nh,
                         GET_U_1(ip6->ip6_hlim),
                         tok2str(ipproto_values,"unknown",nh),
                         nh,


@@ -303,9 +301,11 @@ ip6_print(netdissect_options *ndo, const u_char *bp, u_int length)
        ND_TCHECK_SIZE(ip6);
 
        /*
        ND_TCHECK_SIZE(ip6);
 
        /*

-        * Cut off the snapshot length to the end of the IP payload.
+        * Cut off the snapshot length to the end of the IP payload
+        * or the end of the data in which it's contained, whichever
+        * comes first.

         */
         */

-       if (!nd_push_snaplen(ndo, bp, len)) {
+       if (!nd_push_snaplen(ndo, bp, ND_MIN(length, len))) {

                (*ndo->ndo_error)(ndo, S_ERR_ND_MEM_ALLOC,
                        "%s: can't push snaplen on buffer stack", __func__);
        }
                (*ndo->ndo_error)(ndo, S_ERR_ND_MEM_ALLOC,
                        "%s: can't push snaplen on buffer stack", __func__);
        }


@@ -387,7 +387,7 @@ ip6_print(netdissect_options *ndo, const u_char *bp, u_int length)
                case IPPROTO_MOBILITY_OLD:
                case IPPROTO_MOBILITY:
                        /*
                case IPPROTO_MOBILITY_OLD:
                case IPPROTO_MOBILITY:
                        /*

-                        * XXX - we don't use "advance"; RFC 3775 says that
+                        * RFC 3775 says that

                         * the next header field in a mobility header
                         * should be IPPROTO_NONE, but speaks of
                         * the possibility of a future extension in
                         * the next header field in a mobility header
                         * should be IPPROTO_NONE, but speaks of
                         * the possibility of a future extension in


@@ -435,7 +435,7 @@ ip6_print(netdissect_options *ndo, const u_char *bp, u_int length)
                                if (len < total_advance)
                                        goto trunc;
                                if (len > length) {
                                if (len < total_advance)
                                        goto trunc;
                                if (len > length) {

-                                       ND_PRINT("[payload+header length %u > length %u]",
+                                       ND_PRINT("[header+payload length %u > length %u]",

                                                 len, length);
                                        nd_print_invalid(ndo);
                                        ND_PRINT(" ");
                                                 len, length);
                                        nd_print_invalid(ndo);
                                        ND_PRINT(" ");