xnu-7195.101.1.tar.gz

[apple/xnu.git] / osfmk / ipc / ipc_right.h

diff --git a/osfmk/ipc/ipc_right.h b/osfmk/ipc/ipc_right.h
index d995aef3a11aecdf147ea53c3890572c7786c7c7..fcaefbad6f3193e44f8191d551d59b16ad38e418 100644 (file)
--- a/osfmk/ipc/ipc_right.h
+++ b/osfmk/ipc/ipc_right.h
@@ -74,13 +74,6 @@
 #define ipc_right_lookup_read           ipc_right_lookup_write
 #define ipc_right_lookup_two_read       ipc_right_lookup_two_write
 
 #define ipc_right_lookup_read           ipc_right_lookup_write
 #define ipc_right_lookup_two_read       ipc_right_lookup_two_write
 

-typedef uint32_t ipc_right_copyin_flags_t;
-
-#define IPC_RIGHT_COPYIN_FLAGS_NONE                   0x0
-#define IPC_RIGHT_COPYIN_FLAGS_DEADOK                 0x1
-#define IPC_RIGHT_COPYIN_FLAGS_RESERVED               0x2
-#define IPC_RIGHT_COPYIN_FLAGS_ALLOW_DEAD_SEND_ONCE   0x4   /* allow copyin of a send once right to a dead port with no dead name requests */
-

 /* Find an entry in a space, given the name */
 extern kern_return_t ipc_right_lookup_write(
        ipc_space_t             space,
 /* Find an entry in a space, given the name */
 extern kern_return_t ipc_right_lookup_write(
        ipc_space_t             space,


@@ -96,7 +89,7 @@ extern kern_return_t ipc_right_lookup_two_write(
        ipc_entry_t             *entryp2);
 
 /* Translate (space, object) -> (name, entry) */
        ipc_entry_t             *entryp2);
 
 /* Translate (space, object) -> (name, entry) */

-extern boolean_t ipc_right_reverse(
+extern bool          ipc_right_reverse(

        ipc_space_t             space,
        ipc_object_t            object,
        mach_port_name_t        *namep,
        ipc_space_t             space,
        ipc_object_t            object,
        mach_port_name_t        *namep,


@@ -123,9 +116,7 @@ extern ipc_port_t ipc_right_request_cancel(
                 ipc_right_request_cancel((space), (port), (name), (entry)))
 
 /* Check if an entry is being used */
                 ipc_right_request_cancel((space), (port), (name), (entry)))
 
 /* Check if an entry is being used */

-extern boolean_t ipc_right_inuse(
-       ipc_space_t             space,
-       mach_port_name_t        name,
+extern bool      ipc_right_inuse(

        ipc_entry_t             entry);
 
 /* Check if the port has died */
        ipc_entry_t             entry);
 
 /* Check if the port has died */


@@ -134,7 +125,7 @@ extern boolean_t ipc_right_check(
        ipc_port_t               port,
        mach_port_name_t         name,
        ipc_entry_t              entry,
        ipc_port_t               port,
        mach_port_name_t         name,
        ipc_entry_t              entry,

-       ipc_right_copyin_flags_t flags);
+       ipc_object_copyin_flags_t flags);

 
 /* Clean up an entry in a dead space */
 extern void ipc_right_terminate(
 
 /* Clean up an entry in a dead space */
 extern void ipc_right_terminate(


@@ -180,44 +171,37 @@ extern kern_return_t ipc_right_info(
        mach_port_type_t        *typep,
        mach_port_urefs_t       *urefsp);
 
        mach_port_type_t        *typep,
        mach_port_urefs_t       *urefsp);
 

-/* Check if a subsequent ipc_right_copyin would succeed */
-extern boolean_t ipc_right_copyin_check(
-       ipc_space_t             space,
-       mach_port_name_t        name,
-       ipc_entry_t             entry,
-       mach_msg_type_name_t    msgt_name);
+/* Check if a subsequent ipc_right_copyin of the reply port will succeed */
+extern boolean_t ipc_right_copyin_check_reply(
+       ipc_space_t              space,
+       mach_port_name_t         reply_name,
+       ipc_entry_t              reply_entry,
+       mach_msg_type_name_t     reply_type);

 
 /* Copyin a capability from a space */
 extern kern_return_t ipc_right_copyin(
 
 /* Copyin a capability from a space */
 extern kern_return_t ipc_right_copyin(

-       ipc_space_t              space,
-       mach_port_name_t         name,
-       ipc_entry_t              entry,
-       mach_msg_type_name_t     msgt_name,
-       ipc_right_copyin_flags_t flags,
-       ipc_object_t             *objectp,
-       ipc_port_t               *sorightp,
-       ipc_port_t               *releasep,
-       int                      *assertcntp);
-
-/* Undo the effects of an ipc_right_copyin */
-extern void ipc_right_copyin_undo(
-       ipc_space_t             space,
-       mach_port_name_t        name,
-       ipc_entry_t             entry,
-       mach_msg_type_name_t    msgt_name,
-       ipc_object_t            object,
-       ipc_port_t              soright);
+       ipc_space_t               space,
+       mach_port_name_t          name,
+       ipc_entry_t               entry,
+       mach_msg_type_name_t      msgt_name,
+       ipc_object_copyin_flags_t  flags,
+       ipc_object_t              *objectp,
+       ipc_port_t                *sorightp,
+       ipc_port_t                *releasep,
+       int                       *assertcntp,
+       mach_port_context_t       context,
+       mach_msg_guard_flags_t    *guard_flags);

 
 /* Copyin a pair of dispositions from a space */
 extern kern_return_t ipc_right_copyin_two(
 
 /* Copyin a pair of dispositions from a space */
 extern kern_return_t ipc_right_copyin_two(

-       ipc_space_t             space,
-       mach_port_name_t        name,
-       ipc_entry_t             entry,
-       mach_msg_type_name_t    msgt_one,
-       mach_msg_type_name_t    msgt_two,
-       ipc_object_t            *objectp,
-       ipc_port_t              *sorightp,
-       ipc_port_t              *releasep);
+       ipc_space_t               space,
+       mach_port_name_t          name,
+       ipc_entry_t               entry,
+       mach_msg_type_name_t      msgt_one,
+       mach_msg_type_name_t      msgt_two,
+       ipc_object_t              *objectp,
+       ipc_port_t                *sorightp,
+       ipc_port_t                *releasep);

 
 /* Copyout a capability to a space */
 extern kern_return_t ipc_right_copyout(
 
 /* Copyout a capability to a space */
 extern kern_return_t ipc_right_copyout(


@@ -225,15 +209,9 @@ extern kern_return_t ipc_right_copyout(
        mach_port_name_t        name,
        ipc_entry_t             entry,
        mach_msg_type_name_t    msgt_name,
        mach_port_name_t        name,
        ipc_entry_t             entry,
        mach_msg_type_name_t    msgt_name,

-       boolean_t               overflow,
+       ipc_object_copyout_flags_t flags,
+       mach_port_context_t     *context,
+       mach_msg_guard_flags_t  *guard_flags,

        ipc_object_t            object);
 
        ipc_object_t            object);
 

-/* Reanme a capability */
-extern kern_return_t ipc_right_rename(
-       ipc_space_t             space,
-       mach_port_name_t        oname,
-       ipc_entry_t             oentry,
-       mach_port_name_t        nname,
-       ipc_entry_t             nentry);
-

 #endif  /* _IPC_IPC_RIGHT_H_ */
 #endif  /* _IPC_IPC_RIGHT_H_ */