From: Francois-Xavier Le Bail <devel.fx.lebail@orange.fr>
Date: Sun, 14 May 2023 12:01:57 +0000 (+0200)
Subject: VTP: Update two error messages
X-Git-Tag: tcpdump-4.99.5~198
X-Git-Url: https://git.tcpdump.org/tcpdump/commitdiff_plain/38b1f02736b4b1e68000c722fac5afabfc65741a

VTP: Update two error messages

This change will avoid having the keyword "invalid" twice as:
[invalid MgmtD Len nnn] (invalid)
and
(invalid TLV length nnn != 1) (invalid)

(cherry picked from commit e8d0325a5b85e027aff1cf0f3636cf7f66d74f82)
---

diff --git a/print-vtp.c b/print-vtp.c
index bcee64cf..1637db66 100644
--- a/print-vtp.c
+++ b/print-vtp.c
@@ -148,7 +148,7 @@ vtp_print(netdissect_options *ndo,
     ND_PRINT("\n\tDomain name: ");
     mgmtd_len = GET_U_1(tptr + 3);
     if (mgmtd_len < 1 ||  mgmtd_len > VTP_DOMAIN_NAME_LEN) {
-	ND_PRINT(" [invalid MgmtD Len %u]", mgmtd_len);
+	ND_PRINT(" [MgmtD Len %u]", mgmtd_len);
 	goto invalid;
     }
     nd_printjnp(ndo, tptr + 4, mgmtd_len);
@@ -300,7 +300,7 @@ vtp_print(netdissect_options *ndo,
                  * in units of 16-bit words.
                  */
                 if (tlv_len != 1) {
-                    ND_PRINT(" (invalid TLV length %u != 1)", tlv_len);
+                    ND_PRINT(" [TLV length %u != 1]", tlv_len);
                     goto invalid;
                 } else {
                     tlv_value = GET_BE_U_2(tptr + 2);