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-bthsp.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-bthsp.c')
| -rw-r--r-- | epan/dissectors/packet-bthsp.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/epan/dissectors/packet-bthsp.c b/epan/dissectors/packet-bthsp.c index ada292a3f5..4e531f6900 100644 --- a/epan/dissectors/packet-bthsp.c +++ b/epan/dissectors/packet-bthsp.c @@ -521,7 +521,7 @@ dissect_at_command(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, adapter_id = adapter_id; chandle = chandle; dlci = dlci; - frame_number = pinfo->fd->num; + frame_number = pinfo->num; key[0].length = 1; @@ -543,7 +543,7 @@ dissect_at_command(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, cmd->chandle = chandle; cmd->dlci = dlci; - cmd->frame_number = pinfo->fd->num; + cmd->frame_number = pinfo->num; cmd->status = STATUS_NO_RESPONSE; cmd->time = pinfo->abs_ts; cmd->at_command @@ -718,7 +718,7 @@ dissect_bthsp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data) service_type = BTSDP_RFCOMM_PROTOCOL_UUID; service_channel = dlci >> 1; - frame_number = pinfo->fd->num; + frame_number = pinfo->num; key[0].length = 1; key[0].key = &interface_id; @@ -776,7 +776,7 @@ dissect_bthsp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data) /* save fragments */ if (!pinfo->fd->flags.visited) { - frame_number = pinfo->fd->num - 1; + frame_number = pinfo->num - 1; key[0].length = 1; key[0].key = &interface_id; @@ -803,7 +803,7 @@ dissect_bthsp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data) previous_fragment = NULL; } - frame_number = pinfo->fd->num; + frame_number = pinfo->num; key[0].length = 1; key[0].key = &interface_id; @@ -856,7 +856,7 @@ dissect_bthsp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data) reassemble_start_offset = i_length + 1; } - frame_number = pinfo->fd->num; + frame_number = pinfo->num; key[0].length = 1; key[0].key = &interface_id; @@ -918,7 +918,7 @@ dissect_bthsp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data) } /* recover reassembled payload */ - frame_number = pinfo->fd->num; + frame_number = pinfo->num; key[0].length = 1; key[0].key = &interface_id; |