Fixed LOOKUPP (NFSv4) decoding (previously undefined operation), added
two new NFS4ERR_xxx error codes, and minor fix to ACL decoding.
Index: packet-nfs.c
===================================================================
RCS file: /cvsroot/ethereal/packet-nfs.c,v
retrieving revision 1.77
diff -u -r1.77 packet-nfs.c
--- packet-nfs.c        2002/08/06 05:51:13     1.77
+++ packet-nfs.c        2002/08/06 16:46:11
@@ -1634,6 +1634,8 @@
        {       10035,  "NFS4ERR_RECLAIM_CONFLICT"                      },
        {       10036,  "NFS4ERR_BADXDR"                                },
        {       10037,  "NFS4ERR_LOCKS_HELD"                            },
+       {       10038,  "NFS4ERR_OPENMODE"      },
+       {       10039,  "NFS4ERR_BADOWNER"      },
        { 0, NULL }
 };
 
@@ -5110,8 +5112,8 @@
                                                break;
 
                                        case FATTR4_RDATTR_ERROR:
-                                               attr_vals_offset = 
dissect_nfs_nfsstat4(tvb, attr_vals_offset,
-                                                       attr_newftree, NULL);
+                                               attr_vals_offset = 
dissect_nfs_nfsstat4(tvb, 
+                                                       attr_vals_offset, 
attr_newftree, NULL);
                                                break;
 
                                        case FATTR4_ACL:
@@ -5121,7 +5123,8 @@
 
                                        case FATTR4_ACLSUPPORT:
                                                attr_vals_offset = 
dissect_rpc_uint32(tvb,
-                                                       attr_newftree, 
hf_nfs_fattr4_aclsupport, offset);
+                                                       attr_newftree, 
hf_nfs_fattr4_aclsupport, 
+                                                       attr_vals_offset);
                                                break;
 
                                        case FATTR4_ARCHIVE:
@@ -5629,6 +5632,7 @@
        {       NFS4_OP_LOCKT,                                          "LOCKT" },
        {       NFS4_OP_LOCKU,                                          "LOCKU" },
        {       NFS4_OP_LOOKUP,                                 "LOOKUP"        },
+       {       NFS4_OP_LOOKUPP,                                        "LOOKUPP" },
        {       NFS4_OP_NVERIFY,                                        "NVERIFY"      
 },
        {       NFS4_OP_OPEN,                                           "OPEN"  },
        {       NFS4_OP_OPENATTR,                                       "OPENATTR"     
 },

Reply via email to