Changeset 74965d2 in mainline

Timestamp:

2008-08-24T18:37:45Z (16 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

b510d52

Parents:

645d9ed2

Message:

Demasquerade the caller phone during ipc_answer_n() rather than in
ipc_wait_for_call().

File:

• kernel/generic/src/ipc/ipc.c (modified) (2 diffs)

kernel/generic/src/ipc/ipc.c

@@ -195 +195 @@
 
         call->flags |= IPC_CALL_ANSWERED;
+
+        if (call->flags & IPC_CALL_FORWARDED) {
+                if (call->data.caller_phone) {
+                        /* Demasquerade the caller phone. */
+                        call->data.phone = call->data.caller_phone;
+                }
+        }
 
         spinlock_lock(&callerbox->lock);
@@ -396 +403 @@
                 request = list_get_instance(box->answers.next, call_t, link);
                 list_remove(&request->link);
-                if (request->data.caller_phone)
-                        atomic_dec(&request->data.caller_phone->active_calls);
-                else
-                        atomic_dec(&request->data.phone->active_calls);
+                atomic_dec(&request->data.phone->active_calls);
         } else if (!list_empty(&box->calls)) {
                 /* Handle requests */