[PATCH 01/13] removed non NFSv41 spec ops definitions added missing ops

[Tigran Mkrtchyan]

---
 epan/dissectors/packet-nfs.c |   22 ++--------------------
 epan/dissectors/packet-nfs.h |   32 +++++++++++++++++++-------------
 2 files changed, 21 insertions(+), 33 deletions(-)

diff --git a/epan/dissectors/packet-nfs.c b/epan/dissectors/packet-nfs.c
index ffaef77..60fca85 100644
--- a/epan/dissectors/packet-nfs.c
+++ b/epan/dissectors/packet-nfs.c
@@ -7128,10 +7128,6 @@ static const value_string names_nfsv4_operation[] = {
 	{	NFS4_OP_LAYOUTCOMMIT,		"LAYOUTCOMMIT" },
 	{	NFS4_OP_LAYOUTGET,		"LAYOUTGET" },
 	{	NFS4_OP_LAYOUTRETURN,		"LAYOUTRETURN" },
-	{	NFS4_OP_NOTIFYDS,		"PNFS_NOTIFYDS"},
-	{	NFS4_OP_PNFS_CREATE,		"PNFS_CREATE"},
-	{	NFS4_OP_PNFS_WRITE,		"PNFS_WRITE"},
-	{	NFS4_OP_PNFS_READ,		"PNFS_READ"},
 	{	NFS4_OP_ILLEGAL,		"ILLEGAL"},
 	{	0,	NULL }
 };
@@ -8021,7 +8017,7 @@ dissect_nfs_argop4(tvbuff_t *tvb, int offset, packet_info *pinfo,
 		offset += 4;
 
 		/* the opcodes are not contiguous */
-		if ((opcode < NFS4_OP_ACCESS || opcode > NFS4_OP_PNFS_CREATE)	&&
+		if ((opcode < NFS4_OP_ACCESS || opcode > NFS4_OP_RECLAIM_COMPLETE)	&&
 			(opcode != NFS4_OP_ILLEGAL))
 			break;
 
@@ -8379,14 +8375,6 @@ dissect_nfs_argop4(tvbuff_t *tvb, int offset, packet_info *pinfo,
 			offset = dissect_rpc_bool(tvb, newftree, hf_nfs_cachethis4, offset);
 			break;
 
-		case NFS4_OP_NOTIFYDS:
-			offset = dissect_nfs_notifydsargs4(tvb, offset, newftree);
-			break;
-
-		case NFS4_OP_PNFS_CREATE:
-			offset = dissect_nfs_utf8string(tvb, offset, newftree, hf_nfs_component4, NULL);
-			break;
-
 		/* In theory, it's possible to get this opcode */
 		case NFS4_OP_ILLEGAL:
 			break;
@@ -8473,7 +8461,7 @@ dissect_nfs_resop4(tvbuff_t *tvb, int offset, packet_info *pinfo,
 		opcode = tvb_get_ntohl(tvb, offset);
 
 		/* sanity check for bogus packets */
-		if ((opcode < NFS4_OP_ACCESS || opcode > NFS4_OP_PNFS_CREATE) &&
+		if ((opcode < NFS4_OP_ACCESS || opcode > NFS4_OP_RECLAIM_COMPLETE) &&
 			(opcode != NFS4_OP_ILLEGAL))
 			break;
 
@@ -8708,12 +8696,6 @@ dissect_nfs_resop4(tvbuff_t *tvb, int offset, packet_info *pinfo,
 										offset);
 			break;
 
-		case NFS4_OP_NOTIFYDS:
-			break;
-
-		case NFS4_OP_PNFS_CREATE:
-			break;
-
 		default:
 			break;
 		}
diff --git a/epan/dissectors/packet-nfs.h b/epan/dissectors/packet-nfs.h
index b569341..f72ae57 100644
--- a/epan/dissectors/packet-nfs.h
+++ b/epan/dissectors/packet-nfs.h
@@ -105,19 +105,25 @@
 #define NFS4_OP_WRITE						38
 #define NFS4_OP_RELEASE_LOCKOWNER		39
 /* Minor version 1 */
-#define NFS4_OP_EXCHANGE_ID       42
-#define NFS4_OP_CREATE_SESSION    43
-#define NFS4_OP_DESTROY_SESSION   44
-#define NFS4_OP_GETDEVINFO        47
-#define NFS4_OP_GETDEVLIST		  48
-#define NFS4_OP_LAYOUTCOMMIT         49
-#define NFS4_OP_LAYOUTGET	    	 50
-#define NFS4_OP_LAYOUTRETURN		 51
-#define NFS4_OP_SEQUENCE             53
-#define NFS4_OP_NOTIFYDS             60
-#define NFS4_OP_PNFS_CREATE          61
-#define NFS4_OP_PNFS_WRITE           62
-#define NFS4_OP_PNFS_READ            63
+#define NFS4_OP_BACKCHANNEL_CTL       40
+#define NFS4_OP_BIND_CONN_TO_SESSION  41
+#define NFS4_OP_EXCHANGE_ID           42
+#define NFS4_OP_CREATE_SESSION        43
+#define NFS4_OP_DESTROY_SESSION       44
+#define NFS4_OP_FREE_STATEID          45
+#define NFS4_OP_GET_DIR_DELEGATION    46
+#define NFS4_OP_GETDEVINFO            47
+#define NFS4_OP_GETDEVLIST            48
+#define NFS4_OP_LAYOUTCOMMIT          49
+#define NFS4_OP_LAYOUTGET             50
+#define NFS4_OP_LAYOUTRETURN          51
+#define NFS4_OP_SECINFO_NO_NAME       52
+#define NFS4_OP_SEQUENCE              53
+#define NFS4_OP_SET_SSV               54
+#define NFS4_OP_TEST_STATEID          55
+#define NFS4_OP_WANT_DELEGATION       56
+#define NFS4_OP_DESTROY_CLIENTID      57
+#define NFS4_OP_RECLAIM_COMPLETE      58
 
 #define NFS4_OP_ILLEGAL						10044
 
-- 
1.5.4.5


--------------090206040200030309000502
Content-Type: text/x-patch;
 name="0002-removed-traing-spaces.patch"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline;
 filename="0002-removed-traing-spaces.patch"