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 481dcab8164a2ff1438ed93e6eda311e42f76f5b..5d3e311b527b514ff122a3169dd5b64df3588758 100644 (file)
--- a/bsd/nfs/nfsrvcache.h
+++ b/bsd/nfs/nfsrvcache.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000-2006 Apple Computer, Inc. All rights reserved.
+ * Copyright (c) 2000-2010 Apple Inc. All rights reserved.
  *
  * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
  * 
@@ -76,16 +76,24 @@
  * 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 */
-       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;
+       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 */
@@ -95,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_inet6addr    rc_haddr.had_inet6addr
 #define        rc_nam          rc_haddr.had_nam
 
 /* Cache entry states */
@@ -116,8 +125,8 @@ struct nfsrvcache {
 #define        RC_INETADDR     0x20
 #define        RC_NAM          0x40
 
-__private_extern__ lck_grp_t *nfsrv_reqcache_lck_grp;
-__private_extern__ lck_mtx_t *nfsrv_reqcache_mutex;
+extern lck_grp_t *nfsrv_reqcache_lck_grp;
+extern lck_mtx_t *nfsrv_reqcache_mutex;
 
 #endif /* __APPLE_API_PRIVATE */
 #endif /* _NFS_NFSRVCACHE_H_ */