From 4a976f1be7f36414ae9736983f5075456e11ac40 Mon Sep 17 00:00:00 2001 From: Bill Meier Date: Tue, 13 Dec 2011 04:01:33 +0000 Subject: Use tvb_new_child_real_data() instead of tvb_new_real_data() + tvb_set_child_real_data_tvbuff(). svn path=/trunk/; revision=40173 --- epan/dissectors/packet-bmc.c | 3 +-- epan/dissectors/packet-ieee802154.c | 3 +-- epan/dissectors/packet-isakmp.c | 3 +-- epan/dissectors/packet-ntlmssp.c | 7 +++---- epan/dissectors/packet-opensafety.c | 3 +-- epan/dissectors/packet-rlc.c | 3 +-- epan/dissectors/packet-smb.c | 5 ++--- 7 files changed, 10 insertions(+), 17 deletions(-) diff --git a/epan/dissectors/packet-bmc.c b/epan/dissectors/packet-bmc.c index e4a5edf17c..645f7b1d2f 100644 --- a/epan/dissectors/packet-bmc.c +++ b/epan/dissectors/packet-bmc.c @@ -109,8 +109,7 @@ dissect_bmc(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) *p_rev = BIT_SWAP(*p_rev); /* Make this new buffer part of the display and provide a way to dispose of it */ - bit_reversed_tvb = tvb_new_real_data(reversing_buffer, len, len); - tvb_set_child_real_data_tvbuff(tvb, bit_reversed_tvb); + bit_reversed_tvb = tvb_new_child_real_data(tvb, reversing_buffer, len, len); add_new_data_source(pinfo, bit_reversed_tvb, "Bit-reversed Data"); message_type = tvb_get_guint8(bit_reversed_tvb, offset); diff --git a/epan/dissectors/packet-ieee802154.c b/epan/dissectors/packet-ieee802154.c index 3d947bb1d7..4baaac4bef 100644 --- a/epan/dissectors/packet-ieee802154.c +++ b/epan/dissectors/packet-ieee802154.c @@ -1900,8 +1900,7 @@ dissect_ieee802154_decrypt(tvbuff_t * tvb, guint offset, packet_info * pinfo, ie } /* Create a tvbuff for the plaintext. */ - ptext_tvb = tvb_new_real_data(text, captured_len, reported_len); - tvb_set_child_real_data_tvbuff(tvb, ptext_tvb); + ptext_tvb = tvb_new_child_real_data(tvb, text, captured_len, reported_len); add_new_data_source(pinfo, ptext_tvb, "Decrypted IEEE 802.15.4 payload"); *status = DECRYPT_PACKET_SUCCEEDED; } diff --git a/epan/dissectors/packet-isakmp.c b/epan/dissectors/packet-isakmp.c index ecf740735e..38781b4ac9 100644 --- a/epan/dissectors/packet-isakmp.c +++ b/epan/dissectors/packet-isakmp.c @@ -4660,9 +4660,8 @@ dissect_enc(tvbuff_t *tvb, gcry_cipher_close(cipher_hd); } - decr_tvb = tvb_new_real_data(decr_data, decr_data_len, decr_data_len); + decr_tvb = tvb_new_child_real_data(tvb, decr_data, decr_data_len, decr_data_len); tvb_set_free_cb(decr_tvb, g_free); - tvb_set_child_real_data_tvbuff(tvb, decr_tvb); add_new_data_source(pinfo, decr_tvb, "Decrypted Data"); item = proto_tree_add_item(tree, hf_isakmp_enc_decrypted_data, decr_tvb, 0, decr_data_len, ENC_NA); proto_item_append_text(item, " (%d byte%s)", decr_data_len, plurality(decr_data_len, "", "s")); diff --git a/epan/dissectors/packet-ntlmssp.c b/epan/dissectors/packet-ntlmssp.c index 4a2dae064b..ec1c4052ce 100644 --- a/epan/dissectors/packet-ntlmssp.c +++ b/epan/dissectors/packet-ntlmssp.c @@ -2106,11 +2106,10 @@ decrypt_data_payload(tvbuff_t *tvb, int offset, guint32 encrypted_block_length, } /* Show the decrypted buffer in a new window */ - decr_tvb = tvb_new_real_data(packet_ntlmssp_info->decrypted_payload, - encrypted_block_length, - encrypted_block_length); + decr_tvb = tvb_new_child_real_data(tvb, packet_ntlmssp_info->decrypted_payload, + encrypted_block_length, + encrypted_block_length); - tvb_set_child_real_data_tvbuff(tvb, decr_tvb); pinfo->gssapi_decrypted_tvb = decr_tvb; } diff --git a/epan/dissectors/packet-opensafety.c b/epan/dissectors/packet-opensafety.c index 3554c8a8f6..c03f442c71 100644 --- a/epan/dissectors/packet-opensafety.c +++ b/epan/dissectors/packet-opensafety.c @@ -1182,8 +1182,7 @@ opensafety_package_dissector(const gchar * protocolName, const gchar * sub_diss_ /* Freeing memory before dissector, as otherwise we would waste it */ if ( do_byte_swap == TRUE && global_mbtcp_big_endian == TRUE ) { - next_tvb = tvb_new_real_data(&bytes[frameOffset], (frameLength), reported_len); - tvb_set_child_real_data_tvbuff(message_tvb, next_tvb); + next_tvb = tvb_new_child_real_data(message_tvb, &bytes[frameOffset], (frameLength), reported_len); /* Adding a visual aid to the dissector tree */ add_new_data_source(pinfo, next_tvb, "openSAFETY Frame (Swapped)"); } diff --git a/epan/dissectors/packet-rlc.c b/epan/dissectors/packet-rlc.c index 43dc7dc729..fb4c26559c 100644 --- a/epan/dissectors/packet-rlc.c +++ b/epan/dissectors/packet-rlc.c @@ -844,8 +844,7 @@ get_reassembled_data(enum rlc_mode mode, tvbuff_t *tvb, packet_info *pinfo, frag = frag->next; } } - sdu->tvb = tvb_new_real_data(sdu->data, sdu->len, sdu->len); - tvb_set_child_real_data_tvbuff(tvb, sdu->tvb); + sdu->tvb = tvb_new_child_real_data(tvb, sdu->data, sdu->len, sdu->len); add_new_data_source(pinfo, sdu->tvb, "Reassembled RLC Message"); /* reassembly happened here, so create the fragment list */ diff --git a/epan/dissectors/packet-smb.c b/epan/dissectors/packet-smb.c index 962f47f3a3..637938c038 100644 --- a/epan/dissectors/packet-smb.c +++ b/epan/dissectors/packet-smb.c @@ -9536,9 +9536,8 @@ dissect_nt_transaction_response(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tre if(r_fd){ proto_item *frag_tree_item; - pd_tvb = tvb_new_real_data(r_fd->data, r_fd->datalen, - r_fd->datalen); - tvb_set_child_real_data_tvbuff(tvb, pd_tvb); + pd_tvb = tvb_new_child_real_data(tvb, r_fd->data, r_fd->datalen, + r_fd->datalen); add_new_data_source(pinfo, pd_tvb, "Reassembled SMB"); show_fragment_tree(r_fd, &smb_frag_items, tree, pinfo, pd_tvb, &frag_tree_item); -- cgit v1.2.1