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-iso14443.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-iso14443.c')
-rw-r--r-- | epan/dissectors/packet-iso14443.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/epan/dissectors/packet-iso14443.c b/epan/dissectors/packet-iso14443.c index 07b0444f9d..18c1736f74 100644 --- a/epan/dissectors/packet-iso14443.c +++ b/epan/dissectors/packet-iso14443.c @@ -850,8 +850,8 @@ iso14443_get_transaction(packet_info *pinfo, proto_tree *tree) if (pinfo->p2p_dir == P2P_DIR_SENT) { if (PINFO_FD_VISITED(pinfo)) { iso14443_trans = (iso14443_transaction_t *)wmem_tree_lookup32( - transactions, PINFO_FD_NUM(pinfo)); - if (iso14443_trans && iso14443_trans->rqst_frame==PINFO_FD_NUM(pinfo) && + transactions, pinfo->num); + if (iso14443_trans && iso14443_trans->rqst_frame==pinfo->num && iso14443_trans->resp_frame!=0) { it = proto_tree_add_uint(tree, hf_iso14443_resp_in, NULL, 0, 0, iso14443_trans->resp_frame); @@ -860,7 +860,7 @@ iso14443_get_transaction(packet_info *pinfo, proto_tree *tree) } else { iso14443_trans = wmem_new(wmem_file_scope(), iso14443_transaction_t); - iso14443_trans->rqst_frame = PINFO_FD_NUM(pinfo); + iso14443_trans->rqst_frame = pinfo->num; iso14443_trans->resp_frame = 0; /* iso14443_trans->ctrl = ctrl; */ wmem_tree_insert32(transactions, @@ -869,13 +869,13 @@ iso14443_get_transaction(packet_info *pinfo, proto_tree *tree) } else if (pinfo->p2p_dir == P2P_DIR_RECV) { iso14443_trans = (iso14443_transaction_t *)wmem_tree_lookup32_le( - transactions, PINFO_FD_NUM(pinfo)); + transactions, pinfo->num); if (iso14443_trans && iso14443_trans->resp_frame==0) { /* there's a pending request, this packet is the response */ - iso14443_trans->resp_frame = PINFO_FD_NUM(pinfo); + iso14443_trans->resp_frame = pinfo->num; } - if (iso14443_trans && iso14443_trans->resp_frame == PINFO_FD_NUM(pinfo)) { + if (iso14443_trans && iso14443_trans->resp_frame == pinfo->num) { it = proto_tree_add_uint(tree, hf_iso14443_resp_to, NULL, 0, 0, iso14443_trans->rqst_frame); PROTO_ITEM_SET_GENERATED(it); |