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-rlogin.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-rlogin.c')
| -rw-r--r-- | epan/dissectors/packet-rlogin.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/epan/dissectors/packet-rlogin.c b/epan/dissectors/packet-rlogin.c index 1b921f86e6..b24112cfa4 100644 --- a/epan/dissectors/packet-rlogin.c +++ b/epan/dissectors/packet-rlogin.c @@ -122,7 +122,7 @@ rlogin_state_machine(rlogin_hash_entry_t *hash_info, tvbuff_t *tvb, packet_info } /* exit if no data */ - length = tvb_captured_length(tvb); + length = tvb_length(tvb); if (length == 0) { return; @@ -197,7 +197,7 @@ static void rlogin_display(rlogin_hash_entry_t *hash_info, rlogin_tree = proto_item_add_subtree(ti, ett_rlogin); /* Return if data empty */ - length = tvb_captured_length(tvb); + length = tvb_length(tvb); if (length == 0) { return; @@ -261,7 +261,7 @@ static void rlogin_display(rlogin_hash_entry_t *hash_info, /* First frame of conversation, assume user info... */ - info_len = tvb_captured_length_remaining(tvb, offset); + info_len = tvb_length_remaining(tvb, offset); if (info_len <= 0) return; @@ -421,7 +421,7 @@ dissect_rlogin(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data) } /* Work out packet content summary for display */ - length = tvb_captured_length(tvb); + length = tvb_length(tvb); if (length != 0) { /* Initial NULL byte represents part of connection handshake */ @@ -452,7 +452,7 @@ dissect_rlogin(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data) else { /* Show any text data in the frame */ - int bytes_to_copy = tvb_captured_length(tvb); + int bytes_to_copy = tvb_length(tvb); if (bytes_to_copy > 128) { /* Truncate to 128 bytes for display */ @@ -473,7 +473,7 @@ dissect_rlogin(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data) /* Dissect in detail */ rlogin_display(hash_info, tvb, pinfo, tree, tcpinfo); - return tvb_captured_length(tvb); + return tvb_length(tvb); } |