rpms/ethereal/devel ethereal-0.10.14-nfsv4-opts.patch, NONE, 1.1 ethereal.spec, 1.63, 1.64

[fedora-cvs-commits at redhat.com]

Author: steved

Update of /cvs/dist/rpms/ethereal/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv9616

Modified Files:
	ethereal.spec 
Added Files:
	ethereal-0.10.14-nfsv4-opts.patch 
Log Message:
Added code to better show NFS V4 opts


ethereal-0.10.14-nfsv4-opts.patch:
 packet-nfs.c |   26 +++++++++++++++++++++++++-
 1 files changed, 25 insertions(+), 1 deletion(-)

--- NEW FILE ethereal-0.10.14-nfsv4-opts.patch ---
--- ethereal-0.10.14/epan/dissectors/packet-nfs.c.orig	2005-12-26 21:21:11.000000000 -0500
+++ ethereal-0.10.14/epan/dissectors/packet-nfs.c	2006-01-02 13:57:05.000000000 -0500
@@ -7040,6 +7040,8 @@ dissect_nfs_argop4(tvbuff_t *tvb, int of
 
 	if (ftree == NULL) return offset;
 
+	proto_item_append_text(tree, ", Ops(%d):", ops);
+
 	for (ops_counter=0; ops_counter<ops; ops_counter++)
 	{
 		opcode = tvb_get_ntohl(tvb, offset);
@@ -7064,6 +7066,15 @@ dissect_nfs_argop4(tvbuff_t *tvb, int of
 
 		if (newftree == NULL)	break;
 
+		if (opcode != NFS4_OP_PUTFH) {
+			if (check_col(pinfo->cinfo, COL_INFO)) {
+				col_append_fstr(pinfo->cinfo, COL_INFO, " %s", 
+					names_nfsv4_operation[opcode - 3].strptr);
+			}
+		}
+		proto_item_append_text(tree, " %s", 
+			names_nfsv4_operation[opcode - 3].strptr);
+
 		switch(opcode)
 		{
 		case NFS4_OP_ACCESS:
@@ -7391,6 +7402,8 @@ dissect_nfs_resop4(tvbuff_t *tvb, int of
 
 	if (ftree == NULL)	return offset;		/* error adding new subtree */
 
+	proto_item_append_text(tree, ", Ops(%d):", ops);
+
 	for (ops_counter = 0; ops_counter < ops; ops_counter++)
 	{
 		opcode = tvb_get_ntohl(tvb, offset);
@@ -7418,6 +7431,17 @@ dissect_nfs_resop4(tvbuff_t *tvb, int of
 
 		offset = dissect_nfs_nfsstat4(tvb, offset, newftree, &status);
 
+		if (check_col(pinfo->cinfo, COL_INFO)) {
+			if (status != NFS4_OK) {
+				col_append_fstr(pinfo->cinfo, COL_INFO, " %s(%d)", 
+					names_nfsv4_operation[opcode - 3].strptr, status);
+			} else if (opcode != NFS4_OP_PUTFH) {
+				col_append_fstr(pinfo->cinfo, COL_INFO, " %s", 
+					names_nfsv4_operation[opcode - 3].strptr);
+			}
+		}
+		proto_item_append_text(tree, " %s(%d)", 
+			names_nfsv4_operation[opcode - 3].strptr, status);
 		/*
 		 * With the exception of NFS4_OP_LOCK, NFS4_OP_LOCKT, and
 		 * NFS4_OP_SETATTR, all other ops do *not* return data with the
@@ -7662,7 +7686,7 @@ static const value_string nfsv3_proc_val
 static const vsff nfs4_proc[] = {
 	{ 0, "NULL",
 	dissect_nfs3_null_call,		dissect_nfs3_null_reply },
-	{ 1, "COMPOUND",
+	{ 1, "COMP",
 	dissect_nfs4_compound_call, dissect_nfs4_compound_reply },
 	{ 0, NULL, NULL, NULL }
 };


Index: ethereal.spec
===================================================================
RCS file: /cvs/dist/rpms/ethereal/devel/ethereal.spec,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -r1.63 -r1.64
--- ethereal.spec	2 Jan 2006 12:32:06 -0000	1.63
+++ ethereal.spec	3 Jan 2006 11:47:27 -0000	1.64
@@ -4,7 +4,7 @@
 Summary: 	Network traffic analyzer
 Name: 		ethereal
 Version:	0.10.14
-Release: 	2
+Release: 	3
 License: 	GPL
 Group: 		Applications/Internet
 Source0: 	http://www.ethereal.com/distribution/%{name}-%{version}.tar.bz2
@@ -14,6 +14,7 @@
 Source4:	ethereal.png
 Patch1:		ethereal-0.10.13-pie.patch
 Patch2:		ethereal-gtk-dialog.patch
+Patch3:		ethereal-0.10.14-nfsv4-opts.patch
 Url: 		http://www.ethereal.com/
 BuildRoot: 	%{_tmppath}/%{name}-root
 Requires: 	libpcap >= 0.6
@@ -52,6 +53,7 @@
 %setup -q -n %{name}-%{version}
 %patch1 -p1 -b .pie
 %patch2 -p0 -b .gtk
+%patch3 -p1 
 
 %build
 %ifarch s390 s390x
@@ -161,6 +163,9 @@
 
 
 %changelog
+* Mon Jan  2 2006 Steve Dickson <steved at redhat.com> 0.10.14-3
+- Added code to better show NFS V4 opts
+
 * Mon Jan 02 2006 Radek Vokal <rvokal at redhat.com> 0.10.14-2
 - rebuilt against new net-snmp-5.3
 - gtk dialog bug (#156568)