[PATCH 10/12] decode/display all delication flags

[Tigran Mkrtchyan]

---
 epan/dissectors/packet-nfs.c |   33 +++++++++++++++++++++++++++++----
 1 files changed, 29 insertions(+), 4 deletions(-)

diff --git a/epan/dissectors/packet-nfs.c b/epan/dissectors/packet-nfs.c
index 0d1d1e9..fc2b296 100644
--- a/epan/dissectors/packet-nfs.c
+++ b/epan/dissectors/packet-nfs.c
@@ -6845,6 +6845,22 @@ static const value_string names_open4_share_access[] = {
 	{ OPEN4_SHARE_ACCESS_WRITE, "OPEN4_SHARE_ACCESS_WRITE" },
 #define OPEN4_SHARE_ACCESS_BOTH 0x00000003
 	{ OPEN4_SHARE_ACCESS_BOTH, "OPEN4_SHARE_ACCESS_BOTH" },
+#define  OPEN4_SHARE_ACCESS_WANT_NO_PREFERENCE     0x0000
+	{ OPEN4_SHARE_ACCESS_WANT_NO_PREFERENCE, "OPEN4_SHARE_ACCESS_WANT_NO_PREFERENCE" },
+#define  OPEN4_SHARE_ACCESS_WANT_READ_DELEG        0x0100
+	{ OPEN4_SHARE_ACCESS_WANT_READ_DELEG, "OPEN4_SHARE_ACCESS_WANT_READ_DELEG" },
+#define  OPEN4_SHARE_ACCESS_WANT_WRITE_DELEG       0x0200
+	{ OPEN4_SHARE_ACCESS_WANT_WRITE_DELEG, "OPEN4_SHARE_ACCESS_WANT_WRITE_DELEG" },
+#define  OPEN4_SHARE_ACCESS_WANT_ANY_DELEG         0x0300
+	{ OPEN4_SHARE_ACCESS_WANT_ANY_DELEG, "OPEN4_SHARE_ACCESS_WANT_ANY_DELEG" },
+#define  OPEN4_SHARE_ACCESS_WANT_NO_DELEG          0x0400
+	{ OPEN4_SHARE_ACCESS_WANT_NO_DELEG, "OPEN4_SHARE_ACCESS_WANT_NO_DELEG" },
+#define  OPEN4_SHARE_ACCESS_WANT_CANCEL            0x0500
+	{ OPEN4_SHARE_ACCESS_WANT_CANCEL, "OPEN4_SHARE_ACCESS_WANT_CANCEL" },
+#define OPEN4_SHARE_ACCESS_WANT_SIGNAL_DELEG_WHEN_RESRC_AVAIL 0x10000
+	{ OPEN4_SHARE_ACCESS_WANT_SIGNAL_DELEG_WHEN_RESRC_AVAIL, "OPEN4_SHARE_ACCESS_WANT_SIGNAL_DELEG_WHEN_RESRC_AVAIL"},
+#define OPEN4_SHARE_ACCESS_WANT_PUSH_DELEG_WHEN_UNCONTENDED  0x20000
+	{ OPEN4_SHARE_ACCESS_WANT_PUSH_DELEG_WHEN_UNCONTENDED, "OPEN4_SHARE_ACCESS_WANT_PUSH_DELEG_WHEN_UNCONTENDED"},
 	{ 0, NULL }
 };
 
@@ -6910,16 +6926,23 @@ dissect_nfs_open_claim_delegate_cur4(tvbuff_t *tvb, int offset,
 #define CLAIM_NULL				0
 #define CLAIM_PREVIOUS			1
 #define CLAIM_DELEGATE_CUR		2
-#define CLAIM_DELEGATE_PREV	3
+#define CLAIM_DELEGATE_PREV		3
+#define CLAIM_FH				4
+#define CLAIM_DELEG_CUR_FH		5
+#define CLAIM_DELEG_CUR_PREV_FH	6
 
 static const value_string names_claim_type4[] = {
 	{	CLAIM_NULL,  		"CLAIM_NULL"  },
 	{	CLAIM_PREVIOUS, 	"CLAIM_PREVIOUS" },
-	{	CLAIM_DELEGATE_CUR, 	"CLAIM_DELEGATE_CUR" },
-	{	CLAIM_DELEGATE_PREV,	"CLAIM_DELEGATE_PREV" },
+	{	CLAIM_DELEGATE_CUR,	"CLAIM_DELEGATE_CUR" },
+	{	CLAIM_DELEGATE_PREV,"CLAIM_DELEGATE_PREV" },
+	{	CLAIM_FH,			"CLAIM_FH" },
+	{	CLAIM_DELEG_CUR_FH,	"CLAIM_DELEG_CUR_FH"},
+	{	CLAIM_DELEG_CUR_PREV_FH, "CLAIN_DELEG_CUR_PREV_FH"},
 	{	0, NULL }
 };
 
+
 static int
 dissect_nfs_open_claim4(tvbuff_t *tvb, int offset,
 	proto_tree *tree)
@@ -7590,10 +7613,12 @@ dissect_nfs_open_write_delegation4(tvbuff_t *tvb, int offset,
 #define OPEN_DELEGATE_NONE 0
 #define OPEN_DELEGATE_READ 1
 #define OPEN_DELEGATE_WRITE 2
+#define OPEN_DELEGATE_NONE_EXT 3 /* new to v4.1 */
 static const value_string names_open_delegation_type4[] = {
-	{	OPEN_DELEGATE_NONE,	"OPEN_DELEGATE_NONE" },
+	{	OPEN_DELEGATE_NONE,		"OPEN_DELEGATE_NONE" },
 	{	OPEN_DELEGATE_READ, 	"OPEN_DELEGATE_READ" },
 	{	OPEN_DELEGATE_WRITE,	"OPEN_DELEGATE_WRITE" },
+	{	OPEN_DELEGATE_NONE_EXT, "OPEN_DELEGATE_NONE_EXT"},
 	{	0,	NULL }
 };
 
-- 
1.5.5.1.211.g65ea3


--------------010504080207030209060809
Content-Type: text/x-patch;
 name="0011-display-all-file-attribytes-defined-by-v41.patch"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline;
 filename*0="0011-display-all-file-attribytes-defined-by-v41.patch"