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/file-btsnoop.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/file-btsnoop.c')
-rw-r--r-- | epan/dissectors/file-btsnoop.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/epan/dissectors/file-btsnoop.c b/epan/dissectors/file-btsnoop.c index d1b0fe9023..7275afe7eb 100644 --- a/epan/dissectors/file-btsnoop.c +++ b/epan/dissectors/file-btsnoop.c @@ -192,7 +192,7 @@ dissect_btsnoop(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data if (pref_dissect_next_layer) switch (datalink) {\ case 1001: /* H1 */ - pinfo->fd->num = frame_number; + pinfo->num = frame_number; pinfo->abs_ts = timestamp; pinfo->pseudo_header->bthci.sent = (flags & 0x01) ? FALSE : TRUE; @@ -209,7 +209,7 @@ dissect_btsnoop(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data call_dissector(hci_h1_handle, next_tvb, pinfo, payload_tree); break; case 1002: /* H4 */ - pinfo->fd->num = frame_number; + pinfo->num = frame_number; pinfo->abs_ts = timestamp; pinfo->p2p_dir = (flags & 0x01) ? P2P_DIR_RECV : P2P_DIR_SENT; @@ -217,7 +217,7 @@ dissect_btsnoop(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data call_dissector(hci_h4_handle, next_tvb, pinfo, payload_tree); break; case 2001: /* Linux Monitor */ - pinfo->fd->num = frame_number; + pinfo->num = frame_number; pinfo->abs_ts = timestamp; pinfo->pseudo_header->btmon.opcode = flags & 0xFFFF; |