X-Git-Url: https://git.saurik.com/apple/xnu.git/blobdiff_plain/de355530ae67247cbd0da700edb3a2a1dae884c2..a3d08fcd5120d2aa8303b6349ca8b14e3f284af3:/osfmk/UserNotification/KUNCUserNotifications.c

diff --git a/osfmk/UserNotification/KUNCUserNotifications.c b/osfmk/UserNotification/KUNCUserNotifications.c
index a4baa980e..aec492ca7 100644
--- 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-2003 Apple Computer, Inc. All rights reserved.
  *
  * @APPLE_LICENSE_HEADER_START@
  * 
@@ -44,9 +44,6 @@
  * DEFINES AND STRUCTURES
  */
 
-UNDServerRef gUNDServer = UND_SERVER_NULL;
-
-
 struct UNDReply {
 	decl_mutex_data(,lock)				/* UNDReply lock */
 	int				userLandNotificationKey;
@@ -64,8 +61,10 @@ UNDReply_deallocate(
 	UNDReplyRef		reply)
 {
 	ipc_port_t 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);
@@ -75,6 +74,25 @@ UNDReply_deallocate(
 	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
 */
@@ -181,7 +199,17 @@ KUNCGetNotificationID()
 
 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(
@@ -202,9 +230,17 @@ kern_return_t KUNCUserNotificationCancel(
 
 	reply->inprogress = FALSE;
 	if (ulkey = reply->userLandNotificationKey) {
+		UNDServerRef UNDServer;
+
 		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;
@@ -224,8 +260,12 @@ KUNCUserNotificationDisplayNotice(
 	char		*alertMessage,
 	char		*defaultButtonTitle)
 {
-	kern_return_t kr;
-	kr = UNDDisplayNoticeSimple_rpc(gUNDServer,
+	UNDServerRef UNDServer;
+
+	UNDServer = UNDServer_reference();
+	if (IP_VALID(UNDServer)) {
+		kern_return_t kr;
+		kr = UNDDisplayNoticeSimple_rpc(UNDServer,
 					timeout,
 					flags,
 					iconPath,
@@ -234,7 +274,10 @@ KUNCUserNotificationDisplayNotice(
 					alertHeader,
 					alertMessage,
 					defaultButtonTitle);
-	return kr;
+		UNDServer_deallocate(UNDServer);
+		return kr;
+	}
+	return MACH_SEND_INVALID_DEST;
 }
 
 kern_return_t
@@ -251,9 +294,12 @@ KUNCUserNotificationDisplayAlert(
 	char		*otherButtonTitle,
 	unsigned	*responseFlags)
 {
-	kern_return_t	kr;
+	UNDServerRef	UNDServer;
 	
-	kr = UNDDisplayAlertSimple_rpc(gUNDServer,
+	UNDServer = UNDServer_reference();
+	if (IP_VALID(UNDServer)) {
+		kern_return_t	kr;
+		kr = UNDDisplayAlertSimple_rpc(UNDServer,
 				       timeout,
 				       flags,
 				       iconPath,
@@ -265,7 +311,10 @@ KUNCUserNotificationDisplayAlert(
 				       alternateButtonTitle,
 				       otherButtonTitle,
 				       responseFlags);
-	return kr;
+		UNDServer_deallocate(UNDServer);
+		return kr;
+	}
+	return MACH_SEND_INVALID_DEST;
 }
 
 kern_return_t
@@ -280,8 +329,8 @@ KUNCUserNotificationDisplayFromBundle(
 	int			     contextKey)
 {
 	UNDReplyRef reply = (UNDReplyRef)id;
+	UNDServerRef UNDServer;
 	ipc_port_t reply_port;
-	kern_return_t kr;
 
 	if (reply == UND_REPLY_NULL)
 		return KERN_INVALID_ARGUMENT;
@@ -295,14 +344,21 @@ KUNCUserNotificationDisplayFromBundle(
 	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);
-	return kr;
+		UNDServer_deallocate(UNDServer);
+		return kr;
+	}
+	return MACH_SEND_INVALID_DEST;
 }
 
 /*
@@ -329,6 +385,7 @@ convert_port_to_UNDReply(
 		reply = (UNDReplyRef) port->ip_kobject;
 		assert(reply != UND_REPLY_NULL);
 		ip_unlock(port);
+		return reply;
 	}
 	return UND_REPLY_NULL;
 }
@@ -342,13 +399,7 @@ host_set_UNDServer(
         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 +409,7 @@ host_set_UNDServer(
 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));
 }
-