From fd95f92d893ac67e22fcfa8983c1d8cbbe06aa59 Mon Sep 17 00:00:00 2001 From: Michael Adam Date: Fri, 2 Mar 2012 19:33:23 +0100 Subject: [PATCH] smb2-dissector: add new share capabilites SCALEOUT and CLUSTER --- epan/dissectors/packet-smb2.c | 20 ++++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-) diff --git a/epan/dissectors/packet-smb2.c b/epan/dissectors/packet-smb2.c index 0f0e38acee..e4dc92bc8c 100644 --- a/epan/dissectors/packet-smb2.c +++ b/epan/dissectors/packet-smb2.c @@ -263,6 +263,8 @@ static int hf_smb2_share_caching = -1; static int hf_smb2_share_caps = -1; static int hf_smb2_share_caps_dfs = -1; static int hf_smb2_share_caps_continuous_availability = -1; +static int hf_smb2_share_caps_scaleout = -1; +static int hf_smb2_share_caps_cluster = -1; static int hf_smb2_create_flags = -1; static int hf_smb2_lock_count = -1; static int hf_smb2_min_count = -1; @@ -2098,8 +2100,10 @@ dissect_smb2_share_flags(proto_tree *tree, tvbuff_t *tvb, int offset) return offset; } -#define SHARE_CAPS_DFS 0x00000008 -#define SHARE_CAPS_CONTINUOUS_AVAILABILITY 0x00000010 +#define SHARE_CAPS_DFS 0x00000008 +#define SHARE_CAPS_CONTINUOUS_AVAILABILITY 0x00000010 +#define SHARE_CAPS_SCALEOUT 0x00000020 +#define SHARE_CAPS_CLUSTER 0x00000040 static int dissect_smb2_share_caps(proto_tree *tree, tvbuff_t *tvb, int offset) @@ -2107,6 +2111,8 @@ dissect_smb2_share_caps(proto_tree *tree, tvbuff_t *tvb, int offset) static const int *sc_fields[] = { &hf_smb2_share_caps_dfs, &hf_smb2_share_caps_continuous_availability, + &hf_smb2_share_caps_scaleout, + &hf_smb2_share_caps_cluster, NULL }; @@ -7324,6 +7330,16 @@ proto_register_smb2(void) NULL, SHARE_CAPS_CONTINUOUS_AVAILABILITY, "The specified share is continuously available", HFILL }}, + { &hf_smb2_share_caps_scaleout, + { "SCALEOUT", "smb2.share_caps.scaleout", FT_BOOLEAN, 32, + NULL, SHARE_CAPS_SCALEOUT, + "The specified share is a scaleout share", HFILL }}, + + { &hf_smb2_share_caps_cluster, + { "CLUSTER", "smb2.share_caps.cluster", FT_BOOLEAN, 32, + NULL, SHARE_CAPS_CLUSTER, + "The specified share is a cluster share", HFILL }}, + { &hf_smb2_ioctl_flags, { "Flags", "smb2.ioctl.flags", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }}, -- 2.34.1