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-bluetooth.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-bluetooth.c')
| -rw-r--r-- | epan/dissectors/packet-bluetooth.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/epan/dissectors/packet-bluetooth.c b/epan/dissectors/packet-bluetooth.c index ffeee8bce8..e9e2787cae 100644 --- a/epan/dissectors/packet-bluetooth.c +++ b/epan/dissectors/packet-bluetooth.c @@ -1489,7 +1489,7 @@ save_local_device_name_from_eir_ad(tvbuff_t *tvb, gint offset, packet_info *pinf k_interface_id = bluetooth_data->interface_id; k_adapter_id = bluetooth_data->adapter_id; - k_frame_number = pinfo->fd->num; + k_frame_number = pinfo->num; key[0].length = 1; key[0].key = &k_interface_id; @@ -1575,7 +1575,7 @@ get_conversation(packet_info *pinfo, { conversation_t *conversation; - conversation = find_conversation(pinfo->fd->num, + conversation = find_conversation(pinfo->num, src_addr, dst_addr, pinfo->ptype, src_endpoint, dst_endpoint, 0); @@ -1583,7 +1583,7 @@ get_conversation(packet_info *pinfo, return conversation; } - conversation = conversation_new(pinfo->fd->num, + conversation = conversation_new(pinfo->num, src_addr, dst_addr, pinfo->ptype, src_endpoint, dst_endpoint, 0); |