diff options
| author | wmeier <wmeier@f5534014-38df-0310-8fa8-9805f1628bb7> | 2011-10-01 01:57:38 +0000 |
|---|---|---|
| committer | wmeier <wmeier@f5534014-38df-0310-8fa8-9805f1628bb7> | 2011-10-01 01:57:38 +0000 |
| commit | ce97b6d46150c33fced6f364df96bc6b982771c2 (patch) | |
| tree | 57bb71497356836d425f35a55528812fe936e474 /epan/dissectors/packet-smb.c | |
| parent | 709a1051521c0ea1980bb4491e5e28dda600cd2c (diff) | |
From Stefan Metzmacher: Support for SMB 2.22 features;
"Patches to add most things for SMB 2.22"
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6394
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@39205 f5534014-38df-0310-8fa8-9805f1628bb7
Diffstat (limited to 'epan/dissectors/packet-smb.c')
| -rw-r--r-- | epan/dissectors/packet-smb.c | 52 |
1 files changed, 34 insertions, 18 deletions
diff --git a/epan/dissectors/packet-smb.c b/epan/dissectors/packet-smb.c index aa3e435200..bd13b07e20 100644 --- a/epan/dissectors/packet-smb.c +++ b/epan/dissectors/packet-smb.c @@ -10728,6 +10728,38 @@ dissect_sfi_ioflag(tvbuff_t *tvb, proto_tree *parent_tree, int offset) } #endif +int +dissect_get_dfs_request_data(tvbuff_t *tvb, packet_info *pinfo, + proto_tree *tree, int offset, guint16 *bcp) +{ + smb_info_t *si = pinfo->private_data; + int fn_len; + const char *fn; + guint16 bc = *bcp; + + DISSECTOR_ASSERT(si); + + /* referral level */ + CHECK_BYTE_COUNT_TRANS(2); + proto_tree_add_item(tree, hf_smb_max_referral_level, tvb, offset, 2, TRUE); + COUNT_BYTES_TRANS(2); + + /* file name */ + fn = get_unicode_or_ascii_string(tvb, &offset, si->unicode, &fn_len, FALSE, FALSE, &bc); + CHECK_STRING_TRANS(fn); + proto_tree_add_string(tree, hf_smb_file_name, tvb, offset, fn_len, + fn); + COUNT_BYTES_TRANS(fn_len); + + if (check_col(pinfo->cinfo, COL_INFO)) { + col_append_fstr(pinfo->cinfo, COL_INFO, ", File: %s", + format_text(fn, strlen(fn))); + } + + *bcp = bc; + return offset; +} + static int dissect_transaction2_request_parameters(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree, int offset, int subcmd, guint16 bc) @@ -11148,23 +11180,7 @@ dissect_transaction2_request_parameters(tvbuff_t *tvb, packet_info *pinfo, /* XXX unknown structure*/ break; case 0x0010: /*TRANS2_GET_DFS_REFERRAL*/ - /* referral level */ - CHECK_BYTE_COUNT_TRANS(2); - proto_tree_add_item(tree, hf_smb_max_referral_level, tvb, offset, 2, TRUE); - COUNT_BYTES_TRANS(2); - - /* file name */ - fn = get_unicode_or_ascii_string(tvb, &offset, si->unicode, &fn_len, FALSE, FALSE, &bc); - CHECK_STRING_TRANS(fn); - proto_tree_add_string(tree, hf_smb_file_name, tvb, offset, fn_len, - fn); - COUNT_BYTES_TRANS(fn_len); - - if (check_col(pinfo->cinfo, COL_INFO)) { - col_append_fstr(pinfo->cinfo, COL_INFO, ", File: %s", - format_text(fn, strlen(fn))); - } - + offset = dissect_get_dfs_request_data(tvb, pinfo, tree, offset, &bc); break; case 0x0011: /*TRANS2_REPORT_DFS_INCONSISTENCY*/ /* file name */ @@ -11522,7 +11538,7 @@ dissect_dfs_referral_entry_v3(tvbuff_t *tvb, proto_tree *tree, int oldoffset, in /* get dfs referral data (4.4.1) */ -static int +int dissect_get_dfs_referral_data(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, int offset, guint16 *bcp) { |