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-autosar-nm.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-autosar-nm.c')
| -rw-r--r-- | epan/dissectors/packet-autosar-nm.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/epan/dissectors/packet-autosar-nm.c b/epan/dissectors/packet-autosar-nm.c index a3b90fa240..e471089e0c 100644 --- a/epan/dissectors/packet-autosar-nm.c +++ b/epan/dissectors/packet-autosar-nm.c @@ -398,7 +398,7 @@ dissect_autosar_nm(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, void const int prev_proto = GPOINTER_TO_INT(wmem_list_frame_data(prev_layer)); if (prev_proto != proto_udp) { - const can_identifier_t *can_id = (can_identifier_t *)data; + const struct can_info *can_info = (struct can_info *)data; const gboolean is_can_frame = (prev_proto == proto_can) || (prev_proto == proto_canfd) || @@ -409,14 +409,14 @@ dissect_autosar_nm(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, void return 0; } - DISSECTOR_ASSERT(can_id); + DISSECTOR_ASSERT(can_info); - if (can_id->id & (CAN_ERR_FLAG | CAN_RTR_FLAG)) { + if (can_info->id & (CAN_ERR_FLAG | CAN_RTR_FLAG)) { /* Error and RTR frames are not for us. */ return 0; } - if ((can_id->id & g_autosar_nm_can_id_mask) != (g_autosar_nm_can_id & g_autosar_nm_can_id_mask)) { + if ((can_info->id & g_autosar_nm_can_id_mask) != (g_autosar_nm_can_id & g_autosar_nm_can_id_mask)) { /* Id doesn't match. The frame is not for us. */ return 0; } |