diff options
| author | Stefan Tatschner <stefan@rumpelsepp.org> | 2019-11-28 08:03:51 +0100 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2019-11-28 18:27:16 +0000 |
| commit | 40eece98f8e6bc9a0a8f0961e43e95f538322aec (patch) | |
| tree | 90b5fa36b1e892a1f554d025d5febe33c00da1a5 /epan/dissectors/packet-ieee1722.c | |
| parent | bb7014731cfa39f7742f552f2817461b75ed084f (diff) | |
Change struct can_identifier to can_info
The can specific data structure `struct can_identifier` is used as
supplementary data for higher level dissectors. This patch adds more
data to this struct and renames it accordingly to `struct can_info`.
More supplementary data is needed in order to dissect iso15765
correctly, since the header format depends on details on the underlying
CAN protocol (CAN 2.0B vs CAN-FD).
Change-Id: Id068cf38453f98b67a5ec470a22e7013548c5a14
Reviewed-on: https://code.wireshark.org/review/35246
Petri-Dish: Guy Harris <guy@alum.mit.edu>
Tested-by: Petri Dish Buildbot
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Diffstat (limited to 'epan/dissectors/packet-ieee1722.c')
| -rw-r--r-- | epan/dissectors/packet-ieee1722.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/epan/dissectors/packet-ieee1722.c b/epan/dissectors/packet-ieee1722.c index a07cf2d56f..3cb4fa74e0 100644 --- a/epan/dissectors/packet-ieee1722.c +++ b/epan/dissectors/packet-ieee1722.c @@ -2473,7 +2473,7 @@ static int dissect_1722_acf_can_common(tvbuff_t *tvb, packet_info *pinfo, proto_ proto_tree *tree_can_id; gint can_protocol; const int **can_flags; - can_identifier_t can_id; + struct can_info can_info; tvbuff_t* next_tvb; gint offset = 0; @@ -2597,24 +2597,24 @@ static int dissect_1722_acf_can_common(tvbuff_t *tvb, packet_info *pinfo, proto_ * CAN sub-dissectors expect several flags to be merged into ID that is passed * to dissector_try_payload_new. Add them */ - can_id.id = parsed.id; + can_info.id = parsed.id; if (parsed.is_xtd) { - can_id.id |= CAN_EFF_FLAG; + can_info.id |= CAN_EFF_FLAG; } if (parsed.is_rtr) { - can_id.id |= CAN_RTR_FLAG; + can_info.id |= CAN_RTR_FLAG; } next_tvb = tvb_new_subset_length(tvb, offset, parsed.datalen); if(!can_heuristic_first) { - if (!dissector_try_payload_new(can_subdissector_table, next_tvb, pinfo, tree, TRUE, &can_id)) + if (!dissector_try_payload_new(can_subdissector_table, next_tvb, pinfo, tree, TRUE, &can_info)) { - if(!dissector_try_heuristic(can_heur_subdissector_table, next_tvb, pinfo, tree, &can_heur_dtbl_entry, &can_id)) + if(!dissector_try_heuristic(can_heur_subdissector_table, next_tvb, pinfo, tree, &can_heur_dtbl_entry, &can_info)) { call_data_dissector(next_tvb, pinfo, tree); } @@ -2622,9 +2622,9 @@ static int dissect_1722_acf_can_common(tvbuff_t *tvb, packet_info *pinfo, proto_ } else { - if (!dissector_try_heuristic(can_heur_subdissector_table, next_tvb, pinfo, tree, &can_heur_dtbl_entry, &can_id)) + if (!dissector_try_heuristic(can_heur_subdissector_table, next_tvb, pinfo, tree, &can_heur_dtbl_entry, &can_info)) { - if(!dissector_try_payload_new(can_subdissector_table, next_tvb, pinfo, tree, FALSE, &can_id)) + if(!dissector_try_payload_new(can_subdissector_table, next_tvb, pinfo, tree, FALSE, &can_info)) { call_data_dissector(next_tvb, pinfo, tree); } |