Signed-off-by: Oliver Hartkopp <socketcan@xxxxxxxxxxxx>
---
epan/dissectors/packet-socketcan.c | 13 ++++++++-----
epan/dissectors/packet-socketcan.h | 17 ++++++++++-------
2 files changed, 18 insertions(+), 12 deletions(-)
diff --git a/epan/dissectors/packet-socketcan.c b/epan/dissectors/packet-socketcan.c
index 4ca0479f79..09b5f687fc 100644
--- a/epan/dissectors/packet-socketcan.c
+++ b/epan/dissectors/packet-socketcan.c
@@ -171,15 +171,18 @@ static const value_string can_err_trx_canl_vals[] = {
static const value_string canxl_sdu_type_vals[] = {
{ 0x00, "Reserved" },
{ CANXL_SDU_TYPE_CONTENT_BASED_ADDRESSING, "Content-based Addressing" },
{ 0x02, "Reserved for future use" },
- { CANXL_SDU_TYPE_CLASSICAL_CAN_AND_CAN_FD_MAPPED_TUNNELING, "Classical CAN/CAN FD mapped tunneling" },
- { CANXL_SDU_TYPE_IEEE_802_3_MAC_FRAME_TUNNELLING, "IEEE 802.3 (MAC frame) tunneling" },
- { CANXL_SDU_TYPE_IEEE_802_3_MAC_FRAME_MAPPED_TUNNELING, "IEEE 802.3 (MAC frame) mapped tunneling" },
- { CANXL_SDU_TYPE_CLASSICAL_CAN_MAPPED_TUNNELING, "Classical CAN mapped tunneling" },
- { CANXL_SDU_TYPE_CAN_FD_MAPPED_TUNNELING, "CAN FD mapped tunneling" },
+ { CANXL_SDU_TYPE_CAN_CC_CAN_FD, "CAN CC/CAN FD" },
+ { CANXL_SDU_TYPE_IEEE_802_3, "IEEE 802.3 (MAC frame)" },
+ { CANXL_SDU_TYPE_IEEE_802_3_EXTENDED, "IEEE 802.3 (MAC frame) extended" },
+ { CANXL_SDU_TYPE_CAN_CC, "CAN CC" },
+ { CANXL_SDU_TYPE_CAN_FD, "CAN FD" },
+ { CANXL_SDU_TYPE_CIA_611_2, "CiA 611-2 (Multi-PDU)" },
+ { CANXL_SDU_TYPE_AUTOSAR_MPDU, "AUTOSAR Multi-PDU" },
+ { CANXL_SDU_TYPE_CIA_613_2, "CiA 613-2 (CANsec key agreement protocol" },
{ 0xFF, "Reserved" },
{ 0, NULL }
};
/********* UATs *********/
diff --git a/epan/dissectors/packet-socketcan.h b/epan/dissectors/packet-socketcan.h
index f82fa5e20b..87f51b2328 100644
--- a/epan/dissectors/packet-socketcan.h
+++ b/epan/dissectors/packet-socketcan.h
@@ -123,18 +123,21 @@ typedef struct can_info {
gboolean socketcan_call_subdissectors(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, struct can_info *can_info, const gboolean use_heuristics_first);
gboolean socketcan_set_source_and_destination_columns(packet_info* pinfo, can_info_t *caninfo);
/*
- * CAN XL SDU types.
+ * CAN XL SDU types from CAN CiA 611-1
*/
-#define CANXL_SDU_TYPE_CONTENT_BASED_ADDRESSING 0x01
-#define CANXL_SDU_TYPE_CLASSICAL_CAN_AND_CAN_FD_MAPPED_TUNNELING 0x03
-#define CANXL_SDU_TYPE_IEEE_802_3_MAC_FRAME_TUNNELLING 0x04
-#define CANXL_SDU_TYPE_IEEE_802_3_MAC_FRAME_MAPPED_TUNNELING 0x05
-#define CANXL_SDU_TYPE_CLASSICAL_CAN_MAPPED_TUNNELING 0x06
-#define CANXL_SDU_TYPE_CAN_FD_MAPPED_TUNNELING 0x07
+#define CANXL_SDU_TYPE_CONTENT_BASED_ADDRESSING 0x01
+#define CANXL_SDU_TYPE_CAN_CC_CAN_FD 0x03
+#define CANXL_SDU_TYPE_IEEE_802_3 0x04
+#define CANXL_SDU_TYPE_IEEE_802_3_EXTENDED 0x05
+#define CANXL_SDU_TYPE_CAN_CC 0x06
+#define CANXL_SDU_TYPE_CAN_FD 0x07
+#define CANXL_SDU_TYPE_CIA_611_2 0x08
+#define CANXL_SDU_TYPE_AUTOSAR_MPDU 0x09
+#define CANXL_SDU_TYPE_CIA_613_2 0x0A
#endif /* __PACKET_SOCKETCAN_H__ */
/*
* Editor modelines - https://www.wireshark.org/tools/modelines.html
--
2.43.0