Blame wireshark-1.6.2-nfsv41-addstatus.patch

Steve Dickson 4fd960
diff -up wireshark-1.6.2/epan/dissectors/packet-nfs.c.orig wireshark-1.6.2/epan/dissectors/packet-nfs.c
Steve Dickson 4fd960
--- wireshark-1.6.2/epan/dissectors/packet-nfs.c.orig	2011-09-07 21:54:18.000000000 -0400
Steve Dickson 4fd960
+++ wireshark-1.6.2/epan/dissectors/packet-nfs.c	2011-10-17 12:43:30.116761420 -0400
Steve Dickson 4fd960
@@ -768,7 +768,7 @@ static int nfsv4_operation_tiers[] = {
Steve Dickson 4fd960
 		 1 /* 50, NFS4_OP_LAYOUTGET */,
Steve Dickson 4fd960
 		 1 /* 51, NFS4_OP_LAYOUTRETURN */,
Steve Dickson 4fd960
 		 1 /* 52, NFS4_OP_SECINFO_NO_NAME */,
Steve Dickson 4fd960
-		 1 /* 53, NFS4_OP_SEQUENCE */,
Steve Dickson 4fd960
+		 4 /* 53, NFS4_OP_SEQUENCE */,
Steve Dickson 4fd960
 		 1 /* 54, NFS4_OP_SET_SSV */,
Steve Dickson 4fd960
 		 1 /* 55, NFS4_OP_TEST_STATEID */,
Steve Dickson 4fd960
 		 1 /* 56, NFS4_OP_WANT_DELEGATION  */,
Steve Dickson 4fd960
@@ -8077,7 +8077,6 @@ static value_string_ext names_nfsv4_oper
Steve Dickson 4fd960
 static gint *nfsv4_operation_ett[] =
Steve Dickson 4fd960
 {
Steve Dickson 4fd960
 	 &ett_nfs_access4 ,
Steve Dickson 4fd960
-	 &ett_nfs_access_supp4,
Steve Dickson 4fd960
 	 &ett_nfs_close4 ,
Steve Dickson 4fd960
 	 &ett_nfs_commit4 ,
Steve Dickson 4fd960
 	 &ett_nfs_create4 ,
Steve Dickson 4fd960
@@ -8970,6 +8969,8 @@ dissect_nfs_argop4(tvbuff_t *tvb, int of
Steve Dickson 4fd960
 		ftree = proto_item_add_subtree(fitem, ett_nfs_argop4);
Steve Dickson 4fd960
 	}
Steve Dickson 4fd960
 
Steve Dickson 4fd960
+	proto_item_append_text(tree, ", Ops(%d):", ops);
Steve Dickson 4fd960
+
Steve Dickson 4fd960
 	for (ops_counter=0; ops_counter
Steve Dickson 4fd960
 	{
Steve Dickson 4fd960
 		op_summary[ops_counter].optext = g_string_new("");
Steve Dickson 4fd960
@@ -9003,6 +9004,7 @@ dissect_nfs_argop4(tvbuff_t *tvb, int of
Steve Dickson 4fd960
 		g_string_printf (op_summary[ops_counter].optext, "%s",
Steve Dickson 4fd960
                                  val_to_str_ext_const(opcode, &names_nfsv4_operation_ext, "Unknown"));
Steve Dickson 4fd960
 
Steve Dickson 4fd960
+		proto_item_append_text(tree, " %s", opname);
Steve Dickson 4fd960
 
Steve Dickson 4fd960
 		switch(opcode)
Steve Dickson 4fd960
 		{
Steve Dickson 4fd960
@@ -9621,6 +9623,8 @@ dissect_nfs_resop4(tvbuff_t *tvb, int of
Steve Dickson 4fd960
 		ftree = proto_item_add_subtree(fitem, ett_nfs_resop4);
Steve Dickson 4fd960
 	}
Steve Dickson 4fd960
 
Steve Dickson 4fd960
+	proto_item_append_text(tree, ", Ops(%d):", ops);
Steve Dickson 4fd960
+
Steve Dickson 4fd960
 	for (ops_counter = 0; ops_counter < ops; ops_counter++)
Steve Dickson 4fd960
 	{
Steve Dickson 4fd960
 		op_summary[ops_counter].optext = g_string_new("");
Steve Dickson 4fd960
@@ -9654,6 +9658,12 @@ dissect_nfs_resop4(tvbuff_t *tvb, int of
Steve Dickson 4fd960
 		g_string_append_printf (op_summary[ops_counter].optext, "%s", opname);
Steve Dickson 4fd960
 
Steve Dickson 4fd960
 		offset = dissect_nfs_nfsstat4(tvb, offset, newftree, &status);
Steve Dickson 4fd960
+		if (status != NFS4_OK) {
Steve Dickson 4fd960
+			proto_item_append_text(tree, " %s(%s)", opname,
Steve Dickson 4fd960
+				val_to_str_ext(status, &names_nfs_stat_ext, "Unknown error:%u"));
Steve Dickson 4fd960
+		} else {
Steve Dickson 4fd960
+			proto_item_append_text(tree, " %s", opname);
Steve Dickson 4fd960
+		}
Steve Dickson 4fd960
 
Steve Dickson 4fd960
 		/*
Steve Dickson 4fd960
 		 * With the exception of NFS4_OP_LOCK, NFS4_OP_LOCKT, and