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-kafka.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-kafka.c')
-rw-r--r-- | epan/dissectors/packet-kafka.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/epan/dissectors/packet-kafka.c b/epan/dissectors/packet-kafka.c index 7f1b7527a3..9f8a29569f 100644 --- a/epan/dissectors/packet-kafka.c +++ b/epan/dissectors/packet-kafka.c @@ -890,7 +890,7 @@ dissect_kafka(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U matcher = wmem_new(wmem_file_scope(), kafka_query_response_t); matcher->api_key = tvb_get_ntohs(tvb, offset); - matcher->request_frame = PINFO_FD_NUM(pinfo); + matcher->request_frame = pinfo->num; matcher->response_found = FALSE; p_add_proto_data(wmem_file_scope(), pinfo, proto_kafka, 0, matcher); @@ -960,7 +960,7 @@ dissect_kafka(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U if (wmem_queue_count(match_queue) > 0) { matcher = (kafka_query_response_t *) wmem_queue_peek(match_queue); } - if (matcher == NULL || matcher->request_frame >= PINFO_FD_NUM(pinfo)) { + if (matcher == NULL || matcher->request_frame >= pinfo->num) { col_set_str(pinfo->cinfo, COL_INFO, "Kafka Response (Unknown API, Missing Request)"); /* TODO: expert info, don't have request, can't dissect */ return tvb_captured_length(tvb); @@ -968,7 +968,7 @@ dissect_kafka(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U wmem_queue_pop(match_queue); - matcher->response_frame = PINFO_FD_NUM(pinfo); + matcher->response_frame = pinfo->num; matcher->response_found = TRUE; p_add_proto_data(wmem_file_scope(), pinfo, proto_kafka, 0, matcher); |