xnu-792.24.17.tar.gz

[apple/xnu.git] / osfmk / UserNotification / KUNCUserNotifications.c

diff --git a/osfmk/UserNotification/KUNCUserNotifications.c b/osfmk/UserNotification/KUNCUserNotifications.c
index a4baa980eb4cca2faea4edf04617d5d0e3a33ace..21ef970a07e781fc4fd064a3ad365b400c88920d 100644 (file)
--- a/osfmk/UserNotification/KUNCUserNotifications.c
+++ b/osfmk/UserNotification/KUNCUserNotifications.c
@@ -1,5 +1,5 @@
 /*
 /*

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

  *
  * @APPLE_LICENSE_HEADER_START@
  * 
  *
  * @APPLE_LICENSE_HEADER_START@
  * 


@@ -23,12 +23,15 @@
 #include <mach/port.h>
 #include <mach/message.h>
 #include <mach/kern_return.h>
 #include <mach/port.h>
 #include <mach/message.h>
 #include <mach/kern_return.h>

-#include <mach/etap_events.h>
+#include <mach/host_priv.h>

 
 

+#include <kern/kern_types.h>
+#include <kern/kalloc.h>

 #include <kern/host.h>
 #include <kern/host.h>

-#include <ipc/ipc_port.h>

 #include <kern/ipc_kobject.h>
 
 #include <kern/ipc_kobject.h>
 

+#include <ipc/ipc_port.h>
+

 #include <UserNotification/UNDTypes.h>
 #include <UserNotification/UNDRequest.h>
 #include <UserNotification/UNDReplyServer.h>
 #include <UserNotification/UNDTypes.h>
 #include <UserNotification/UNDRequest.h>
 #include <UserNotification/UNDReplyServer.h>


@@ -44,9 +47,6 @@
  * DEFINES AND STRUCTURES
  */
 
  * DEFINES AND STRUCTURES
  */
 

-UNDServerRef gUNDServer = UND_SERVER_NULL;
-
-

 struct UNDReply {
        decl_mutex_data(,lock)                          /* UNDReply lock */
        int                             userLandNotificationKey;
 struct UNDReply {
        decl_mutex_data(,lock)                          /* UNDReply lock */
        int                             userLandNotificationKey;


@@ -59,22 +59,48 @@ struct UNDReply {
 #define UNDReply_lock_try(reply)       mutex_lock_try(&(reply)->lock)
 #define UNDReply_unlock(reply)         mutex_unlock(&(reply)->lock)
 
 #define UNDReply_lock_try(reply)       mutex_lock_try(&(reply)->lock)
 #define UNDReply_unlock(reply)         mutex_unlock(&(reply)->lock)
 

+/* forward declarations */
+void UNDReply_deallocate(
+       UNDReplyRef             reply);
+
+

 void
 UNDReply_deallocate(
        UNDReplyRef             reply)
 {
        ipc_port_t port;
 void
 UNDReply_deallocate(
        UNDReplyRef             reply)
 {
        ipc_port_t port;

+

        UNDReply_lock(reply);
        port = reply->self_port;
        UNDReply_lock(reply);
        port = reply->self_port;

+       assert(IP_VALID(port));

        ipc_kobject_set(port, IKO_NULL, IKOT_NONE);
        reply->self_port = IP_NULL;
        UNDReply_unlock(reply);
 
        ipc_port_dealloc_kernel(port);
        ipc_kobject_set(port, IKO_NULL, IKOT_NONE);
        reply->self_port = IP_NULL;
        UNDReply_unlock(reply);
 
        ipc_port_dealloc_kernel(port);

-       kfree((vm_offset_t)reply, sizeof(struct UNDReply));
+       kfree(reply, sizeof(struct UNDReply));

        return;
 }
 
        return;
 }
 

+static UNDServerRef
+UNDServer_reference(void)
+{
+       UNDServerRef UNDServer;
+       kern_return_t kr;
+
+       kr = host_get_user_notification_port(host_priv_self(), &UNDServer);
+       assert(kr == KERN_SUCCESS);
+       return UNDServer;
+}
+
+static void
+UNDServer_deallocate(
+       UNDServerRef    UNDServer)
+{
+       if (IP_VALID(UNDServer))
+               ipc_port_release_send(UNDServer);
+}
+

 /* 
  * UND Mig Callbacks
 */
 /* 
  * UND Mig Callbacks
 */


@@ -90,7 +116,7 @@ UNDAlertCompletedWithResult_rpc (
        CFStringRef             xmlError = NULL;
        CFDictionaryRef         dict = NULL;
 #else
        CFStringRef             xmlError = NULL;
        CFDictionaryRef         dict = NULL;
 #else

-       void *dict = (void *)keyRef;
+       const void *dict = (const void *)keyRef;

 #endif
 
        if (reply == UND_REPLY_NULL || !reply->inprogress)
 #endif
 
        if (reply == UND_REPLY_NULL || !reply->inprogress)


@@ -164,10 +190,10 @@ KUNCGetNotificationID()
        if (reply != UND_REPLY_NULL) {
                reply->self_port = ipc_port_alloc_kernel();
                if (reply->self_port == IP_NULL) {
        if (reply != UND_REPLY_NULL) {
                reply->self_port = ipc_port_alloc_kernel();
                if (reply->self_port == IP_NULL) {

-                       kfree((vm_offset_t)reply, sizeof(struct UNDReply));
+                       kfree(reply, sizeof(struct UNDReply));

                        reply = UND_REPLY_NULL;
                } else {
                        reply = UND_REPLY_NULL;
                } else {

-                       mutex_init(&reply->lock, ETAP_IO_UNDREPLY);
+                       mutex_init(&reply->lock, 0);

                        reply->userLandNotificationKey = -1;
                        reply->inprogress = FALSE;
                        ipc_kobject_set(reply->self_port,
                        reply->userLandNotificationKey = -1;
                        reply->inprogress = FALSE;
                        ipc_kobject_set(reply->self_port,


@@ -181,7 +207,17 @@ KUNCGetNotificationID()
 
 kern_return_t KUNCExecute(char executionPath[1024], int uid, int gid)
 {
 
 kern_return_t KUNCExecute(char executionPath[1024], int uid, int gid)
 {

-    return UNDExecute_rpc(gUNDServer, executionPath, uid, gid);
+
+       UNDServerRef UNDServer;
+
+       UNDServer = UNDServer_reference();
+       if (IP_VALID(UNDServer)) {
+               kern_return_t kr;
+               kr = UNDExecute_rpc(UNDServer, executionPath, uid, gid);
+               UNDServer_deallocate(UNDServer);
+               return kr;
+       }
+       return MACH_SEND_INVALID_DEST;

 }
 
 kern_return_t KUNCUserNotificationCancel(
 }
 
 kern_return_t KUNCUserNotificationCancel(


@@ -201,10 +237,18 @@ kern_return_t KUNCUserNotificationCancel(
        }
 
        reply->inprogress = FALSE;
        }
 
        reply->inprogress = FALSE;

-       if (ulkey = reply->userLandNotificationKey) {
+       if ((ulkey = reply->userLandNotificationKey) != 0) {
+               UNDServerRef UNDServer;
+

                reply->userLandNotificationKey = 0;
                UNDReply_unlock(reply);
                reply->userLandNotificationKey = 0;
                UNDReply_unlock(reply);

-               kr = UNDCancelNotification_rpc(gUNDServer,ulkey);
+
+               UNDServer = UNDServer_reference();
+               if (IP_VALID(UNDServer)) {
+                       kr = UNDCancelNotification_rpc(UNDServer,ulkey);
+                       UNDServer_deallocate(UNDServer);
+               } else
+                       kr = MACH_SEND_INVALID_DEST;

        } else {
                UNDReply_unlock(reply);
                kr = KERN_SUCCESS;
        } else {
                UNDReply_unlock(reply);
                kr = KERN_SUCCESS;


@@ -215,7 +259,7 @@ kern_return_t KUNCUserNotificationCancel(
 
 kern_return_t
 KUNCUserNotificationDisplayNotice(
 
 kern_return_t
 KUNCUserNotificationDisplayNotice(

-       int             timeout,
+       int             noticeTimeout,

        unsigned        flags,
        char            *iconPath,
        char            *soundPath,
        unsigned        flags,
        char            *iconPath,
        char            *soundPath,


@@ -224,9 +268,13 @@ KUNCUserNotificationDisplayNotice(
        char            *alertMessage,
        char            *defaultButtonTitle)
 {
        char            *alertMessage,
        char            *defaultButtonTitle)
 {

-       kern_return_t kr;
-       kr = UNDDisplayNoticeSimple_rpc(gUNDServer,
-                                       timeout,
+       UNDServerRef UNDServer;
+
+       UNDServer = UNDServer_reference();
+       if (IP_VALID(UNDServer)) {
+               kern_return_t kr;
+               kr = UNDDisplayNoticeSimple_rpc(UNDServer,
+                                       noticeTimeout,

                                        flags,
                                        iconPath,
                                        soundPath,
                                        flags,
                                        iconPath,
                                        soundPath,


@@ -234,12 +282,15 @@ KUNCUserNotificationDisplayNotice(
                                        alertHeader,
                                        alertMessage,
                                        defaultButtonTitle);
                                        alertHeader,
                                        alertMessage,
                                        defaultButtonTitle);

-       return kr;
+               UNDServer_deallocate(UNDServer);
+               return kr;
+       }
+       return MACH_SEND_INVALID_DEST;

 }
 
 kern_return_t
 KUNCUserNotificationDisplayAlert(
 }
 
 kern_return_t
 KUNCUserNotificationDisplayAlert(

-       int             timeout,
+       int             alertTimeout,

        unsigned        flags,
        char            *iconPath,
        char            *soundPath,
        unsigned        flags,
        char            *iconPath,
        char            *soundPath,


@@ -251,10 +302,13 @@ KUNCUserNotificationDisplayAlert(
        char            *otherButtonTitle,
        unsigned        *responseFlags)
 {
        char            *otherButtonTitle,
        unsigned        *responseFlags)
 {

-       kern_return_t   kr;
+       UNDServerRef    UNDServer;

        
        

-       kr = UNDDisplayAlertSimple_rpc(gUNDServer,
-                                      timeout,
+       UNDServer = UNDServer_reference();
+       if (IP_VALID(UNDServer)) {
+               kern_return_t   kr;
+               kr = UNDDisplayAlertSimple_rpc(UNDServer,
+                                      alertTimeout,

                                       flags,
                                       iconPath,
                                       soundPath,
                                       flags,
                                       iconPath,
                                       soundPath,


@@ -265,7 +319,10 @@ KUNCUserNotificationDisplayAlert(
                                       alternateButtonTitle,
                                       otherButtonTitle,
                                       responseFlags);
                                       alternateButtonTitle,
                                       otherButtonTitle,
                                       responseFlags);

-       return kr;
+               UNDServer_deallocate(UNDServer);
+               return kr;
+       }
+       return MACH_SEND_INVALID_DEST;

 }
 
 kern_return_t
 }
 
 kern_return_t


@@ -277,11 +334,11 @@ KUNCUserNotificationDisplayFromBundle(
        char                         *messageKey,
        char                         *tokenString,
        KUNCUserNotificationCallBack callback,
        char                         *messageKey,
        char                         *tokenString,
        KUNCUserNotificationCallBack callback,

-       int                          contextKey)
+       __unused int                    contextKey)

 {
        UNDReplyRef reply = (UNDReplyRef)id;
 {
        UNDReplyRef reply = (UNDReplyRef)id;

+       UNDServerRef UNDServer;

        ipc_port_t reply_port;
        ipc_port_t reply_port;

-       kern_return_t kr;

 
        if (reply == UND_REPLY_NULL)
                return KERN_INVALID_ARGUMENT;
 
        if (reply == UND_REPLY_NULL)
                return KERN_INVALID_ARGUMENT;


@@ -290,19 +347,26 @@ KUNCUserNotificationDisplayFromBundle(
                UNDReply_unlock(reply);
                return KERN_INVALID_ARGUMENT;
        }
                UNDReply_unlock(reply);
                return KERN_INVALID_ARGUMENT;
        }

-       reply->inprogress == TRUE;
+       reply->inprogress = TRUE;

        reply->callback = callback;
        reply_port = ipc_port_make_send(reply->self_port);
        UNDReply_unlock(reply);
 
        reply->callback = callback;
        reply_port = ipc_port_make_send(reply->self_port);
        UNDReply_unlock(reply);
 

-       kr = UNDDisplayCustomFromBundle_rpc(gUNDServer,
+       UNDServer = UNDServer_reference();
+       if (IP_VALID(UNDServer)) {
+               kern_return_t kr;
+
+               kr = UNDDisplayCustomFromBundle_rpc(UNDServer,

                                            reply_port,
                                            bundlePath,
                                            fileName,
                                            fileExtension,
                                            messageKey,
                                            tokenString);
                                            reply_port,
                                            bundlePath,
                                            fileName,
                                            fileExtension,
                                            messageKey,
                                            tokenString);

-       return kr;
+               UNDServer_deallocate(UNDServer);
+               return kr;
+       }
+       return MACH_SEND_INVALID_DEST;

 }
 
 /*
 }
 
 /*


@@ -329,6 +393,7 @@ convert_port_to_UNDReply(
                reply = (UNDReplyRef) port->ip_kobject;
                assert(reply != UND_REPLY_NULL);
                ip_unlock(port);
                reply = (UNDReplyRef) port->ip_kobject;
                assert(reply != UND_REPLY_NULL);
                ip_unlock(port);

+               return reply;

        }
        return UND_REPLY_NULL;
 }
        }
        return UND_REPLY_NULL;
 }


@@ -342,13 +407,7 @@ host_set_UNDServer(
         host_priv_t     host_priv,
         UNDServerRef    server)
 {
         host_priv_t     host_priv,
         UNDServerRef    server)
 {

-
-       if (host_priv == HOST_PRIV_NULL || server == UND_SERVER_NULL)
-               return KERN_INVALID_ARGUMENT;
-       if (gUNDServer != UND_SERVER_NULL)
-               ipc_port_dealloc_kernel(gUNDServer);
-       gUNDServer = server;
-       return KERN_SUCCESS;
+       return (host_set_user_notification_port(host_priv, server));

 }
 
 /*
 }
 
 /*


@@ -358,11 +417,7 @@ host_set_UNDServer(
 kern_return_t
 host_get_UNDServer(
        host_priv_t     host_priv,
 kern_return_t
 host_get_UNDServer(
        host_priv_t     host_priv,

-       UNDServerRef    *server)
+       UNDServerRef    *serverp)

 {
 {

-       if (host_priv == HOST_PRIV_NULL)
-               return KERN_INVALID_ARGUMENT;
-        *server = gUNDServer;
-        return KERN_SUCCESS;
+       return (host_get_user_notification_port(host_priv, serverp));

 }
 }

-