osmocom
/
wireshark
11
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

CAN: fixed heuristics of CAN 

This patch adds heuristics support for regular CAN-IDs. Until now,
only extended CAN-IDs were support. That did not make sense.
Fixes #17128.
This commit is contained in:
Dr. Lars Völker 2021-01-14 00:10:58 +01:00 committed by AndersBroman
parent 60414fa60f
commit 0636906880
1 changed files with 19 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
epan/dissectors/packet-socketcan.c
View File

@ -316,9 +316,26 @@ dissect_socketcan_common(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree,
}
next_tvb = tvb_new_subset_length(tvb, CAN_DATA_OFFSET, can_info.len);
if (!dissector_try_payload_new(subdissector_table, next_tvb, pinfo, tree, TRUE, &can_info))
if (!heuristic_first)
{
call_data_dissector(next_tvb, pinfo, tree);
if (!dissector_try_payload_new(subdissector_table, next_tvb, pinfo, tree, TRUE, &can_info))
{
if (!dissector_try_heuristic(heur_subdissector_list, next_tvb, pinfo, tree, &heur_dtbl_entry, &can_info))
{
call_data_dissector(next_tvb, pinfo, tree);
}
}
}
else
{
if (!dissector_try_heuristic(heur_subdissector_list, next_tvb, pinfo, tree, &heur_dtbl_entry, &can_info))
{
if (!dissector_try_payload_new(subdissector_table, next_tvb, pinfo, tree, FALSE, &can_info))
{
call_data_dissector(next_tvb, pinfo, tree);
}
}
}
}