[wireshark/f16] - Fixed a regression introduce by upstream patch r38306 which caused v4.1 traffic not to be displ
Steve Dickson
steved at fedoraproject.org
Mon Oct 17 17:27:26 UTC 2011
commit 5a23b45c813a248f8def270903f34df65a430413
Author: Steve Dickson <steved at redhat.com>
Date: Mon Oct 17 13:12:35 2011 -0400
- Fixed a regression introduce by upstream patch r38306
which caused v4.1 traffic not to be displayed.
- Added v4 error status to packet detail window.
Signed-off-by: Steve Dickson <steved at redhat.com>
wireshark-1.6.2-nfsv41-addstatus.patch | 59 ++++++++++++++++++++++++++++++++
wireshark.spec | 11 +++++-
2 files changed, 68 insertions(+), 2 deletions(-)
---
diff --git a/wireshark-1.6.2-nfsv41-addstatus.patch b/wireshark-1.6.2-nfsv41-addstatus.patch
new file mode 100644
index 0000000..9eb9405
--- /dev/null
+++ b/wireshark-1.6.2-nfsv41-addstatus.patch
@@ -0,0 +1,59 @@
+diff -up wireshark-1.6.2/epan/dissectors/packet-nfs.c.orig wireshark-1.6.2/epan/dissectors/packet-nfs.c
+--- wireshark-1.6.2/epan/dissectors/packet-nfs.c.orig 2011-09-07 21:54:18.000000000 -0400
++++ wireshark-1.6.2/epan/dissectors/packet-nfs.c 2011-10-17 12:43:30.116761420 -0400
+@@ -768,7 +768,7 @@ static int nfsv4_operation_tiers[] = {
+ 1 /* 50, NFS4_OP_LAYOUTGET */,
+ 1 /* 51, NFS4_OP_LAYOUTRETURN */,
+ 1 /* 52, NFS4_OP_SECINFO_NO_NAME */,
+- 1 /* 53, NFS4_OP_SEQUENCE */,
++ 4 /* 53, NFS4_OP_SEQUENCE */,
+ 1 /* 54, NFS4_OP_SET_SSV */,
+ 1 /* 55, NFS4_OP_TEST_STATEID */,
+ 1 /* 56, NFS4_OP_WANT_DELEGATION */,
+@@ -8077,7 +8077,6 @@ static value_string_ext names_nfsv4_oper
+ static gint *nfsv4_operation_ett[] =
+ {
+ &ett_nfs_access4 ,
+- &ett_nfs_access_supp4,
+ &ett_nfs_close4 ,
+ &ett_nfs_commit4 ,
+ &ett_nfs_create4 ,
+@@ -8970,6 +8969,8 @@ dissect_nfs_argop4(tvbuff_t *tvb, int of
+ ftree = proto_item_add_subtree(fitem, ett_nfs_argop4);
+ }
+
++ proto_item_append_text(tree, ", Ops(%d):", ops);
++
+ for (ops_counter=0; ops_counter<ops; ops_counter++)
+ {
+ op_summary[ops_counter].optext = g_string_new("");
+@@ -9003,6 +9004,7 @@ dissect_nfs_argop4(tvbuff_t *tvb, int of
+ g_string_printf (op_summary[ops_counter].optext, "%s",
+ val_to_str_ext_const(opcode, &names_nfsv4_operation_ext, "Unknown"));
+
++ proto_item_append_text(tree, " %s", opname);
+
+ switch(opcode)
+ {
+@@ -9621,6 +9623,8 @@ dissect_nfs_resop4(tvbuff_t *tvb, int of
+ ftree = proto_item_add_subtree(fitem, ett_nfs_resop4);
+ }
+
++ proto_item_append_text(tree, ", Ops(%d):", ops);
++
+ for (ops_counter = 0; ops_counter < ops; ops_counter++)
+ {
+ op_summary[ops_counter].optext = g_string_new("");
+@@ -9654,6 +9658,12 @@ dissect_nfs_resop4(tvbuff_t *tvb, int of
+ g_string_append_printf (op_summary[ops_counter].optext, "%s", opname);
+
+ offset = dissect_nfs_nfsstat4(tvb, offset, newftree, &status);
++ if (status != NFS4_OK) {
++ proto_item_append_text(tree, " %s(%s)", opname,
++ val_to_str_ext(status, &names_nfs_stat_ext, "Unknown error:%u"));
++ } else {
++ proto_item_append_text(tree, " %s", opname);
++ }
+
+ /*
+ * With the exception of NFS4_OP_LOCK, NFS4_OP_LOCKT, and
diff --git a/wireshark.spec b/wireshark.spec
index a70b8d7..8bb88fb 100644
--- a/wireshark.spec
+++ b/wireshark.spec
@@ -11,7 +11,7 @@
Summary: Network traffic analyzer
Name: wireshark
Version: 1.6.2
-Release: 1%{?dist}
+Release: 2%{?dist}
License: GPL+
Group: Applications/Internet
Source0: http://wireshark.org/download/src/%{name}-%{version}.tar.bz2
@@ -30,6 +30,7 @@ Patch2: wireshark-1.2.4-enable_lua.patch
Patch3: wireshark-libtool-pie.patch
Patch4: wireshark-1.6.1-group-msg.patch
Patch5: wireshark-1.6.0-soname.patch
+Patch6: wireshark-1.6.2-nfsv41-addstatus.patch
Url: http://www.wireshark.org/
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -103,9 +104,10 @@ and plugins.
%patch2 -p1 -b .enable_lua
%endif
-%patch3 -p1
+%patch3 -p1 -b .v4cleanup
%patch4 -p1 -b .group-msg
%patch5 -p1 -b .soname
+%patch6 -p1 -b .v4staus
%build
%ifarch s390 s390x sparcv9 sparc64
@@ -328,6 +330,11 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
%{_sbindir}/idl2wrs
%changelog
+* Mon Oct 17 2011 Steve Dickson <steved at redhat.com> - 1.6.2-2
+- Fixed a regression introduce by upstream patch r38306
+ which caused v4.1 traffic not to be displayed.
+- Added v4 error status to packet detail window.
+
* Fri Sep 9 2011 Jan Safranek <jsafrane at redhat.com> - 1.6.2-1
- upgrade to 1.6.2
- see http://www.wireshark.org/docs/relnotes/wireshark-1.6.2.html
More information about the scm-commits
mailing list