VTP: Add a version check

fxlb · fxlb · commit 42e67bf66780 · 2025-06-14T11:39:52.000+02:00
VTP protocol version is 1, 2, or 3.

Use nd_print_protocol_caps().
Use ND_ICHECK_U() to replace a custom check.
diff --git a/print-vtp.c b/print-vtp.c
@@ -121,18 +121,22 @@ vtp_print(netdissect_options *ndo,
     u_int type, len, name_len, tlv_len, tlv_value, mgmtd_len;
     const u_char *tptr;
     const struct vtp_vlan_ *vtp_vlan;
+    uint8_t version;
 
     ndo->ndo_protocol = "vtp";
-    if (length < VTP_HEADER_LEN)
-        goto invalid;
+    nd_print_protocol_caps(ndo);
+    ND_ICHECK_U(length, <, VTP_HEADER_LEN);
 
     tptr = pptr;
 
     ND_TCHECK_LEN(tptr, VTP_HEADER_LEN);
 
+    version = GET_U_1(tptr);
+    ND_ICHECK_U(version, <, 1);
+    ND_ICHECK_U(version, >, 3);
     type = GET_U_1(tptr + 1);
-    ND_PRINT("VTPv%u, Message %s (0x%02x), length %u",
-	   GET_U_1(tptr),
+    ND_PRINT("v%u, Message %s (0x%02x), length %u",
+	   version,
 	   tok2str(vtp_message_type_values,"Unknown message type", type),
 	   type,
 	   length);
diff --git a/tests/vtp_asan-2.out b/tests/vtp_asan-2.out
@@ -1,2 +1 @@
-    1  2023-11-18 11:13:40.999999 FRF.16 Frag, seq 193, Flags [Begin, End], UI 08! VTPv69, Message Subset advertisement (0x02), length 262131
-	Domain name: , Seq number: 0, Config Rev fb499603 (invalid) [|vtp]
+    1  2023-11-18 11:13:40.999999 FRF.16 Frag, seq 193, Flags [Begin, End], UI 08! VTP [version 69 > 3] (invalid) [|vtp]
diff --git a/tests/vtp_asan-3.out b/tests/vtp_asan-3.out
@@ -1,2 +1 @@
-    1  2023-11-18 11:13:40.999999 FRF.16 Frag, seq 193, Flags [Begin, End], UI 08! VTPv69, Message Subset advertisement (0x02), length 262131
-	Domain name: , Seq number: 0, Config Rev 4040404 (invalid) [|vtp]
+    1  2023-11-18 11:13:40.999999 FRF.16 Frag, seq 193, Flags [Begin, End], UI 08! VTP [version 69 > 3] (invalid) [|vtp]
diff --git a/tests/vtp_asan.out b/tests/vtp_asan.out
@@ -1,5 +1,4 @@
-    1  2023-11-18 11:13:40.999999 FRF.16 Frag, seq 193, Flags [Begin, End], UI 08! VTPv69, Message Subset advertisement (0x02), length 262131
-	Domain name: , Seq number: 0 [|vtp]
+    1  2023-11-18 11:13:40.999999 FRF.16 Frag, seq 193, Flags [Begin, End], UI 08! VTP [version 69 > 3] (invalid) [|vtp]
     2  [Invalid header: caplen==0]
     3  [Invalid header: caplen==0, len==0]
     4  [Invalid header: caplen==0, len==0]

Original file line number	Diff line number	Diff line change
`@@ -1,2 +1 @@`
`1`		`- 1 2023-11-18 11:13:40.999999 FRF.16 Frag, seq 193, Flags [Begin, End], UI 08! VTPv69, Message Subset advertisement (0x02), length 262131`
`2`		`- Domain name: , Seq number: 0, Config Rev fb499603 (invalid) [\|vtp]`
	`1`	`+ 1 2023-11-18 11:13:40.999999 FRF.16 Frag, seq 193, Flags [Begin, End], UI 08! VTP [version 69 > 3] (invalid) [\|vtp]`