xnu-4903.241.1.tar.gz

[apple/xnu.git] / bsd / nfs / nfsrvcache.h

diff --git a/bsd/nfs/nfsrvcache.h b/bsd/nfs/nfsrvcache.h
index b18671041582e93180d64e91b0c8b8c594386e7f..5d3e311b527b514ff122a3169dd5b64df3588758 100644 (file)
--- a/bsd/nfs/nfsrvcache.h
+++ b/bsd/nfs/nfsrvcache.h
@@ -1,23 +1,29 @@
 /*
 /*

- * Copyright (c) 2000-2004 Apple Computer, Inc. All rights reserved.
+ * Copyright (c) 2000-2010 Apple Inc. All rights reserved.

  *
  *

- * @APPLE_LICENSE_HEADER_START@
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_START@

  * 
  * 

- * The contents of this file constitute Original Code as defined in and
- * are subject to the Apple Public Source License Version 1.1 (the
- * "License").  You may not use this file except in compliance with the
- * License.  Please obtain a copy of the License at
- * http://www.apple.com/publicsource and read it before using this file.
+ * This file contains Original Code and/or Modifications of Original Code
+ * as defined in and that are subject to the Apple Public Source License
+ * Version 2.0 (the 'License'). You may not use this file except in
+ * compliance with the License. The rights granted to you under the License
+ * may not be used to create, or enable the creation or redistribution of,
+ * unlawful or unlicensed copies of an Apple operating system, or to
+ * circumvent, violate, or enable the circumvention or violation of, any
+ * terms of an Apple operating system software license agreement.

  * 
  * 

- * This Original Code and all software distributed under the License are
- * distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * Please obtain a copy of the License at
+ * http://www.opensource.apple.com/apsl/ and read it before using this file.
+ * 
+ * The Original Code and all software distributed under the License are
+ * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER

  * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
  * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
  * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
  * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,

- * FITNESS FOR A PARTICULAR PURPOSE OR NON-INFRINGEMENT.  Please see the
- * License for the specific language governing rights and limitations
- * under the License.
+ * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
+ * Please see the License for the specific language governing rights and
+ * limitations under the License.

  * 
  * 

- * @APPLE_LICENSE_HEADER_END@
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_END@

  */
 /* Copyright (c) 1995 NeXT Computer, Inc. All Rights Reserved */
 /*
  */
 /* Copyright (c) 1995 NeXT Computer, Inc. All Rights Reserved */
 /*


@@ -70,16 +76,24 @@
  * Definitions for the server recent request cache
  */
 
  * Definitions for the server recent request cache
  */
 

+/* Network address hash list element */
+union nethostaddr {
+       in_addr_t had_inetaddr;
+       struct in6_addr had_inet6addr;
+       mbuf_t had_nam;
+};
+

 #define        NFSRVCACHESIZ   64
 
 struct nfsrvcache {
        TAILQ_ENTRY(nfsrvcache) rc_lru;         /* LRU chain */
        LIST_ENTRY(nfsrvcache) rc_hash;         /* Hash chain */
 #define        NFSRVCACHESIZ   64
 
 struct nfsrvcache {
        TAILQ_ENTRY(nfsrvcache) rc_lru;         /* LRU chain */
        LIST_ENTRY(nfsrvcache) rc_hash;         /* Hash chain */

-       u_long  rc_xid;                         /* rpc id number */
+       u_int32_t       rc_xid;                         /* rpc id number */

        union {
                mbuf_t ru_repmb;                /* Reply mbuf list OR */
                int ru_repstat;                 /* Reply status */
        } rc_un;
        union {
                mbuf_t ru_repmb;                /* Reply mbuf list OR */
                int ru_repstat;                 /* Reply status */
        } rc_un;

+       sa_family_t rc_family;                  /* address family */

        union nethostaddr rc_haddr;             /* Host address */
        u_int32_t rc_proc;                      /* rpc proc number */
        u_char  rc_state;               /* Current state of request */
        union nethostaddr rc_haddr;             /* Host address */
        u_int32_t rc_proc;                      /* rpc proc number */
        u_char  rc_state;               /* Current state of request */


@@ -89,6 +103,7 @@ struct nfsrvcache {
 #define        rc_reply        rc_un.ru_repmb
 #define        rc_status       rc_un.ru_repstat
 #define        rc_inetaddr     rc_haddr.had_inetaddr
 #define        rc_reply        rc_un.ru_repmb
 #define        rc_status       rc_un.ru_repstat
 #define        rc_inetaddr     rc_haddr.had_inetaddr

+#define        rc_inet6addr    rc_haddr.had_inet6addr

 #define        rc_nam          rc_haddr.had_nam
 
 /* Cache entry states */
 #define        rc_nam          rc_haddr.had_nam
 
 /* Cache entry states */


@@ -110,5 +125,8 @@ struct nfsrvcache {
 #define        RC_INETADDR     0x20
 #define        RC_NAM          0x40
 
 #define        RC_INETADDR     0x20
 #define        RC_NAM          0x40
 

+extern lck_grp_t *nfsrv_reqcache_lck_grp;
+extern lck_mtx_t *nfsrv_reqcache_mutex;
+

 #endif /* __APPLE_API_PRIVATE */
 #endif /* _NFS_NFSRVCACHE_H_ */
 #endif /* __APPLE_API_PRIVATE */
 #endif /* _NFS_NFSRVCACHE_H_ */