X-Git-Url: https://git.tcpdump.org/tcpdump/blobdiff_plain/ed1906f1fecee695cba92b655aec96a842961923..0ba2f9c718eb3272153cba85db2912b1ad853e6f:/print-nfs.c diff --git a/print-nfs.c b/print-nfs.c index 1ed2cdfb..6aafde7e 100644 --- a/print-nfs.c +++ b/print-nfs.c @@ -50,7 +50,7 @@ static const char rcsid[] _U_ = static void nfs_printfh(const u_int32_t *, const u_int); static int xid_map_enter(const struct sunrpc_msg *, const u_char *); -static int32_t xid_map_find(const struct sunrpc_msg *, const u_char *, +static int xid_map_find(const struct sunrpc_msg *, const u_char *, u_int32_t *, u_int32_t *); static void interp_reply(const struct sunrpc_msg *, u_int32_t, u_int32_t, int); static const u_int32_t *parse_post_op_attr(const u_int32_t *, int); @@ -508,6 +508,7 @@ nfsreq_print(register const u_char *bp, u_int length, nfs_type type; int v3; u_int32_t proc; + u_int32_t access_flags; struct nfsv3_sattr sa3; char srcid[20], dstid[20]; /*fits 32bit*/ @@ -570,7 +571,37 @@ nfsreq_print(register const u_char *bp, u_int length, if ((dp = parsereq(rp, length)) != NULL && (dp = parsefh(dp, v3)) != NULL) { TCHECK(dp[0]); - printf(" %04x", EXTRACT_32BITS(&dp[0])); + access_flags = EXTRACT_32BITS(&dp[0]); + if (access_flags & ~NFSV3ACCESS_FULL) { + /* NFSV3ACCESS definitions aren't up to date */ + printf(" %04x", access_flags); + } else if ((access_flags & NFSV3ACCESS_FULL) == NFSV3ACCESS_FULL) { + printf(" NFS_ACCESS_FULL"); + } else { + char separator = ' '; + if (access_flags & NFSV3ACCESS_READ) { + printf(" NFS_ACCESS_READ"); + separator = '|'; + } + if (access_flags & NFSV3ACCESS_LOOKUP) { + printf("%cNFS_ACCESS_LOOKUP", separator); + separator = '|'; + } + if (access_flags & NFSV3ACCESS_MODIFY) { + printf("%cNFS_ACCESS_MODIFY", separator); + separator = '|'; + } + if (access_flags & NFSV3ACCESS_EXTEND) { + printf("%cNFS_ACCESS_EXTEND", separator); + separator = '|'; + } + if (access_flags & NFSV3ACCESS_DELETE) { + printf("%cNFS_ACCESS_DELETE", separator); + separator = '|'; + } + if (access_flags & NFSV3ACCESS_EXECUTE) + printf("%cNFS_ACCESS_EXECUTE", separator); + } return; } break;