diff options
| author | Michael Mann <mmann78@netscape.net> | 2015-05-21 22:20:29 -0400 |
|---|---|---|
| committer | Anders Broman <a.broman58@gmail.com> | 2015-05-27 11:02:30 +0000 |
| commit | 4963c772852134b75561290d152be2acbe0597d9 (patch) | |
| tree | c6e6f2f683587e58aea96355cdadd2472215c4c4 /epan/dissectors/packet-telnet.c | |
| parent | a25c46bc7b3d2ba2a3674cdcf9cfc1cc79bfc022 (diff) | |
Convert proto_tree_add_boolean to proto_tree_add_bitmask_[value|value_with_flags|list]
Final part.
While there change deprecated tvb_length-xxx() calls
Change-Id: I8b0cf823c2d37a92c58fcb653f7fe1e8fdad5a79
Reviewed-on: https://code.wireshark.org/review/8642
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Diffstat (limited to 'epan/dissectors/packet-telnet.c')
| -rw-r--r-- | epan/dissectors/packet-telnet.c | 21 |
1 files changed, 11 insertions, 10 deletions
diff --git a/epan/dissectors/packet-telnet.c b/epan/dissectors/packet-telnet.c index 381047ea05..af8dcacb15 100644 --- a/epan/dissectors/packet-telnet.c +++ b/epan/dissectors/packet-telnet.c @@ -979,15 +979,16 @@ static const value_string auth_krb5_types[] = { static void dissect_authentication_type_pair(packet_info *pinfo _U_, tvbuff_t *tvb, int offset, proto_tree *tree) { - guint8 mod; + static const int * auth_mods[] = { + &hf_telnet_auth_mod_enc, + &hf_telnet_auth_mod_cred_fwd, + &hf_telnet_auth_mod_how, + &hf_telnet_auth_mod_who, + NULL + }; proto_tree_add_item(tree, hf_telnet_auth_type, tvb, offset, 1, ENC_BIG_ENDIAN); - - mod=tvb_get_guint8(tvb, offset+1); - proto_tree_add_uint(tree, hf_telnet_auth_mod_enc, tvb, offset+1, 1, mod); - proto_tree_add_boolean(tree, hf_telnet_auth_mod_cred_fwd, tvb, offset+1, 1, mod); - proto_tree_add_boolean(tree, hf_telnet_auth_mod_how, tvb, offset+1, 1, mod); - proto_tree_add_boolean(tree, hf_telnet_auth_mod_who, tvb, offset+1, 1, mod); + proto_tree_add_bitmask_list(tree, tvb, offset+1, 1, auth_mods, ENC_BIG_ENDIAN); } /* no kerberos blobs are ever >10kb ? (arbitrary limit) */ @@ -1556,7 +1557,7 @@ telnet_sub_option(packet_info *pinfo, proto_tree *option_tree, proto_item *optio /* Search for an unescaped IAC. */ cur_offset = offset; - len = tvb_length_remaining(tvb, offset); + len = tvb_reported_length_remaining(tvb, offset); do { iac_offset = tvb_find_guint8(tvb, cur_offset, len, TN_IAC); iac_found = TRUE; @@ -1783,7 +1784,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_length_remaining(tvb, iac_offset); + len = tvb_reported_length_remaining(tvb, iac_offset); } return iac_offset; } @@ -1812,7 +1813,7 @@ dissect_telnet(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) /* * Scan through the buffer looking for an IAC byte. */ - while ((len = tvb_length_remaining(tvb, offset)) > 0) { + while ((len = tvb_reported_length_remaining(tvb, offset)) > 0) { iac_offset = find_unescaped_iac(tvb, offset, len); if (iac_offset != -1) { /* |