Add Socket CANFD dissector.

Bug: 12687 Change-Id: Ib489b4c6aff1e0611e9b8a086054e56284f24b84 Reviewed-on: https://code.wireshark.org/review/16787 Petri-Dish: Michael Mann <mmann78@netscape.net> Reviewed-by: Michael Mann <mmann78@netscape.net>
wireshark · Sep 10, 2016 · 7fad354 · 7fad354
1 parent 7541a00
commit 7fad354
Show file tree

Hide file tree

Showing 4 changed files with 206 additions and 62 deletions.
diff --git a/docbook/release-notes.asciidoc b/docbook/release-notes.asciidoc
@@ -51,6 +51,7 @@ SCTE-35 Digital Program Insertion Messages
 Windows Cluster Management API (clusapi)
 RFTap Protocol
 M2 Application Protocol
+CAN FD
 --sort-and-group--
 
 === Updated Protocol Support

diff --git a/epan/dissectors/packet-sll.c b/epan/dissectors/packet-sll.c
@@ -71,6 +71,7 @@ static const value_string ltype_vals[] = {
 	{ LINUX_SLL_P_802_2,	"802.2 LLC" },
 	{ LINUX_SLL_P_PPPHDLC,	"PPP (HDLC)" },
 	{ LINUX_SLL_P_CAN,	"CAN" },
+	{ LINUX_SLL_P_CANFD,	"CAN FD" },
 	{ LINUX_SLL_P_IRDA_LAP,	"IrDA LAP" },
 	{ LINUX_SLL_P_ISI,	"ISI" },
 	{ LINUX_SLL_P_IEEE802154,	"IEEE 802.15.4" },

diff --git a/epan/dissectors/packet-sll.h b/epan/dissectors/packet-sll.h
@@ -33,6 +33,7 @@
 #define LINUX_SLL_P_802_2	0x0004	/* 802.2 frames (not D/I/X Ethernet) */
 #define LINUX_SLL_P_PPPHDLC	0x0007	/* PPP HDLC frames */
 #define LINUX_SLL_P_CAN		0x000C	/* Controller Area Network */
+#define LINUX_SLL_P_CANFD	0x000D	/* Controller Area Network flexible data rate */
 #define LINUX_SLL_P_IRDA_LAP	0x0017	/* IrDA Link Access Protocol */
 #define LINUX_SLL_P_ISI		0x00F5  /* Intelligent Service Interface */
 #define LINUX_SLL_P_IEEE802154	0x00f6	/* 802.15.4 on monitor inteface */