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-telnet.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-telnet.c')
-rw-r--r-- | epan/dissectors/packet-telnet.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/epan/dissectors/packet-telnet.c b/epan/dissectors/packet-telnet.c index 4eff6ddb7d..8274beff16 100644 --- a/epan/dissectors/packet-telnet.c +++ b/epan/dissectors/packet-telnet.c @@ -1545,7 +1545,7 @@ telnet_sub_option(packet_info *pinfo, proto_tree *option_tree, proto_item *optio /* Search for an unescaped IAC. */ cur_offset = offset; - len = tvb_captured_length_remaining(tvb, offset); + len = tvb_length_remaining(tvb, offset); do { iac_offset = tvb_find_guint8(tvb, cur_offset, len, TN_IAC); iac_found = TRUE; @@ -1775,7 +1775,7 @@ static int find_unescaped_iac(tvbuff_t *tvb, int offset, int len) (tvb_get_guint8(tvb, iac_offset + 1) == TN_IAC)) { iac_offset+=2; - len = tvb_captured_length_remaining(tvb, iac_offset); + len = tvb_length_remaining(tvb, iac_offset); } return iac_offset; } @@ -1804,7 +1804,7 @@ dissect_telnet(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) /* * Scan through the buffer looking for an IAC byte. */ - while ((len = tvb_captured_length_remaining(tvb, offset)) > 0) { + while ((len = tvb_length_remaining(tvb, offset)) > 0) { iac_offset = find_unescaped_iac(tvb, offset, len); if (iac_offset != -1) { /* |