]> The Tcpdump Group git mirrors - tcpdump/commitdiff
PPP: Update two error messages
authorFrancois-Xavier Le Bail <[email protected]>
Wed, 20 Mar 2019 12:46:55 +0000 (13:46 +0100)
committerFrancois-Xavier Le Bail <[email protected]>
Wed, 20 Mar 2019 12:49:53 +0000 (13:49 +0100)
Update the output of a test accordingly.

print-ppp.c
tests/ppp-invalid-lengths.out

index ee9538be055116d97c7bceff358407c8a1bb6b71..787f34c7c9c1721429d311a021bf0eaf26b606ec 100644 (file)
@@ -516,7 +516,7 @@ handle_ctrl_proto(netdissect_options *ndo,
                        if ((advance = (*pfunc)(ndo, tptr, len)) == 0)
                                break;
                        if (tlen < advance) {
-                               ND_PRINT(" [options length %u < %u]",
+                               ND_PRINT(" [remaining options length %u < %u]",
                                         tlen, advance);
                                nd_print_invalid(ndo);
                                break;
@@ -1141,7 +1141,7 @@ print_ipcp_config_options(netdissect_options *ndo,
                                                ipcomp_subopt,
                                                ipcomp_suboptlen);
                                         if (ipcomp_subopttotallen < ipcomp_suboptlen) {
-                                                ND_PRINT(" [suboptions length %u < %u]",
+                                                ND_PRINT(" [remaining suboptions length %u < %u]",
                                                          ipcomp_subopttotallen, ipcomp_suboptlen);
                                                 nd_print_invalid(ndo);
                                                 break;
index 8f0e88e2702e67dbfbac8147b2389cfb05135744..729c9ee498988da565ffe5fd422288c98dc711c1 100644 (file)
@@ -3,7 +3,7 @@
          IP-Comp Option (0x02), length 218: IP Header Compression (0x61):
            TCP Space 24929, non-TCP Space 24929, maxPeriod 25441, maxTime 24929, maxHdr 24953
              Suboptions, length 204
-               Unknown Suboption #220, length 220 [suboptions length 204 < 220] (invalid)
+               Unknown Suboption #220, length 220 [remaining suboptions length 204 < 220] (invalid)
          unknown Option (0x7b), length 123
            0x0000:  7b7b 7b7b 7b7b 7b7b 7b7b 7b7b 7b7b 7b7b
            0x0010:  7b7b 7b7b 7b7b 7b7b 7b7b 7b7b 7b7b 7b7b
            0x00b0:  1212 1212 1212 1212 1212 1212 1212 1212
            0x00c0:  1212 1212 1212 1212 1212 1212 1212 1212
            0x00d0:  1212 1212 1212 1212 1212 1212 1212 1212
-           0x00e0:  1212 1212 [options length 38 < 230] (invalid)
+           0x00e0:  1212 1212 [remaining options length 38 < 230] (invalid)