diff options
| author | Alexis La Goutte <alexis.lagoutte@gmail.com> | 2013-11-19 12:26:49 +0000 |
|---|---|---|
| committer | Alexis La Goutte <alexis.lagoutte@gmail.com> | 2013-11-19 12:26:49 +0000 |
| commit | afe84fe4fd1a77f2296d93363ce5997a1bfa3c70 (patch) | |
| tree | 2f6e6323fb2b750c4c98f392c34d4da2f9d12787 /epan/dissectors/packet-smb.c | |
| parent | 566d080869496fa9d4ff8c5900be6fc1a0e34e31 (diff) | |
From Ralph Böhme via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9439
Add missing SMB_QUERY_CIFS_UNIX_INFO capability flags
Listed in https://git.samba.org/?p=samba.git;a=blob_plain;f=libcli/smb/smb_unix_ext.h;hb=HEAD
svn path=/trunk/; revision=53430
Diffstat (limited to 'epan/dissectors/packet-smb.c')
| -rw-r--r-- | epan/dissectors/packet-smb.c | 85 |
1 files changed, 83 insertions, 2 deletions
diff --git a/epan/dissectors/packet-smb.c b/epan/dissectors/packet-smb.c index ec5a683a83..c86299c57e 100644 --- a/epan/dissectors/packet-smb.c +++ b/epan/dissectors/packet-smb.c @@ -703,6 +703,15 @@ static int hf_smb_unix_minor_version = -1; static int hf_smb_unix_capability = -1; static int hf_smb_unix_capability_fcntl = -1; static int hf_smb_unix_capability_posix_acl = -1; +static int hf_smb_unix_capability_xattr = -1; +static int hf_smb_unix_capability_attr = -1; +static int hf_smb_unix_capability_posix_paths = -1; +static int hf_smb_unix_capability_posix_path_ops = -1; +static int hf_smb_unix_capability_large_read = -1; +static int hf_smb_unix_capability_large_write = -1; +static int hf_smb_unix_capability_encrpytion = -1; +static int hf_smb_unix_capability_mandatory_crypto = -1; +static int hf_smb_unix_capability_proxy = -1; static int hf_smb_unix_file_link_dest = -1; static int hf_smb_unix_file_size = -1; static int hf_smb_unix_file_num_bytes = -1; @@ -15791,11 +15800,47 @@ dissect_qfsi_vals(tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree, } proto_tree_add_item( - subtree, hf_smb_unix_capability_fcntl, tvb, offset, 8, + subtree, hf_smb_unix_capability_fcntl, tvb, offset, 4, ENC_LITTLE_ENDIAN); proto_tree_add_item( - subtree, hf_smb_unix_capability_posix_acl, tvb, offset, 8, + subtree, hf_smb_unix_capability_posix_acl, tvb, offset, 4, + ENC_LITTLE_ENDIAN); + + proto_tree_add_item( + subtree, hf_smb_unix_capability_xattr, tvb, offset, 4, + ENC_LITTLE_ENDIAN); + + proto_tree_add_item( + subtree, hf_smb_unix_capability_attr, tvb, offset, 4, + ENC_LITTLE_ENDIAN); + + proto_tree_add_item( + subtree, hf_smb_unix_capability_posix_paths, tvb, offset, 4, + ENC_LITTLE_ENDIAN); + + proto_tree_add_item( + subtree, hf_smb_unix_capability_posix_path_ops, tvb, offset, 4, + ENC_LITTLE_ENDIAN); + + proto_tree_add_item( + subtree, hf_smb_unix_capability_large_read, tvb, offset, 4, + ENC_LITTLE_ENDIAN); + + proto_tree_add_item( + subtree, hf_smb_unix_capability_large_write, tvb, offset, 4, + ENC_LITTLE_ENDIAN); + + proto_tree_add_item( + subtree, hf_smb_unix_capability_encrpytion, tvb, offset, 4, + ENC_LITTLE_ENDIAN); + + proto_tree_add_item( + subtree, hf_smb_unix_capability_mandatory_crypto, tvb, offset, 4, + ENC_LITTLE_ENDIAN); + + proto_tree_add_item( + subtree, hf_smb_unix_capability_proxy, tvb, offset, 4, ENC_LITTLE_ENDIAN); COUNT_BYTES_TRANS_SUBR(8); @@ -20384,6 +20429,42 @@ proto_register_smb(void) { "POSIX ACL Capability", "smb.unix.capability.posix_acl", FT_BOOLEAN, 32, TFS(&tfs_set_notset), 0x00000002, NULL, HFILL }}, + { &hf_smb_unix_capability_xattr, + { "EA Capability", "smb.unix.capability.ea", FT_BOOLEAN, 32, + TFS(&tfs_set_notset), 0x00000004, NULL, HFILL }}, + + { &hf_smb_unix_capability_attr, + { "Additional Attributes Capability", "smb.unix.capability.attr", FT_BOOLEAN, 32, + TFS(&tfs_set_notset), 0x00000008, NULL, HFILL }}, + + { &hf_smb_unix_capability_posix_paths, + { "POSIX Pathnames Capability", "smb.unix.capability.posix_paths", FT_BOOLEAN, 32, + TFS(&tfs_set_notset), 0x00000010, NULL, HFILL }}, + + { &hf_smb_unix_capability_posix_path_ops, + { "POSIX Path Operations Capability", "smb.unix.capability.posix_path_ops", FT_BOOLEAN, 32, + TFS(&tfs_set_notset), 0x00000020, NULL, HFILL }}, + + { &hf_smb_unix_capability_large_read, + { "Large Read Capability", "smb.unix.capability.large_read", FT_BOOLEAN, 32, + TFS(&tfs_set_notset), 0x00000040, NULL, HFILL }}, + + { &hf_smb_unix_capability_large_write, + { "Large Write Capability", "smb.unix.capability.large_write", FT_BOOLEAN, 32, + TFS(&tfs_set_notset), 0x00000080, NULL, HFILL }}, + + { &hf_smb_unix_capability_encrpytion, + { "Encryption Capability", "smb.unix.capability.encrpytion", FT_BOOLEAN, 32, + TFS(&tfs_set_notset), 0x00000100, NULL, HFILL }}, + + { &hf_smb_unix_capability_mandatory_crypto, + { "Mandatory Encryption Capability", "smb.unix.capability.mandatory_crypto", FT_BOOLEAN, 32, + TFS(&tfs_set_notset), 0x00000200, NULL, HFILL }}, + + { &hf_smb_unix_capability_proxy, + { "Proxy Capability", "smb.unix.capability.proxy", FT_BOOLEAN, 32, + TFS(&tfs_set_notset), 0x00000400, NULL, HFILL }}, + { &hf_smb_file_access_mask_read_data, { "Read Data", "smb.file.accessmask.read_data", FT_BOOLEAN, 32, TFS(&tfs_set_notset), 0x00000001, NULL, HFILL }}, |