pass correct caplen to other functions as well

In ethertype_print(), isoclns_print() and snap_print() adjust the length
arithmetics along the same lines as for ether_print() in the previous
commit. Where done, the current pointer is not greater than snapend so
that the difference (i.e. caplen) is never negative.

This does not fix a reported issue but the problem was very likely to be
there.

diff --git a/print-chdlc.c b/print-chdlc.c
index b5ed67db14c1370341c0ca54135e2cb698cd9d25..450d286848cb8590e2b5ebe8e93e586f0a5c6db5 100644 (file)
--- a/print-chdlc.c
+++ b/print-chdlc.c
@@ -97,9 +97,9 @@ chdlc_print(netdissect_options *ndo, register const u_char *p, u_int length)
                 if (*(p+1) == 0x81 ||
                     *(p+1) == 0x82 ||
                     *(p+1) == 0x83)
-                    isoclns_print(ndo, p + 1, length - 1, length - 1);
+                    isoclns_print(ndo, p + 1, length - 1, ndo->ndo_snapend - p - 1);
                 else
-                    isoclns_print(ndo, p, length, length);
+                    isoclns_print(ndo, p, length, ndo->ndo_snapend - p);
                 break;
        default:
                 if (!ndo->ndo_eflag)

diff --git a/print-fr.c b/print-fr.c
index 9c97bcb4a6746ef904f2d580066a84b2127faa19..f400ddcd4f59aee585351c5e3ec19b4976e18974 100644 (file)
--- a/print-fr.c
+++ b/print-fr.c
@@ -276,7 +276,7 @@ fr_print(netdissect_options *ndo,
                         if (ethertype_print(ndo, extracted_ethertype,
                                             p+addr_len+ETHERTYPE_LEN,
                                             length-addr_len-ETHERTYPE_LEN,
-                                            length-addr_len-ETHERTYPE_LEN,
+                                            ndo->ndo_snapend-p-addr_len-ETHERTYPE_LEN,
                                             NULL, NULL) == 0)
                                 /* ether_type not known, probably it wasn't one */
                                 ND_PRINT((ndo, "UI %02x! ", p[addr_len]));
@@ -329,11 +329,11 @@ fr_print(netdissect_options *ndo,
        case NLPID_CLNP:
        case NLPID_ESIS:
        case NLPID_ISIS:
-               isoclns_print(ndo, p - 1, length + 1, length + 1); /* OSI printers need the NLPID field */
+               isoclns_print(ndo, p - 1, length + 1, ndo->ndo_snapend - p + 1); /* OSI printers need the NLPID field */
                break;
 
        case NLPID_SNAP:
-               if (snap_print(ndo, p, length, length, NULL, NULL, 0) == 0) {
+               if (snap_print(ndo, p, length, ndo->ndo_snapend - p, NULL, NULL, 0) == 0) {
                        /* ether_type not known, print raw packet */
                         if (!ndo->ndo_eflag)
                             fr_hdr_print(ndo, length + hdr_len, hdr_len,

diff --git a/print-geneve.c b/print-geneve.c
index d1ed242fda6ab533c9af6ace3eb8f2c8cdee08d7..40402ab4200cd7ebcb0eac3eed4dc91d656c1fb1 100644 (file)
--- a/print-geneve.c
+++ b/print-geneve.c
@@ -223,7 +223,7 @@ geneve_print(netdissect_options *ndo, const u_char *bp, u_int len)
     else
         ND_PRINT((ndo, "\n\t"));
 
-    if (ethertype_print(ndo, prot, bp, len, len, NULL, NULL) == 0) {
+    if (ethertype_print(ndo, prot, bp, len, ndo->ndo_snapend - bp, NULL, NULL) == 0) {
         if (prot == ETHERTYPE_TEB)
             ether_print(ndo, bp, len, ndo->ndo_snapend - bp, NULL, NULL);
         else

diff --git a/print-gre.c b/print-gre.c
index e0f60c944dd0ef13f83f0dea76d8a20c5b41f212..505752a1b8fad1b0ccd213b1e1ed7f6764707274 100644 (file)
--- a/print-gre.c
+++ b/print-gre.c
@@ -226,7 +226,7 @@ gre_print_0(netdissect_options *ndo, const u_char *bp, u_int length)
                atalk_print(ndo, bp, len);
                break;
        case ETHERTYPE_GRE_ISO:
-               isoclns_print(ndo, bp, len, len);
+               isoclns_print(ndo, bp, len, ndo->ndo_snapend - bp);
                break;
        case ETHERTYPE_TEB:
                ether_print(ndo, bp, len, ndo->ndo_snapend - bp, NULL, NULL);