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-diameter.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-diameter.c')
| -rw-r--r-- | epan/dissectors/packet-diameter.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/epan/dissectors/packet-diameter.c b/epan/dissectors/packet-diameter.c index 1dd852ed6d..721a5b8695 100644 --- a/epan/dissectors/packet-diameter.c +++ b/epan/dissectors/packet-diameter.c @@ -1342,22 +1342,22 @@ dissect_diameter_common(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, voi diameter_pair->cmd_code = cmd; diameter_pair->result_code = 0; diameter_pair->cmd_str = cmd_str; - diameter_pair->req_frame = PINFO_FD_NUM(pinfo); + diameter_pair->req_frame = pinfo->num; diameter_pair->ans_frame = 0; diameter_pair->req_time = pinfo->abs_ts; - wmem_tree_insert32(pdus_tree, PINFO_FD_NUM(pinfo), (void *)diameter_pair); + wmem_tree_insert32(pdus_tree, pinfo->num, (void *)diameter_pair); } else { /* Look for a request which occurs earlier in the trace than this answer. */ - diameter_pair = (diameter_req_ans_pair_t *)wmem_tree_lookup32_le(pdus_tree, PINFO_FD_NUM(pinfo)); + diameter_pair = (diameter_req_ans_pair_t *)wmem_tree_lookup32_le(pdus_tree, pinfo->num); /* Verify the end-to-end-id matches before declaring a match */ if (diameter_pair && diameter_pair->end_to_end_id == end_to_end_id) { - diameter_pair->ans_frame = PINFO_FD_NUM(pinfo); + diameter_pair->ans_frame = pinfo->num; } } } else { /* Look for a request which occurs earlier in the trace than this answer. */ - diameter_pair = (diameter_req_ans_pair_t *)wmem_tree_lookup32_le(pdus_tree, PINFO_FD_NUM(pinfo)); + diameter_pair = (diameter_req_ans_pair_t *)wmem_tree_lookup32_le(pdus_tree, pinfo->num); /* If the end-to-end ID doesn't match then this is not the request we were * looking for. |