66 lines
2.1 KiB
Diff
66 lines
2.1 KiB
Diff
|
Index: wireshark-1.4.2/epan/dissectors/packet-nfs.c
|
||
|
|
===================================================================
|
||
|
|
--- wireshark-1.4.2.orig/epan/dissectors/packet-nfs.c
|
||
|
|
+++ wireshark-1.4.2/epan/dissectors/packet-nfs.c
|
||
|
|
@@ -8795,6 +8795,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);
|
||
|
|
@@ -8824,6 +8826,15 @@ dissect_nfs_argop4(tvbuff_t *tvb, int of
|
||
|
|
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:
|
||
|
|
@@ -9290,6 +9301,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);
|
||
|
|
@@ -9321,6 +9334,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
|
||
|
|
@@ -9665,7 +9689,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 }
|
||
|
|
};
|