xnu-3247.1.106.tar.gz

[apple/xnu.git] / bsd / sys / unpcb.h

diff --git a/bsd/sys/unpcb.h b/bsd/sys/unpcb.h
index 2376c11f8fe1ae847a62252ba06cc6c3ba5925c0..936e998010f94265ea6062cdd8ca4d237a643705 100644 (file)
--- a/bsd/sys/unpcb.h
+++ b/bsd/sys/unpcb.h
@@ -1,5 +1,5 @@
 /*
 /*

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

  *
  * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
  * 
  *
  * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
  * 


@@ -134,7 +134,7 @@ struct      unpcb {
        unp_gen_t       unp_gencnt;     /* generation count of this instance */
        int             unp_flags;      /* flags */
        struct xucred   unp_peercred;   /* peer credentials, if applicable */
        unp_gen_t       unp_gencnt;     /* generation count of this instance */
        int             unp_flags;      /* flags */
        struct xucred   unp_peercred;   /* peer credentials, if applicable */

-       lck_mtx_t       *unp_mtx;       /* per unpcb lock */
+       decl_lck_mtx_data( ,unp_mtx);   /* per unpcb lock */

        int             rw_thrcount;    /* disconnect should wait for this count to become zero */
 };
 #endif /* KERNEL */
        int             rw_thrcount;    /* disconnect should wait for this count to become zero */
 };
 #endif /* KERNEL */


@@ -155,6 +155,7 @@ struct      unpcb {
 #define UNP_HAVEPC                     0x0001
 #define UNP_HAVEPCCACHED               0x0002
 #define UNP_DONTDISCONNECT             0x0004
 #define UNP_HAVEPC                     0x0001
 #define UNP_HAVEPCCACHED               0x0002
 #define UNP_DONTDISCONNECT             0x0004

+#define        UNP_TRACE_MDNS                  0x1000

 
 #ifdef KERNEL
 struct  unpcb_compat {
 
 #ifdef KERNEL
 struct  unpcb_compat {


@@ -165,7 +166,7 @@ struct      unpcb {
        _UNPCB_LIST_ENTRY(unpcb_compat) unp_link;       /* glue on list of all PCBs */
        _UNPCB_PTR(struct socket *)     unp_socket;     /* pointer back to socket */
        _UNPCB_PTR(struct vnode *)      unp_vnode;      /* if associated with file */
        _UNPCB_LIST_ENTRY(unpcb_compat) unp_link;       /* glue on list of all PCBs */
        _UNPCB_PTR(struct socket *)     unp_socket;     /* pointer back to socket */
        _UNPCB_PTR(struct vnode *)      unp_vnode;      /* if associated with file */

-       ino_t                           unp_ino;        /* fake inode number */
+       u_int32_t                       unp_ino;        /* fake inode number */

        _UNPCB_PTR(struct unpcb_compat *) unp_conn;     /* control block of connected socket */
 #if defined(KERNEL)
        u_int32_t                       unp_refs;
        _UNPCB_PTR(struct unpcb_compat *) unp_conn;     /* control block of connected socket */
 #if defined(KERNEL)
        u_int32_t                       unp_refs;


@@ -202,7 +203,6 @@ struct  xunpcb {
        u_quad_t                        xu_alignment_hack;
 };
 
        u_quad_t                        xu_alignment_hack;
 };
 

-#if !CONFIG_EMBEDDED

 
 struct xunpcb64_list_entry {
     u_int64_t   le_next;
 
 struct xunpcb64_list_entry {
     u_int64_t   le_next;


@@ -236,7 +236,6 @@ struct xunpcb64 {
        struct xsocket64        xu_socket;
 };
 
        struct xsocket64        xu_socket;
 };
 

-#endif /* !CONFIG_EMBEDDED */

 
 #pragma pack()
 
 
 #pragma pack()