diff options
| author | Michael Mann <mmann78@netscape.net> | 2014-07-04 11:51:09 -0400 |
|---|---|---|
| committer | Michael Mann <mmann78@netscape.net> | 2014-07-04 16:46:14 +0000 |
| commit | 93517043e96c26a1d3dad49c2f57b345e3bbbba0 (patch) | |
| tree | 6cde4e700e2ceffdc055051d6b97bb5df7644c70 /epan/dissectors/packet-ntlmssp.c | |
| parent | dd424c622581310b4d0d79bc57137f03d2573752 (diff) | |
convert to proto_tree_add_subtree[_format]
Change-Id: Idd1b20ab32c0960ea52c6f3bc5346462c37c5684
Reviewed-on: https://code.wireshark.org/review/2853
Reviewed-by: Michael Mann <mmann78@netscape.net>
Diffstat (limited to 'epan/dissectors/packet-ntlmssp.c')
| -rw-r--r-- | epan/dissectors/packet-ntlmssp.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/epan/dissectors/packet-ntlmssp.c b/epan/dissectors/packet-ntlmssp.c index 1e7d154e31..726ed3dde9 100644 --- a/epan/dissectors/packet-ntlmssp.c +++ b/epan/dissectors/packet-ntlmssp.c @@ -1295,10 +1295,9 @@ dissect_ntlmssp_target_info_list(tvbuff_t *tvb, packet_info *pinfo, proto_tree * content_offset = len_offset + 2; item_length = content_length + 4; - target_info_tf = proto_tree_add_text(tree, tvb, item_offset, item_length, "Attribute: %s", - val_to_str_ext(item_type, &ntlm_name_types_ext, "Unknown (%d)")); + target_info_tree = proto_tree_add_subtree_format(tree, tvb, item_offset, item_length, *tif_p->ett, &target_info_tf, + "Attribute: %s", val_to_str_ext(item_type, &ntlm_name_types_ext, "Unknown (%d)")); - target_info_tree = proto_item_add_subtree (target_info_tf, *tif_p->ett); proto_tree_add_item (target_info_tree, *tif_p->hf_item_type, tvb, type_offset, 2, ENC_LITTLE_ENDIAN); proto_tree_add_item (target_info_tree, *tif_p->hf_item_length, tvb, len_offset, 2, ENC_LITTLE_ENDIAN); @@ -2241,7 +2240,6 @@ decrypt_verifier(tvbuff_t *tvb, int offset, guint32 encrypted_block_length, packet_info *pinfo, proto_tree *tree, gpointer key) { proto_tree *decr_tree; - proto_item *tf; conversation_t *conversation; guint8* sign_key; rc4_state_struct *rc4_state; @@ -2368,11 +2366,11 @@ decrypt_verifier(tvbuff_t *tvb, int offset, guint32 encrypted_block_length, "Decrypted NTLMSSP Verifier"); /* Show the decrypted payload in the tree */ - tf = proto_tree_add_text(tree, decr_tvb, 0, -1, + decr_tree = proto_tree_add_subtree_format(tree, decr_tvb, 0, -1, + ett_ntlmssp, NULL, "Decrypted Verifier (%d byte%s)", encrypted_block_length, plurality(encrypted_block_length, "", "s")); - decr_tree = proto_item_add_subtree (tf, ett_ntlmssp); if (( conv_ntlmssp_info->flags & NTLMSSP_NEGOTIATE_EXTENDED_SECURITY)) { proto_tree_add_item (decr_tree, hf_ntlmssp_verf_hmacmd5, |