diff options
| author | Michael Mann <mmann78@netscape.net> | 2014-06-19 17:17:16 +0000 |
|---|---|---|
| committer | Michael Mann <mmann78@netscape.net> | 2014-06-19 17:23:41 +0000 |
| commit | daa70feddcd3ff35f2771b0b8c4e1be8e5a4e7ea (patch) | |
| tree | cc9a1f72f6c69ebd216dd795733f23a51963bbaa /epan/dissectors/packet-ssh.c | |
| parent | 46a808acf4e8c87b61169bfac00799857b38f1f0 (diff) | |
Revert "Fixup: tvb_ensure_length_remaining -> tvb_ensure_captured_length_remaining"
See https://www.wireshark.org/lists/wireshark-dev/201406/msg00131.html
This reverts commit 021e7afc9fcba09094d0e2143cc434a34e3b09dc.
Change-Id: I0640eabce5ce8c4ff3a88ebf848b499f8bb8ed2f
Reviewed-on: https://code.wireshark.org/review/2429
Reviewed-by: Michael Mann <mmann78@netscape.net>
Diffstat (limited to 'epan/dissectors/packet-ssh.c')
| -rw-r--r-- | epan/dissectors/packet-ssh.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/epan/dissectors/packet-ssh.c b/epan/dissectors/packet-ssh.c index 000c0d7fab..6a81252b3b 100644 --- a/epan/dissectors/packet-ssh.c +++ b/epan/dissectors/packet-ssh.c @@ -501,12 +501,12 @@ ssh_dissect_ssh1(tvbuff_t *tvb, packet_info *pinfo, } /* - * We use "tvb_ensure_captured_length_remaining()" to make sure there + * We use "tvb_ensure_length_remaining()" to make sure there * actually *is* data remaining. * * This means we're guaranteed that "remain_length" is positive. */ - remain_length = tvb_ensure_captured_length_remaining(tvb, offset); + remain_length = tvb_ensure_length_remaining(tvb, offset); /* * Can we do reassembly? */ @@ -645,12 +645,12 @@ ssh_dissect_key_exchange(tvbuff_t *tvb, packet_info *pinfo, struct ssh_peer_data *peer_data = &global_data->peer_data[is_response]; /* - * We use "tvb_ensure_captured_length_remaining()" to make sure there + * We use "tvb_ensure_length_remaining()" to make sure there * actually *is* data remaining. * * This means we're guaranteed that "remain_length" is positive. */ - remain_length = tvb_ensure_captured_length_remaining(tvb, offset); + remain_length = tvb_ensure_length_remaining(tvb, offset); /* * Can we do reassembly? */ @@ -905,12 +905,12 @@ ssh_dissect_protocol(tvbuff_t *tvb, packet_info *pinfo, } /* - * We use "tvb_ensure_captured_length_remaining()" to make sure there + * We use "tvb_ensure_length_remaining()" to make sure there * actually *is* data remaining. * * This means we're guaranteed that "remain_length" is positive. */ - remain_length = tvb_ensure_captured_length_remaining(tvb, offset); + remain_length = tvb_ensure_length_remaining(tvb, offset); /*linelen = tvb_find_line_end(tvb, offset, -1, &next_offset, FALSE); */ linelen = tvb_find_guint8(tvb, offset, -1, '\n'); |