xnu-4903.221.2.tar.gz

[apple/xnu.git] / osfmk / kern / host_notify.c

diff --git a/osfmk/kern/host_notify.c b/osfmk/kern/host_notify.c
index 1ca87dcaf174d9e944969a40fa95c23d057df9ef..a69f109b435122916bd326ff76ef7865ec949f78 100644 (file)
--- a/osfmk/kern/host_notify.c
+++ b/osfmk/kern/host_notify.c
@@ -48,7 +48,8 @@ static zone_t                 host_notify_zone;
 static queue_head_t            host_notify_queue[HOST_NOTIFY_TYPE_MAX+1];
 
 static mach_msg_id_t   host_notify_replyid[HOST_NOTIFY_TYPE_MAX+1] =
 static queue_head_t            host_notify_queue[HOST_NOTIFY_TYPE_MAX+1];
 
 static mach_msg_id_t   host_notify_replyid[HOST_NOTIFY_TYPE_MAX+1] =

-                                                               { HOST_CALENDAR_CHANGED_REPLYID };
+                                                               { HOST_CALENDAR_CHANGED_REPLYID,
+                                                                 HOST_CALENDAR_SET_REPLYID };

 
 struct host_notify_entry {
        queue_chain_t           entries;
 
 struct host_notify_entry {
        queue_chain_t           entries;


@@ -100,7 +101,7 @@ host_request_notification(
        lck_mtx_lock(&host_notify_lock);
 
        ip_lock(port);
        lck_mtx_lock(&host_notify_lock);
 
        ip_lock(port);

-       if (!ip_active(port) || ip_kotype(port) != IKOT_NONE) {
+       if (!ip_active(port) || port->ip_tempowner || ip_kotype(port) != IKOT_NONE) {

                ip_unlock(port);
 
                lck_mtx_unlock(&host_notify_lock);
                ip_unlock(port);
 
                lck_mtx_unlock(&host_notify_lock);


@@ -167,10 +168,11 @@ host_notify_all(
                send_queue.next->prev = &send_queue;
                send_queue.prev->next = &send_queue;
 
                send_queue.next->prev = &send_queue;
                send_queue.prev->next = &send_queue;
 

-               msg->msgh_bits = MACH_MSGH_BITS(MACH_MSG_TYPE_MOVE_SEND_ONCE, 0);
+               msg->msgh_bits =
+                   MACH_MSGH_BITS_SET(MACH_MSG_TYPE_MOVE_SEND_ONCE, 0, 0, 0);

                msg->msgh_local_port = MACH_PORT_NULL;
                msg->msgh_local_port = MACH_PORT_NULL;

+               msg->msgh_voucher_port = MACH_PORT_NULL;

                msg->msgh_id = host_notify_replyid[notify_type];
                msg->msgh_id = host_notify_replyid[notify_type];

-               msg->msgh_reserved = 0;

 
                while ((entry = (host_notify_t)dequeue(&send_queue)) != NULL) {
                        ipc_port_t              port;
 
                while ((entry = (host_notify_t)dequeue(&send_queue)) != NULL) {
                        ipc_port_t              port;


@@ -205,3 +207,11 @@ host_notify_calendar_change(void)
 
        host_notify_all(HOST_NOTIFY_CALENDAR_CHANGE, &msg.Head, sizeof (msg));
 }
 
        host_notify_all(HOST_NOTIFY_CALENDAR_CHANGE, &msg.Head, sizeof (msg));
 }

+
+void
+host_notify_calendar_set(void)
+{
+       __Request__host_calendar_set_t  msg;
+
+       host_notify_all(HOST_NOTIFY_CALENDAR_SET, &msg.Head, sizeof (msg));
+}