Merge pull request #4 from infrastation/master

[tcpdump] / nfs.h

diff --git a/nfs.h b/nfs.h
index 44b834fd9ded5c0da08b172108f605809b7f8476..a5b502582aeb6da7d1c21ff0d383112ab4897c9b 100644 (file)
--- a/nfs.h
+++ b/nfs.h
@@ -1,4 +1,5 @@
-/*     $NetBSD: nfs.h,v 1.1 1996/05/23 22:49:53 fvdl Exp $     */
+/* @(#) $Header: /tcpdump/master/tcpdump/nfs.h,v 1.9 2007-11-18 03:24:38 guy Exp $ (LBL) */
+/*     NetBSD: nfs.h,v 1.1 1996/05/23 22:49:53 fvdl Exp        */

 
 /*
  * Copyright (c) 1989, 1993
 
 /*
  * Copyright (c) 1989, 1993


@@ -214,6 +215,7 @@
 #define NFSV3ACCESS_EXTEND             0x08
 #define NFSV3ACCESS_DELETE             0x10
 #define NFSV3ACCESS_EXECUTE            0x20
 #define NFSV3ACCESS_EXTEND             0x08
 #define NFSV3ACCESS_DELETE             0x10
 #define NFSV3ACCESS_EXECUTE            0x20

+#define NFSV3ACCESS_FULL               0x3f

 
 #define NFSV3WRITE_UNSTABLE            0
 #define NFSV3WRITE_DATASYNC            1
 
 #define NFSV3WRITE_UNSTABLE            0
 #define NFSV3WRITE_DATASYNC            1


@@ -245,7 +247,7 @@
 
 /* File types */
 typedef enum { NFNON=0, NFREG=1, NFDIR=2, NFBLK=3, NFCHR=4, NFLNK=5,
 
 /* File types */
 typedef enum { NFNON=0, NFREG=1, NFDIR=2, NFBLK=3, NFCHR=4, NFLNK=5,

-       NFSOCK=6, NFFIFO=7 } nfstype;
+       NFSOCK=6, NFFIFO=7 } nfs_type;

 
 /* Structs for common parts of the rpc's */
 /*
 
 /* Structs for common parts of the rpc's */
 /*


@@ -285,21 +287,6 @@ struct nfs_uquad {
 };
 typedef        struct nfs_uquad        nfsuint64;
 
 };
 typedef        struct nfs_uquad        nfsuint64;
 

-#if 0 /* XXX - this doesn't seemed to be used and it doesn't work
-       * with non-gcc, so comment it out for now.
-       */
-
-/*
- * Used to convert between two u_longs and a u_quad_t.
- */
-union nfs_quadconvert {
-       u_int32_t lval[2];
-       u_int64_t qval;
-};
-typedef union nfs_quadconvert  nfsquad_t;
-
-#endif
-

 /*
  * NFS Version 3 special file number.
  */
 /*
  * NFS Version 3 special file number.
  */