Changes in kernel/generic/src/ipc/ops/conctmeto.c [a35b458:334c103] in mainline

File:

• kernel/generic/src/ipc/ops/conctmeto.c (modified) (4 diffs)

kernel/generic/src/ipc/ops/conctmeto.c

@@ -42 +42 @@
 static errno_t request_preprocess(call_t *call, phone_t *phone)
 {
+        /*
+         * Create the new phone and capability, but don't publish them yet.
+         * That will be done once the phone is connected.
+         */
         cap_handle_t phone_handle;
-        errno_t rc = phone_alloc(TASK, &phone_handle);
-
-        /* Remember the phone capability or that an error occured. */
-        call->priv = (rc == EOK) ? phone_handle : -1;
-
+        kobject_t *phone_obj;
+        errno_t rc = phone_alloc(TASK, false, &phone_handle, &phone_obj);
         if (rc != EOK) {
+                call->priv = -1;
                 return rc;
         }
 
-        /* Set arg5 for server */
-        kobject_t *phone_obj = kobject_get(TASK, phone_handle,
-            KOBJECT_TYPE_PHONE);
         /* Hand over phone_obj's reference to ARG5 */
         IPC_SET_ARG5(call->data, (sysarg_t) phone_obj->phone);
+
+        /* Remember the handle */
+        call->priv = phone_handle;
 
         return EOK;
@@ -65 +67 @@
         cap_handle_t phone_handle = (cap_handle_t) call->priv;
 
-        if (phone_handle < 0) {
+        if (phone_handle < 0)
                 return EOK;
-        }
 
-        phone_dealloc(phone_handle);
         /* Hand over reference from ARG5 to phone->kobject */
         phone_t *phone = (phone_t *) IPC_GET_ARG5(call->data);
-        /* Drop phone_obj's reference */
+        /* Drop phone->kobject's reference */
         kobject_put(phone->kobject);
+        cap_free(TASK, phone_handle);
+
         return EOK;
 }
@@ -82 +84 @@
         phone_t *phone = (phone_t *) IPC_GET_ARG5(*olddata);
 
-        /* If the user accepted call, connect */
+        /*
+         * Get an extra reference and pass it in the answer data.
+         */
+        kobject_add_ref(phone->kobject);
+        IPC_SET_ARG5(answer->data, (sysarg_t) phone);
+
+        /* If the user accepted the call, connect */
         if (IPC_GET_RETVAL(answer->data) == EOK) {
                 /* Hand over reference from phone to the answerbox */
@@ -96 +104 @@
 {
         cap_handle_t phone_handle = (cap_handle_t) answer->priv;
+        phone_t *phone = (phone_t *) IPC_GET_ARG5(answer->data);
 
         if (IPC_GET_RETVAL(answer->data)) {
                 if (phone_handle >= 0) {
                         /*
-                         * The phone was indeed allocated and now needs
-                         * to be deallocated.
+                         * Cleanup the unpublished capability and drop
+                         * phone->kobject's reference.
                          */
-                        phone_dealloc(phone_handle);
+                        kobject_put(phone->kobject);
+                        cap_free(TASK, phone_handle);
                 }
         } else {
+                /*
+                 * Publish the capability. Publishing the capability this late
+                 * is important for ipc_cleanup() where we want to have a
+                 * capability for each phone that wasn't hung up by the user.
+                 */
+                cap_publish(TASK, phone_handle, phone->kobject);
+
                 IPC_SET_ARG5(answer->data, phone_handle);
         }