diff options
| author | Michael Mann <mmann78@netscape.net> | 2014-06-19 17:18:16 +0000 |
|---|---|---|
| committer | Michael Mann <mmann78@netscape.net> | 2014-06-19 18:25:59 +0000 |
| commit | 14824e6adf07a1c3cfb6537ce8723d873ecd0d0f (patch) | |
| tree | bdf1b52ecffe7825d719f34fb4be63c8a60bd1b4 /epan/dissectors/packet-kafka.c | |
| parent | 3557ac4ec688b86ec7819005a3a181600e056251 (diff) | |
Revert "Fixup: tvb_* -> tvb_captured"
https://www.wireshark.org/lists/wireshark-dev/201406/msg00131.html
This reverts commit 246fe2ca4c67d8c98caa84e2f57694f6322e2f96.
Change-Id: Ib24bae0198c13a84bd7f731bf4af921212109a8f
Reviewed-on: https://code.wireshark.org/review/2430
Reviewed-by: Michael Mann <mmann78@netscape.net>
Diffstat (limited to 'epan/dissectors/packet-kafka.c')
| -rw-r--r-- | epan/dissectors/packet-kafka.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/epan/dissectors/packet-kafka.c b/epan/dissectors/packet-kafka.c index aeeea859b1..1ae8649a49 100644 --- a/epan/dissectors/packet-kafka.c +++ b/epan/dissectors/packet-kafka.c @@ -271,16 +271,16 @@ dissect_kafka_message(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, int s offset += 4; if (raw) { - payload = tvb_child_uncompress(tvb, raw, 0, tvb_captured_length(raw)); + payload = tvb_child_uncompress(tvb, raw, 0, tvb_length(raw)); if (payload) { add_new_data_source(pinfo, payload, "Uncompressed Message"); dissect_kafka_message_set(payload, pinfo, subtree, 0); } else { /* TODO make this an expert item */ - proto_tree_add_text(subtree, tvb, 0, tvb_captured_length(raw), "[Failed to decompress message!]"); + proto_tree_add_text(subtree, tvb, 0, tvb_length(raw), "[Failed to decompress message!]"); proto_tree_add_item(subtree, hf_kafka_message_value, raw, 0, -1, ENC_NA); } - offset += tvb_captured_length(raw); + offset += tvb_length(raw); } else { proto_tree_add_bytes(subtree, hf_kafka_message_value, tvb, offset, 0, NULL); @@ -864,7 +864,7 @@ dissect_kafka(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U if (wmem_queue_count(match_queue) == 0) { 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); + return tvb_length(tvb); } matcher = (kafka_query_response_t *) wmem_queue_pop(match_queue); @@ -904,7 +904,7 @@ dissect_kafka(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U } - return tvb_captured_length(tvb); + return tvb_length(tvb); } static int @@ -914,7 +914,7 @@ dissect_kafka_tcp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, tcp_dissect_pdus(tvb, pinfo, tree, TRUE, 4, get_kafka_pdu_len, dissect_kafka, data); - return tvb_captured_length(tvb); + return tvb_length(tvb); } void |