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-icep.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-icep.c')
| -rw-r--r-- | epan/dissectors/packet-icep.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/epan/dissectors/packet-icep.c b/epan/dissectors/packet-icep.c index 6a3049257e..a59e85b453 100644 --- a/epan/dissectors/packet-icep.c +++ b/epan/dissectors/packet-icep.c @@ -891,7 +891,7 @@ static void dissect_icep_reply(tvbuff_t *tvb, guint32 offset, DBG1("consumed --> %d\n", 5); /* check if I got all reply data */ - tvb_data_remained = tvb_captured_length_remaining(tvb, offset); + tvb_data_remained = tvb_length_remaining(tvb, offset); messageSize = tvb_get_letohl(tvb, 10); reported_reply_data = messageSize - (ICEP_HEADER_SIZE + ICEP_MIN_REPLY_SIZE); @@ -1001,17 +1001,17 @@ static int dissect_icep_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, switch(tvb_get_guint8(tvb, 8)) { case 0x0: DBG1("request message body: parsing %d bytes\n", - tvb_captured_length_remaining(tvb, offset)); + tvb_length_remaining(tvb, offset)); dissect_icep_request(tvb, offset, pinfo, icep_tree, ti); break; case 0x1: DBG1("batch request message body: parsing %d bytes\n", - tvb_captured_length_remaining(tvb, offset)); + tvb_length_remaining(tvb, offset)); dissect_icep_batch_request(tvb, offset, pinfo, icep_tree, ti); break; case 0x2: DBG1("reply message body: parsing %d bytes\n", - tvb_captured_length_remaining(tvb, offset)); + tvb_length_remaining(tvb, offset)); dissect_icep_reply(tvb, offset, pinfo, icep_tree, ti); break; case 0x3: @@ -1022,7 +1022,7 @@ static int dissect_icep_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, expert_add_info_format(pinfo, msg_item, &ei_icep_message_type, "Unknown Message Type: 0x%02x", tvb_get_guint8(tvb, 8)); break; } - return tvb_captured_length(tvb); + return tvb_length(tvb); } /* entry point */ |