diff options
author | Dario Lombardo <lomato@gmail.com> | 2014-06-17 17:45:00 +0200 |
---|---|---|
committer | Anders Broman <a.broman58@gmail.com> | 2014-06-18 14:14:58 +0000 |
commit | 246fe2ca4c67d8c98caa84e2f57694f6322e2f96 (patch) | |
tree | 5f8651517a3423cce11c50e18371d8a73c3c7665 /epan/dissectors/packet-smb2.c | |
parent | 971ffd683ea23362bd8009567ff7860371e6e2cc (diff) |
Fixup: tvb_* -> tvb_captured
Change-Id: I9209c1271967405c34c1b6fa43e1726a4d3a5a3f
Reviewed-on: https://code.wireshark.org/review/2377
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Diffstat (limited to 'epan/dissectors/packet-smb2.c')
-rw-r--r-- | epan/dissectors/packet-smb2.c | 138 |
1 files changed, 69 insertions, 69 deletions
diff --git a/epan/dissectors/packet-smb2.c b/epan/dissectors/packet-smb2.c index aa4e3dc324..f50ff3292b 100644 --- a/epan/dissectors/packet-smb2.c +++ b/epan/dissectors/packet-smb2.c @@ -917,14 +917,14 @@ dissect_smb2_olb_string(packet_info *pinfo, proto_tree *parent_tree, tvbuff_t *t offset = olb->off; len = olb->len; off = olb->off; - bc = tvb_length_remaining(tvb, offset); + bc = tvb_captured_length_remaining(tvb, offset); /* sanity check */ tvb_ensure_bytes_exist(tvb, off, len); if (((off+len)<off) || ((off+len)>(off+tvb_reported_length_remaining(tvb, off)))) { - proto_tree_add_text(tree, tvb, offset, tvb_length_remaining(tvb, offset), + proto_tree_add_text(tree, tvb, offset, tvb_captured_length_remaining(tvb, offset), "Invalid offset/length. Malformed packet"); col_append_str(pinfo->cinfo, COL_INFO, " [Malformed packet]"); @@ -999,7 +999,7 @@ dissect_smb2_olb_buffer(packet_info *pinfo, proto_tree *parent_tree, tvbuff_t *t tvb_ensure_bytes_exist(tvb, off, len); if (((off+len)<off) || ((off+len)>(off+tvb_reported_length_remaining(tvb, off)))) { - proto_tree_add_text(parent_tree, tvb, offset, tvb_length_remaining(tvb, offset), + proto_tree_add_text(parent_tree, tvb, offset, tvb_captured_length_remaining(tvb, offset), "Invalid offset/length. Malformed packet"); col_append_str(pinfo->cinfo, COL_INFO, " [Malformed packet]"); @@ -1046,7 +1046,7 @@ dissect_smb2_olb_buffer(packet_info *pinfo, proto_tree *parent_tree, tvbuff_t *t return; } - sub_tvb = tvb_new_subset(tvb, off, MIN((int)len, tvb_length_remaining(tvb, off)), len); + sub_tvb = tvb_new_subset(tvb, off, MIN((int)len, tvb_captured_length_remaining(tvb, off)), len); dissector(sub_tvb, pinfo, sub_tree, si); } @@ -1546,7 +1546,7 @@ dissect_smb2_file_all_info(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *pa /* file name */ if (length) { - bc = tvb_length_remaining(tvb, offset); + bc = tvb_captured_length_remaining(tvb, offset); name = get_unicode_or_ascii_string(tvb, &offset, TRUE, &length, TRUE, TRUE, &bc); if (name) { @@ -1575,7 +1575,7 @@ dissect_smb2_file_allocation_info(tvbuff_t *tvb, packet_info *pinfo _U_, proto_t tree = proto_item_add_subtree(item, ett_smb2_file_allocation_info); } - bc = tvb_length_remaining(tvb, offset); + bc = tvb_captured_length_remaining(tvb, offset); offset = dissect_qsfi_SMB_FILE_ALLOCATION_INFO(tvb, pinfo, tree, offset, &bc, &trunc); return offset; @@ -1594,7 +1594,7 @@ dissect_smb2_file_endoffile_info(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tr tree = proto_item_add_subtree(item, ett_smb2_file_endoffile_info); } - bc = tvb_length_remaining(tvb, offset); + bc = tvb_captured_length_remaining(tvb, offset); offset = dissect_qsfi_SMB_FILE_ENDOFFILE_INFO(tvb, pinfo, tree, offset, &bc, &trunc); return offset; @@ -1613,7 +1613,7 @@ dissect_smb2_file_alternate_name_info(tvbuff_t *tvb, packet_info *pinfo _U_, pro tree = proto_item_add_subtree(item, ett_smb2_file_alternate_name_info); } - bc = tvb_length_remaining(tvb, offset); + bc = tvb_captured_length_remaining(tvb, offset); offset = dissect_qfi_SMB_FILE_NAME_INFO(tvb, pinfo, tree, offset, &bc, &trunc, /* XXX assumption hack */ TRUE); return offset; @@ -1666,7 +1666,7 @@ dissect_smb2_file_standard_info(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tre tree = proto_item_add_subtree(item, ett_smb2_file_standard_info); } - bc = tvb_length_remaining(tvb, offset); + bc = tvb_captured_length_remaining(tvb, offset); offset = dissect_qfi_SMB_FILE_STANDARD_INFO(tvb, pinfo, tree, offset, &bc, &trunc); return offset; @@ -1684,7 +1684,7 @@ dissect_smb2_file_internal_info(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tre tree = proto_item_add_subtree(item, ett_smb2_file_internal_info); } - bc = tvb_length_remaining(tvb, offset); + bc = tvb_captured_length_remaining(tvb, offset); offset = dissect_qfi_SMB_FILE_INTERNAL_INFO(tvb, pinfo, tree, offset, &bc, &trunc); return offset; @@ -1702,7 +1702,7 @@ dissect_smb2_file_mode_info(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *p tree = proto_item_add_subtree(item, ett_smb2_file_mode_info); } - bc = tvb_length_remaining(tvb, offset); + bc = tvb_captured_length_remaining(tvb, offset); offset = dissect_qsfi_SMB_FILE_MODE_INFO(tvb, pinfo, tree, offset, &bc, &trunc); return offset; @@ -1720,7 +1720,7 @@ dissect_smb2_file_alignment_info(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tr tree = proto_item_add_subtree(item, ett_smb2_file_alignment_info); } - bc = tvb_length_remaining(tvb, offset); + bc = tvb_captured_length_remaining(tvb, offset); offset = dissect_qfi_SMB_FILE_ALIGNMENT_INFO(tvb, pinfo, tree, offset, &bc, &trunc); return offset; @@ -1738,7 +1738,7 @@ dissect_smb2_file_position_info(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tre tree = proto_item_add_subtree(item, ett_smb2_file_position_info); } - bc = tvb_length_remaining(tvb, offset); + bc = tvb_captured_length_remaining(tvb, offset); offset = dissect_qsfi_SMB_FILE_POSITION_INFO(tvb, pinfo, tree, offset, &bc, &trunc); return offset; @@ -1774,7 +1774,7 @@ dissect_smb2_file_ea_info(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *par tree = proto_item_add_subtree(item, ett_smb2_file_ea_info); } - bc = tvb_length_remaining(tvb, offset); + bc = tvb_captured_length_remaining(tvb, offset); offset = dissect_qfi_SMB_FILE_EA_INFO(tvb, pinfo, tree, offset, &bc, &trunc); return offset; @@ -1793,7 +1793,7 @@ dissect_smb2_file_stream_info(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree tree = proto_item_add_subtree(item, ett_smb2_file_stream_info); } - bc = tvb_length_remaining(tvb, offset); + bc = tvb_captured_length_remaining(tvb, offset); offset = dissect_qfi_SMB_FILE_STREAM_INFO(tvb, pinfo, tree, offset, &bc, &trunc, TRUE); return offset; @@ -1812,7 +1812,7 @@ dissect_smb2_file_pipe_info(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *p tree = proto_item_add_subtree(item, ett_smb2_file_pipe_info); } - bc = tvb_length_remaining(tvb, offset); + bc = tvb_captured_length_remaining(tvb, offset); offset = dissect_sfi_SMB_FILE_PIPE_INFO(tvb, pinfo, tree, offset, &bc, &trunc); return offset; @@ -1831,7 +1831,7 @@ dissect_smb2_file_compression_info(tvbuff_t *tvb, packet_info *pinfo _U_, proto_ tree = proto_item_add_subtree(item, ett_smb2_file_compression_info); } - bc = tvb_length_remaining(tvb, offset); + bc = tvb_captured_length_remaining(tvb, offset); offset = dissect_qfi_SMB_FILE_COMPRESSION_INFO(tvb, pinfo, tree, offset, &bc, &trunc); return offset; @@ -1851,7 +1851,7 @@ dissect_smb2_file_network_open_info(tvbuff_t *tvb, packet_info *pinfo _U_, proto } - bc = tvb_length_remaining(tvb, offset); + bc = tvb_captured_length_remaining(tvb, offset); offset = dissect_qfi_SMB_FILE_NETWORK_OPEN_INFO(tvb, pinfo, tree, offset, &bc, &trunc); return offset; @@ -1871,7 +1871,7 @@ dissect_smb2_file_attribute_tag_info(tvbuff_t *tvb, packet_info *pinfo _U_, prot } - bc = tvb_length_remaining(tvb, offset); + bc = tvb_captured_length_remaining(tvb, offset); offset = dissect_qfi_SMB_FILE_ATTRIBUTE_TAG_INFO(tvb, pinfo, tree, offset, &bc, &trunc); return offset; @@ -1949,7 +1949,7 @@ dissect_smb2_file_full_ea_info(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree /* ea name */ length = ea_name_len; if (length) { - bc = tvb_length_remaining(tvb, offset); + bc = tvb_captured_length_remaining(tvb, offset); name = get_unicode_or_ascii_string(tvb, &offset, FALSE, &length, TRUE, TRUE, &bc); if (name) { @@ -1964,7 +1964,7 @@ dissect_smb2_file_full_ea_info(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree /* ea data */ length = ea_data_len; if (length) { - bc = tvb_length_remaining(tvb, offset); + bc = tvb_captured_length_remaining(tvb, offset); data = get_unicode_or_ascii_string(tvb, &offset, FALSE, &length, TRUE, TRUE, &bc); /* @@ -2022,7 +2022,7 @@ dissect_smb2_file_rename_info(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree /* file name */ if (length) { - bc = tvb_length_remaining(tvb, offset); + bc = tvb_captured_length_remaining(tvb, offset); name = get_unicode_or_ascii_string(tvb, &offset, TRUE, &length, TRUE, TRUE, &bc); if (name) { @@ -2053,7 +2053,7 @@ dissect_smb2_sec_info_00(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *pare } /* security descriptor */ - offset = dissect_nt_sec_desc(tvb, offset, pinfo, tree, NULL, TRUE, tvb_length_remaining(tvb, offset), NULL); + offset = dissect_nt_sec_desc(tvb, offset, pinfo, tree, NULL, TRUE, tvb_captured_length_remaining(tvb, offset), NULL); return offset; } @@ -2070,7 +2070,7 @@ dissect_smb2_fs_info_05(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *paren tree = proto_item_add_subtree(item, ett_smb2_fs_info_05); } - bc = tvb_length_remaining(tvb, offset); + bc = tvb_captured_length_remaining(tvb, offset); offset = dissect_qfsi_FS_ATTRIBUTE_INFO(tvb, pinfo, tree, offset, &bc, TRUE); return offset; @@ -2088,7 +2088,7 @@ dissect_smb2_fs_info_06(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *paren tree = proto_item_add_subtree(item, ett_smb2_fs_info_06); } - bc = tvb_length_remaining(tvb, offset); + bc = tvb_captured_length_remaining(tvb, offset); offset = dissect_nt_quota(tvb, tree, offset, &bc); return offset; @@ -2123,7 +2123,7 @@ dissect_smb2_fs_info_07(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *paren tree = proto_item_add_subtree(item, ett_smb2_fs_info_07); } - bc = tvb_length_remaining(tvb, offset); + bc = tvb_captured_length_remaining(tvb, offset); offset = dissect_qfsi_FS_FULL_SIZE_INFO(tvb, pinfo, tree, offset, &bc); return offset; @@ -2142,7 +2142,7 @@ dissect_smb2_fs_info_01(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *paren } - bc = tvb_length_remaining(tvb, offset); + bc = tvb_captured_length_remaining(tvb, offset); offset = dissect_qfsi_FS_VOLUME_INFO(tvb, pinfo, tree, offset, &bc, TRUE); return offset; @@ -2161,7 +2161,7 @@ dissect_smb2_fs_info_03(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *paren } - bc = tvb_length_remaining(tvb, offset); + bc = tvb_captured_length_remaining(tvb, offset); offset = dissect_qfsi_FS_SIZE_INFO(tvb, pinfo, tree, offset, &bc); return offset; @@ -2180,7 +2180,7 @@ dissect_smb2_fs_info_04(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *paren } - bc = tvb_length_remaining(tvb, offset); + bc = tvb_captured_length_remaining(tvb, offset); offset = dissect_qfsi_FS_DEVICE_INFO(tvb, pinfo, tree, offset, &bc); return offset; @@ -2412,7 +2412,7 @@ dissect_smb2_share_caps(proto_tree *tree, tvbuff_t *tvb, int offset) static void dissect_smb2_secblob(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, smb2_info_t *si _U_) { - if ((tvb_length(tvb)>=7) + if ((tvb_captured_length(tvb)>=7) && (!tvb_memeql(tvb, 0, "NTLMSSP", 7))) { call_dissector(ntlmssp_handle, tvb, pinfo, tree); } else { @@ -2820,7 +2820,7 @@ dissect_smb2_notify_request(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, static void dissect_smb2_notify_data_out(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, smb2_info_t *si _U_) { - proto_tree_add_item(tree, hf_smb2_unknown, tvb, 0, tvb_length(tvb), ENC_NA); + proto_tree_add_item(tree, hf_smb2_unknown, tvb, 0, tvb_captured_length(tvb), ENC_NA); } static int @@ -2921,7 +2921,7 @@ static void dissect_smb2_file_directory_info(tvbuff_t *tvb, packet_info *pinfo _ const char *name = NULL; guint16 bc; - while (tvb_length_remaining(tvb, offset) > 4) { + while (tvb_captured_length_remaining(tvb, offset) > 4) { int old_offset = offset; int next_offset; int file_name_len; @@ -2989,7 +2989,7 @@ static void dissect_smb2_file_directory_info(tvbuff_t *tvb, packet_info *pinfo _ offset = old_offset+next_offset; if (offset < old_offset) { - proto_tree_add_text(tree, tvb, offset, tvb_length_remaining(tvb, offset), + proto_tree_add_text(tree, tvb, offset, tvb_captured_length_remaining(tvb, offset), "Invalid offset/length. Malformed packet"); return; } @@ -3004,7 +3004,7 @@ static void dissect_smb2_full_directory_info(tvbuff_t *tvb, packet_info *pinfo _ const char *name = NULL; guint16 bc; - while (tvb_length_remaining(tvb, offset) > 4) { + while (tvb_captured_length_remaining(tvb, offset) > 4) { int old_offset = offset; int next_offset; int file_name_len; @@ -3076,7 +3076,7 @@ static void dissect_smb2_full_directory_info(tvbuff_t *tvb, packet_info *pinfo _ offset = old_offset+next_offset; if (offset < old_offset) { - proto_tree_add_text(tree, tvb, offset, tvb_length_remaining(tvb, offset), + proto_tree_add_text(tree, tvb, offset, tvb_captured_length_remaining(tvb, offset), "Invalid offset/length. Malformed packet"); return; } @@ -3091,7 +3091,7 @@ static void dissect_smb2_both_directory_info(tvbuff_t *tvb, packet_info *pinfo _ const char *name = NULL; guint16 bc; - while (tvb_length_remaining(tvb, offset) > 4) { + while (tvb_captured_length_remaining(tvb, offset) > 4) { int old_offset = offset; int next_offset; int file_name_len; @@ -3184,7 +3184,7 @@ static void dissect_smb2_both_directory_info(tvbuff_t *tvb, packet_info *pinfo _ offset = old_offset+next_offset; if (offset < old_offset) { - proto_tree_add_text(tree, tvb, offset, tvb_length_remaining(tvb, offset), + proto_tree_add_text(tree, tvb, offset, tvb_captured_length_remaining(tvb, offset), "Invalid offset/length. Malformed packet"); return; } @@ -3199,7 +3199,7 @@ static void dissect_smb2_file_name_info(tvbuff_t *tvb, packet_info *pinfo _U_, p const char *name = NULL; guint16 bc; - while (tvb_length_remaining(tvb, offset) > 4) { + while (tvb_captured_length_remaining(tvb, offset) > 4) { int old_offset = offset; int next_offset; int file_name_len; @@ -3244,7 +3244,7 @@ static void dissect_smb2_file_name_info(tvbuff_t *tvb, packet_info *pinfo _U_, p offset = old_offset+next_offset; if (offset < old_offset) { - proto_tree_add_text(tree, tvb, offset, tvb_length_remaining(tvb, offset), + proto_tree_add_text(tree, tvb, offset, tvb_captured_length_remaining(tvb, offset), "Invalid offset/length. Malformed packet"); return; } @@ -3259,7 +3259,7 @@ static void dissect_smb2_id_both_directory_info(tvbuff_t *tvb, packet_info *pinf const char *name = NULL; guint16 bc; - while (tvb_length_remaining(tvb, offset) > 4) { + while (tvb_captured_length_remaining(tvb, offset) > 4) { int old_offset = offset; int next_offset; int file_name_len; @@ -3359,7 +3359,7 @@ static void dissect_smb2_id_both_directory_info(tvbuff_t *tvb, packet_info *pinf offset = old_offset+next_offset; if (offset < old_offset) { - proto_tree_add_text(tree, tvb, offset, tvb_length_remaining(tvb, offset), + proto_tree_add_text(tree, tvb, offset, tvb_captured_length_remaining(tvb, offset), "Invalid offset/length. Malformed packet"); return; } @@ -3396,7 +3396,7 @@ dissect_smb2_find_data(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, smb2 dis++; } - proto_tree_add_item(tree, hf_smb2_unknown, tvb, 0, tvb_length(tvb), ENC_NA); + proto_tree_add_item(tree, hf_smb2_unknown, tvb, 0, tvb_captured_length(tvb), ENC_NA); } static int @@ -3554,7 +3554,7 @@ dissect_smb2_getinfo_parameters(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tre default: /* we dont handle this infolevel yet */ proto_tree_add_item(tree, hf_smb2_unknown, tvb, offset, 16, ENC_NA); - offset += tvb_length_remaining(tvb, offset); + offset += tvb_captured_length_remaining(tvb, offset); } break; case SMB2_CLASS_FS_INFO: @@ -3562,7 +3562,7 @@ dissect_smb2_getinfo_parameters(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tre default: /* we dont handle this infolevel yet */ proto_tree_add_item(tree, hf_smb2_unknown, tvb, offset, 16, ENC_NA); - offset += tvb_length_remaining(tvb, offset); + offset += tvb_captured_length_remaining(tvb, offset); } break; case SMB2_CLASS_SEC_INFO: @@ -3573,13 +3573,13 @@ dissect_smb2_getinfo_parameters(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tre default: /* we dont handle this infolevel yet */ proto_tree_add_item(tree, hf_smb2_unknown, tvb, offset, 16, ENC_NA); - offset += tvb_length_remaining(tvb, offset); + offset += tvb_captured_length_remaining(tvb, offset); } break; default: /* we dont handle this class yet */ proto_tree_add_item(tree, hf_smb2_unknown, tvb, offset, 16, ENC_NA); - offset += tvb_length_remaining(tvb, offset); + offset += tvb_captured_length_remaining(tvb, offset); } return offset; } @@ -3751,8 +3751,8 @@ dissect_smb2_infolevel(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, break; default: /* we dont handle this infolevel yet */ - proto_tree_add_item(tree, hf_smb2_unknown, tvb, offset, tvb_length_remaining(tvb, offset), ENC_NA); - offset += tvb_length_remaining(tvb, offset); + proto_tree_add_item(tree, hf_smb2_unknown, tvb, offset, tvb_captured_length_remaining(tvb, offset), ENC_NA); + offset += tvb_captured_length_remaining(tvb, offset); } break; case SMB2_CLASS_FS_INFO: @@ -3780,8 +3780,8 @@ dissect_smb2_infolevel(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, break; default: /* we dont handle this infolevel yet */ - proto_tree_add_item(tree, hf_smb2_unknown, tvb, offset, tvb_length_remaining(tvb, offset), ENC_NA); - offset += tvb_length_remaining(tvb, offset); + proto_tree_add_item(tree, hf_smb2_unknown, tvb, offset, tvb_captured_length_remaining(tvb, offset), ENC_NA); + offset += tvb_captured_length_remaining(tvb, offset); } break; case SMB2_CLASS_SEC_INFO: @@ -3791,14 +3791,14 @@ dissect_smb2_infolevel(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, break; default: /* we dont handle this infolevel yet */ - proto_tree_add_item(tree, hf_smb2_unknown, tvb, offset, tvb_length_remaining(tvb, offset), ENC_NA); - offset += tvb_length_remaining(tvb, offset); + proto_tree_add_item(tree, hf_smb2_unknown, tvb, offset, tvb_captured_length_remaining(tvb, offset), ENC_NA); + offset += tvb_captured_length_remaining(tvb, offset); } break; default: /* we dont handle this class yet */ - proto_tree_add_item(tree, hf_smb2_unknown, tvb, offset, tvb_length_remaining(tvb, offset), ENC_NA); - offset += tvb_length_remaining(tvb, offset); + proto_tree_add_item(tree, hf_smb2_unknown, tvb, offset, tvb_captured_length_remaining(tvb, offset), ENC_NA); + offset += tvb_captured_length_remaining(tvb, offset); } /* if we get BUFFER_OVERFLOW there will be truncated data */ @@ -3818,7 +3818,7 @@ dissect_smb2_getinfo_response_data(tvbuff_t *tvb, packet_info *pinfo, proto_tree dissect_smb2_infolevel(tvb, pinfo, tree, 0, si, si->saved->smb2_class, si->saved->infolevel); } else { /* some unknown bytes */ - proto_tree_add_item(tree, hf_smb2_unknown, tvb, 0, tvb_length(tvb), ENC_NA); + proto_tree_add_item(tree, hf_smb2_unknown, tvb, 0, tvb_captured_length(tvb), ENC_NA); } } @@ -4064,7 +4064,7 @@ dissect_file_data_dcerpc(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree _U_ tvbuff_t *dcerpc_tvb; heur_dtbl_entry_t *hdtbl_entry; - dcerpc_tvb = tvb_new_subset(tvb, offset, MIN((int)datalen, tvb_length_remaining(tvb, offset)), datalen); + dcerpc_tvb = tvb_new_subset(tvb, offset, MIN((int)datalen, tvb_captured_length_remaining(tvb, offset)), datalen); /* dissect the full PDU */ dissector_try_heuristic(smb2_heur_subdissector_list, dcerpc_tvb, pinfo, top_tree, &hdtbl_entry, NULL); @@ -4204,9 +4204,9 @@ dissect_smb2_write_request(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, /* just ordinary data */ proto_tree_add_item(tree, hf_smb2_write_data, tvb, offset, length, ENC_NA); - data_tvb_len=(guint32)tvb_length_remaining(tvb, offset); + data_tvb_len=(guint32)tvb_captured_length_remaining(tvb, offset); - offset += MIN(length,(guint32)tvb_length_remaining(tvb, offset)); + offset += MIN(length,(guint32)tvb_captured_length_remaining(tvb, offset)); offset = dissect_smb2_olb_tvb_max_offset(offset, &c_olb); @@ -4257,7 +4257,7 @@ dissect_smb2_write_response(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *t static void dissect_smb2_FSCTL_PIPE_TRANSCEIVE(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, int offset, proto_tree *top_tree, gboolean data_in _U_) { - dissect_file_data_dcerpc(tvb, pinfo, tree, offset, tvb_length_remaining(tvb, offset), top_tree); + dissect_file_data_dcerpc(tvb, pinfo, tree, offset, tvb_captured_length_remaining(tvb, offset), top_tree); } static void @@ -4611,7 +4611,7 @@ dissect_smb2_FSCTL_GET_SHADOW_COPY_DATA(tvbuff_t *tvb, packet_info *pinfo _U_, p int len = 0; int old_offset = offset; - bc = tvb_length_remaining(tvb, offset); + bc = tvb_captured_length_remaining(tvb, offset); name = get_unicode_or_ascii_string(tvb, &offset, TRUE, &len, TRUE, FALSE, &bc); proto_tree_add_string(tree, hf_smb2_ioctl_shadow_copy_label, tvb, old_offset, len, name); @@ -4792,7 +4792,7 @@ dissect_smb2_ioctl_data(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, pro dissect_smb2_FSCTL_SET_COMPRESSION(tvb, pinfo, tree, 0, data_in); break; default: - proto_tree_add_item(tree, hf_smb2_unknown, tvb, 0, tvb_length(tvb), ENC_NA); + proto_tree_add_item(tree, hf_smb2_unknown, tvb, 0, tvb_captured_length(tvb), ENC_NA); } } @@ -5046,7 +5046,7 @@ dissect_smb2_read_response(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, /* data */ proto_tree_add_item(tree, hf_smb2_read_data, tvb, offset, length, ENC_NA); - data_tvb_len=(guint32)tvb_length_remaining(tvb, offset); + data_tvb_len=(guint32)tvb_captured_length_remaining(tvb, offset); offset += MIN(length,data_tvb_len); @@ -5062,7 +5062,7 @@ dissect_smb2_read_response(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, static void report_create_context_malformed_buffer(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, const char *buffer_desc) { - proto_tree_add_text(tree, tvb, 0, tvb_length_remaining(tvb, 0), + proto_tree_add_text(tree, tvb, 0, tvb_captured_length_remaining(tvb, 0), "%s SHOULD NOT be generated. Malformed packet", buffer_desc); } static void @@ -5126,7 +5126,7 @@ dissect_smb2_QFid_buffer_request(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tr } if (item) { - if (tvb_length(tvb) == 0) { + if (tvb_captured_length(tvb) == 0) { proto_item_append_text(item, ": NO DATA"); } else { proto_item_append_text(item, ": QFid request should have no data, malformed packet"); @@ -5323,7 +5323,7 @@ dissect_smb2_MxAc_buffer_request(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tr item = proto_tree_get_parent(tree); } - if (tvb_length(tvb) == 0) { + if (tvb_captured_length(tvb) == 0) { if (item) { proto_item_append_text(item, ": NO DATA"); } @@ -5349,7 +5349,7 @@ dissect_smb2_MxAc_buffer_response(tvbuff_t *tvb, packet_info *pinfo _U_, proto_t item = proto_tree_get_parent(tree); } - if (tvb_length(tvb) == 0) { + if (tvb_captured_length(tvb) == 0) { if (item) { proto_item_append_text(item, ": NO DATA"); } @@ -5418,7 +5418,7 @@ dissect_SMB2_CREATE_LEASE_VX(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree * parent_item = proto_tree_get_parent(parent_tree); } - len = tvb_length(tvb); + len = tvb_captured_length(tvb); switch (len) { case 32: /* SMB2_CREATE_REQUEST/RESPONSE_LEASE */ @@ -6780,7 +6780,7 @@ dissect_smb2_command(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int of offset = (*cmd_dissector)(tvb, pinfo, cmd_tree, offset, si); } else { proto_tree_add_item(cmd_tree, hf_smb2_unknown, tvb, offset, -1, ENC_NA); - offset = tvb_length(tvb); + offset = tvb_captured_length(tvb); } proto_item_set_len(cmd_item, offset-old_offset); @@ -7205,7 +7205,7 @@ dissect_smb2_heur(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree, vo { /* must check that this really is a smb2 packet */ - if (tvb_length(tvb) < 4) + if (tvb_captured_length(tvb) < 4) return FALSE; if (((tvb_get_guint8(tvb, 0) != 0xfe) && (tvb_get_guint8(tvb, 0) != 0xfd)) |