Merge branch 'the-tcpdump-group:master' into master

Author: peteraxis

CHANGES

@@ -17,6 +17,7 @@ DayOfTheWeek, Month DD, YYYY / The Tcpdump Group
       BGP: Add support for BGP Role capability and OTC attribute
       BGP: Fix most printing code to print directly rather than filling
         in a fixed-size buffer to be printed later
+      Broadcom DSA tag: fix various issues.
       ICMP: add dissector for ICMP Interface Identification Object
       ICMP: print RFC8335 PROBE extended echo/reply messages.
       IEEE 802.11: include the Mesh ID field while printing management frames.
@@ -148,6 +149,7 @@ DayOfTheWeek, Month DD, YYYY / The Tcpdump Group
         environment variable BUILD_YEAR2038 = yes (via autogen.sh).
       Autoconf: Avoid incorrectly include the libpcap's config.h.
       Require config.h to be from the tcpdump build.
+      AppVeyor: Update Npcap SDK to 1.15.
 
 Friday, August 30, 2024 / The Tcpdump Group
   Summary for 4.99.5 tcpdump release

instrument-functions.c

@@ -15,7 +15,15 @@
 #include <string.h>
 #include <stdlib.h>
 #include <unistd.h>
+
+/*
+ * The binutils bfd header has a weird inclusion guard, requiring this
+ * macro to be defined. Some distributions patch the guard out, others
+ * don't.
+ */
+#define PACKAGE "binutils-bfd.h-guard-workaround"
 #include <bfd.h>
+#undef PACKAGE
 
 /*
  * Generate instrumentation calls for entry and exit to functions.

print-brcmtag.c

@@ -20,6 +20,7 @@
  */
 
 /* \summary: Broadcom Ethernet switches tag (4 bytes) printer */
+// specification: https://www.tcpdump.org/linktypes/broadcom-switch-tag.html
 
 #include <config.h>
 
@@ -32,7 +33,8 @@
 
 #define BRCM_TAG_LEN		4
 #define BRCM_OPCODE_SHIFT	5
-#define BRCM_OPCODE_MASK	0x7
+#define BRCM_EGRESS		0 // 0b000xxxxx
+#define BRCM_INGRESS		1 // 0b001xxxxx
 
 /* Ingress fields */
 #define BRCM_IG_TC_SHIFT	2
@@ -42,9 +44,8 @@
 #define BRCM_IG_DSTMAP_MASK	0x1ff
 
 /* Egress fields */
-#define BRCM_EG_CID_MASK	0xff
-#define BRCM_EG_RC_MASK		0xff
-#define  BRCM_EG_RC_RSVD	(3 << 6)
+#define  BRCM_EG_RC_RSVD7	(1 << 7)
+#define  BRCM_EG_RC_RSVD6	(1 << 6)
 #define  BRCM_EG_RC_EXCEPTION	(1 << 5)
 #define  BRCM_EG_RC_PROT_SNOOP	(1 << 4)
 #define  BRCM_EG_RC_PROT_TERM	(1 << 3)
@@ -55,6 +56,12 @@
 #define BRCM_EG_TC_MASK		0x7
 #define BRCM_EG_PID_MASK	0x1f
 
+static const struct tok brcm_tag_opcodes[] = {
+	{ BRCM_EGRESS, "EG" },
+	{ BRCM_INGRESS, "IG" },
+	{ 0, NULL }
+};
+
 static const struct tok brcm_tag_te_values[] = {
 	{ 0, "None" },
 	{ 1, "Untag" },
@@ -63,13 +70,28 @@ static const struct tok brcm_tag_te_values[] = {
 	{ 0, NULL }
 };
 
-static const struct tok brcm_tag_rc_values[] = {
-	{ 1, "mirror" },
-	{ 2, "MAC learning" },
-	{ 4, "switching" },
-	{ 8, "prot term" },
-	{ 16, "prot snoop" },
-	{ 32, "exception" },
+static const struct tok brcm_tag_rc_bm[] = {
+	{ BRCM_EG_RC_MIRROR, "mirror" },
+	{ BRCM_EG_RC_MAC_LEARN, "MAC learning" },
+	{ BRCM_EG_RC_SWITCH, "switching" },
+	{ BRCM_EG_RC_PROT_TERM, "prot term" },
+	{ BRCM_EG_RC_PROT_SNOOP, "prot snoop" },
+	{ BRCM_EG_RC_EXCEPTION, "exception" },
+	{ BRCM_EG_RC_RSVD6, "reserved-6" },
+	{ BRCM_EG_RC_RSVD7, "reserved-7" },
+	{ 0, NULL }
+};
+
+static const struct tok brcm_tag_port_bm[] = {
+	{ (1 << 0), "port 0" },
+	{ (1 << 1), "port 1" },
+	{ (1 << 2), "port 2" },
+	{ (1 << 3), "port 3" },
+	{ (1 << 4), "port 4" },
+	{ (1 << 5), "port 5" },
+	{ (1 << 6), "port 6" },
+	{ (1 << 7), "port 7" },
+	{ (1 << 8), "port 8" },
 	{ 0, NULL }
 };
 
@@ -83,26 +105,30 @@ brcm_tag_print(netdissect_options *ndo, const u_char *bp)
 	for (i = 0; i < BRCM_TAG_LEN; i++)
 		tag[i] = GET_U_1(bp + i);
 
-	ND_PRINT("BRCM tag OP: %s", tag[0] ? "IG" : "EG");
-	if (tag[0] & (1 << BRCM_OPCODE_SHIFT)) {
-		/* Ingress Broadcom tag */
-		ND_PRINT(", TC: %d", (tag[1] >> BRCM_IG_TC_SHIFT) &
+	uint8_t opcode = tag[0] >> BRCM_OPCODE_SHIFT;
+	ND_PRINT("BRCM tag OP: %s", tok2str(brcm_tag_opcodes, NULL, opcode));
+	switch (opcode) {
+	case BRCM_INGRESS:
+		ND_PRINT(", TC: %d", (tag[0] >> BRCM_IG_TC_SHIFT) &
 			 BRCM_IG_TC_MASK);
 		ND_PRINT(", TE: %s",
 			 tok2str(brcm_tag_te_values, "unknown",
-				 (tag[1] & BRCM_IG_TE_MASK)));
+				 (tag[0] & BRCM_IG_TE_MASK)));
 		ND_PRINT(", TS: %d", tag[1] >> BRCM_IG_TS_SHIFT);
-		dst_map = (uint16_t)tag[2] << 8 | tag[3];
-		ND_PRINT(", DST map: 0x%04x", dst_map & BRCM_IG_DSTMAP_MASK);
-	} else {
-		/* Egress Broadcom tag */
+		dst_map = ((uint16_t)tag[2] << 8 | tag[3]) & BRCM_IG_DSTMAP_MASK;
+		ND_PRINT(", DST map: [%s]",
+		         bittok2str(brcm_tag_port_bm, "none", dst_map));
+		break;
+	case BRCM_EGRESS:
 		ND_PRINT(", CID: %d", tag[1]);
-		ND_PRINT(", RC: %s", tok2str(brcm_tag_rc_values,
-			 "reserved", tag[2]));
+		ND_PRINT(", RC: [%s]", bittok2str(brcm_tag_rc_bm,
+			 "none", tag[2]));
 		ND_PRINT(", TC: %d", (tag[3] >> BRCM_EG_TC_SHIFT) &
 			 BRCM_EG_TC_MASK);
 		ND_PRINT(", port: %d", tag[3] & BRCM_EG_PID_MASK);
+		break;
 	}
+
 	ND_PRINT(", ");
 }
 

print-lwapp.c

@@ -325,7 +325,13 @@ static const struct tok lwapp_msg_elem_values[] = {
 	{ 0, NULL}
 };
 
-static const uint16_t msg_elem_minlen[] = {
+/*
+ * Message element type is an 8-bit value, so size the array to make any
+ * uint8_t index valid.  Array elements that are implicitly initialized to 0
+ * effectively mean no minimum length requirement for the respective message
+ * element types.
+ */
+static const uint16_t msg_elem_minlen[UINT8_MAX + 1] = {
 	[LWAPP_MSGELEM_AC_ADDRESS]                         =   7,
 	// Omit "Result Code".
 	[LWAPP_MSGELEM_WTP_DESCRIPTOR]                     =  16,

tests/802.1ad_QinQ.out

@@ -0,0 +1,2 @@
+    1  2019-12-08 21:59:54.599412 00:20:d2:5a:fb:3f > ff:ff:ff:ff:ff:ff, ethertype 802.1Q-QinQ (0x88a8), length 64: vlan 200, p 0, ethertype 802.1Q (0x8100), vlan 2001, p 0, ethertype ARP (0x0806), Request who-has 172.21.79.100 tell 172.21.79.97, length 42
+    2  2019-12-08 21:59:54.599680 00:80:ea:81:88:63 > 00:20:d2:5a:fb:3f, ethertype 802.1Q-QinQ (0x88a8), length 64: vlan 200, p 0, ethertype 802.1Q (0x8100), vlan 2001, p 0, ethertype ARP (0x0806), Reply 172.21.79.100 is-at 00:80:ea:81:88:63, length 42

tests/802.1ad_QinQ.pcap

@@ -0,0 +1,2 @@
+    1  2019-12-08 21:59:54.599412 00:20:d2:5a:fb:3f > ff:ff:ff:ff:ff:ff, ethertype 802.1Q-QinQ (0x88a8), length 64: vlan 200, p 0, ethertype 802.1Q (0x8100), vlan 2001, p 0, ethertype ARP (0x0806), Ethernet (len 6), IPv4 (len 4), Request who-has 172.21.79.100 tell 172.21.79.97, length 42
+    2  2019-12-08 21:59:54.599680 00:80:ea:81:88:63 > 00:20:d2:5a:fb:3f, ethertype 802.1Q-QinQ (0x88a8), length 64: vlan 200, p 0, ethertype 802.1Q (0x8100), vlan 2001, p 0, ethertype ARP (0x0806), Ethernet (len 6), IPv4 (len 4), Reply 172.21.79.100 is-at 00:80:ea:81:88:63, length 42