diff options
| author | Guy Harris <guy@alum.mit.edu> | 2016-01-23 19:40:51 -0800 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2016-01-24 03:41:28 +0000 |
| commit | bc5a0374bfd162d08834f5f7503bebd33d8ec943 (patch) | |
| tree | 6d5be93a3e35c6eb144ce6d2b1d95650b5cbbd86 /epan/dissectors/packet-rfid-pn532.c | |
| parent | baea677290f84d4e30e86194c79bafef0fdc1ad2 (diff) | |
Add the packet number to the packet_info structure, and use it.
That removes most of the uses of the frame number field in the
frame_data structure.
Change-Id: Ie22e4533e87f8360d7c0a61ca6ffb796cc233f22
Reviewed-on: https://code.wireshark.org/review/13509
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Diffstat (limited to 'epan/dissectors/packet-rfid-pn532.c')
| -rw-r--r-- | epan/dissectors/packet-rfid-pn532.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/epan/dissectors/packet-rfid-pn532.c b/epan/dissectors/packet-rfid-pn532.c index 41d1dd13a7..0b9c004c1c 100644 --- a/epan/dissectors/packet-rfid-pn532.c +++ b/epan/dissectors/packet-rfid-pn532.c @@ -662,7 +662,7 @@ dissect_pn532(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data) k_bus_id = bus_id; k_device_address = device_address; k_endpoint = endpoint; - k_frame_number = pinfo->fd->num; + k_frame_number = pinfo->num; key[0].length = 1; key[0].key = &k_bus_id; @@ -682,7 +682,7 @@ dissect_pn532(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data) command_data->endpoint = endpoint; command_data->command = cmd; - command_data->command_frame_number = pinfo->fd->num; + command_data->command_frame_number = pinfo->num; command_data->response_frame_number = 0; wmem_tree_insert32_array(command_info, key, command_data); @@ -690,7 +690,7 @@ dissect_pn532(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data) k_bus_id = bus_id; k_device_address = device_address; k_endpoint = endpoint; - k_frame_number = pinfo->fd->num; + k_frame_number = pinfo->num; key[0].length = 1; key[0].key = &k_bus_id; @@ -712,13 +712,13 @@ dissect_pn532(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data) wmem_tree = (wmem_tree_t *) wmem_tree_lookup32_array(command_info, key); if (wmem_tree) { - command_data = (command_data_t *) wmem_tree_lookup32_le(wmem_tree, pinfo->fd->num); + command_data = (command_data_t *) wmem_tree_lookup32_le(wmem_tree, pinfo->num); if (command_data && (command_data->response_frame_number == 0 || - command_data->response_frame_number == pinfo->fd->num)) { + command_data->response_frame_number == pinfo->num)) { if (!pinfo->fd->flags.visited && command_data->response_frame_number == 0) { - command_data->response_frame_number = pinfo->fd->num; + command_data->response_frame_number = pinfo->num; } } |