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-btsdp.c | |
| parent | baea677290f84d4e30e86194c79bafef0fdc1ad2 (diff) | |
| download | wireshark-bc5a0374bfd162d08834f5f7503bebd33d8ec943.tar.gz | |
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-btsdp.c')
| -rw-r--r-- | epan/dissectors/packet-btsdp.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/epan/dissectors/packet-btsdp.c b/epan/dissectors/packet-btsdp.c index f03aedcb72..0b611bbd64 100644 --- a/epan/dissectors/packet-btsdp.c +++ b/epan/dissectors/packet-btsdp.c @@ -1158,7 +1158,7 @@ get_uuids(packet_info *pinfo, guint32 record_handle, btl2cap_data_t *l2cap_data) adapter_id = l2cap_data->adapter_id; chandle = l2cap_data->chandle; psm = l2cap_data->psm; - frame_number = pinfo->fd->num; + frame_number = pinfo->num; k_interface_id = interface_id; k_adapter_id = adapter_id; @@ -1239,7 +1239,7 @@ save_channel(packet_info *pinfo, guint32 type_protocol, guint32 channel, k_bd_addr_id = service_info->bd_addr_id; k_service_type = service_info->type; k_service_channel = service_info->channel; - k_frame_number = pinfo->fd->num; + k_frame_number = pinfo->num; key[0].length = 1; key[0].key = &k_interface_id; @@ -1467,7 +1467,7 @@ reassemble_continuation_state(tvbuff_t *tvb, packet_info *pinfo, adapter_id = l2cap_data->adapter_id; chandle = l2cap_data->chandle; psm = l2cap_data->psm; - frame_number = pinfo->fd->num; + frame_number = pinfo->num; k_interface_id = interface_id; k_adapter_id = adapter_id; @@ -3992,7 +3992,7 @@ dissect_sdp_service_attribute_list(proto_tree *tree, tvbuff_t *tvb, gint offset, k_bd_addr_id = service_info->bd_addr_id; k_service_type = service_info->type; k_service_channel = service_info->channel; - k_frame_number = pinfo->fd->num; + k_frame_number = pinfo->num; key[0].length = 1; key[0].key = &k_interface_id; @@ -4196,7 +4196,7 @@ dissect_sdp_service_search_response(proto_tree *tree, tvbuff_t *tvb, adapter_id = l2cap_data->adapter_id; chandle = l2cap_data->chandle; psm = l2cap_data->psm; - frame_number = pinfo->fd->num; + frame_number = pinfo->num; k_interface_id = interface_id; k_adapter_id = adapter_id; |