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-cops.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-cops.c')
| -rw-r--r-- | epan/dissectors/packet-cops.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/epan/dissectors/packet-cops.c b/epan/dissectors/packet-cops.c index 1be2fcb337..d3aa455da3 100644 --- a/epan/dissectors/packet-cops.c +++ b/epan/dissectors/packet-cops.c @@ -1058,7 +1058,7 @@ dissect_cops_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data cops_call = wmem_new(wmem_file_scope(), cops_call_t); cops_call->op_code = op_code; cops_call->solicited = is_solicited; - cops_call->req_num = PINFO_FD_NUM(pinfo); + cops_call->req_num = pinfo->num; cops_call->rsp_num = 0; cops_call->req_time = pinfo->abs_ts; g_ptr_array_add(pdus_array, cops_call); @@ -1066,7 +1066,7 @@ dissect_cops_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data else { for (i=0; i < pdus_array->len; i++) { cops_call = (cops_call_t*)g_ptr_array_index(pdus_array, i); - if ( cops_call->req_num == PINFO_FD_NUM(pinfo) + if ( cops_call->req_num == pinfo->num && cops_call->rsp_num != 0) { ti = proto_tree_add_uint_format(cops_tree, hf_cops_response_in, tvb, 0, 0, cops_call->rsp_num, "Response to this request is in frame %u", cops_call->rsp_num); @@ -1104,7 +1104,7 @@ dissect_cops_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data op_code == COPS_MSG_CC) ) || ( (cops_call->op_code == COPS_MSG_KA && !(cops_call->solicited)) && (op_code == COPS_MSG_KA && is_solicited) ) ) { - cops_call->rsp_num = PINFO_FD_NUM(pinfo); + cops_call->rsp_num = pinfo->num; break; } } @@ -1112,7 +1112,7 @@ dissect_cops_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data else { for (i=0; i < pdus_array->len; i++) { cops_call = (cops_call_t*)g_ptr_array_index(pdus_array, i); - if ( cops_call->rsp_num == PINFO_FD_NUM(pinfo) ) { + if ( cops_call->rsp_num == pinfo->num ) { ti = proto_tree_add_uint_format(cops_tree, hf_cops_response_to, tvb, 0, 0, cops_call->req_num, "Response to a request in frame %u", cops_call->req_num); PROTO_ITEM_SET_GENERATED(ti); |