rpms/wireshark
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Removed the fuzzines from wireshark-nfsv4-opts.patch

Browse Source
This commit is contained in:
Steve Dickson 2008-07-25 13:21:06 +00:00
parent 62e591eb84
commit 01a52df715
2 changed files with 23 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
wireshark-nfsv4-opts.patch
View File

@ -1,17 +1,18 @@
--- 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;
diff -up wireshark-1.0.2/epan/dissectors/packet-nfs.c.orig wireshark-1.0.2/epan/dissectors/packet-nfs.c
--- wireshark-1.0.2/epan/dissectors/packet-nfs.c.orig 2008-07-10 13:39:23.000000000 -0400
+++ wireshark-1.0.2/epan/dissectors/packet-nfs.c 2008-07-25 07:59:45.000000000 -0400
@@ -7962,6 +7962,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++)
{
opcode = tvb_get_ntohl(tvb, offset);
@@ -7064,6 +7066,15 @@ dissect_nfs_argop4(tvbuff_t *tvb, int of
if (newftree == NULL) break;
@@ -7991,6 +7993,15 @@ dissect_nfs_argop4(tvbuff_t *tvb, int of
break;
}
+ if (opcode != NFS4_OP_PUTFH) {
+ if (check_col(pinfo->cinfo, COL_INFO)) {
@ -25,16 +26,16 @@
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 */
@@ -8420,6 +8431,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++)
{
opcode = tvb_get_ntohl(tvb, offset);
@@ -7418,6 +7431,17 @@ dissect_nfs_resop4(tvbuff_t *tvb, int of
@@ -8451,6 +8464,17 @@ dissect_nfs_resop4(tvbuff_t *tvb, int of
offset = dissect_nfs_nfsstat4(tvb, offset, newftree, &status);
@ -52,7 +53,7 @@
/*
* 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
@@ -8770,7 +8794,7 @@ static const value_string nfsv3_proc_val
static const vsff nfs4_proc[] = {
{ 0, "NULL",
dissect_nfs3_null_call, dissect_nfs3_null_reply },

18
wireshark.spec
View File

@ -18,12 +18,12 @@ Source1: wireshark.pam
Source2: wireshark.console
Source3: wireshark.desktop
Patch1: wireshark-1.0.2-pie.patch
Patch3: wireshark-nfsv4-opts.patch
Patch4: wireshark-0.99.7-path.patch
Patch5: wireshark-nfsv41.patch
Patch6: wireshark-nfsv41-layout-types.patch
Patch7: wireshark-nfsv41-layout-updates.patch
Patch8: wireshark-rpc-pdu-size.patch
Patch2: wireshark-nfsv4-opts.patch
Patch3: wireshark-0.99.7-path.patch
Patch4: wireshark-nfsv41.patch
Patch5: wireshark-nfsv41-layout-types.patch
Patch6: wireshark-nfsv41-layout-updates.patch
Patch7: wireshark-rpc-pdu-size.patch
Url: http://www.wireshark.org/
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@ -79,12 +79,12 @@ Contains wireshark for Gnome 2 and desktop integration file
%setup -q -n %{name}-%{version}
%endif
%patch1 -p1 -b .pie
%patch3 -p1
%patch2 -p1
%patch3 -p1
%patch4 -p1
%patch5 -p1
%patch6 -p1
%patch7 -p1
%patch8 -p1
%build
%ifarch s390 s390x sparcv9 sparc64
@ -210,7 +210,7 @@ rm -rf $RPM_BUILD_ROOT
%changelog
* Thu Jul 17 2008 Steve Dickson <steved@redhat.com>
* Thu Jul 17 2008 Steve Dickson <steved@redhat.com> 1.0.2-2
- Added patches to support NFSv4.1
* Fri Jul 11 2008 Radek Vokál <rvokal@redhat.com> 1.0.2-1