Changeset 95a3082 in mainline

Timestamp:

2012-09-01T22:07:14Z (13 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

fcfa926b

Parents:

4cd7fd0

Message:

Call answer_preprocess() in call forwarding error paths.

File:

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

kernel/generic/src/ipc/sysipc.c

@@ -412 +412 @@
 {
         call_t *call = get_call(callid);
+        bool need_old;
+        int rc;
+
         if (!call)
                 return ENOENT;
-        
-        call->flags |= IPC_CALL_FORWARDED;
         
         phone_t *phone;
         if (phone_get(phoneid, &phone) != EOK) {
                 IPC_SET_RETVAL(call->data, EFORWARD);
-                ipc_answer(&TASK->answerbox, call);
-                return ENOENT;
+                rc = ENOENT;
+                goto error;
         }
         
         if (!method_is_forwardable(IPC_GET_IMETHOD(call->data))) {
                 IPC_SET_RETVAL(call->data, EFORWARD);
-                ipc_answer(&TASK->answerbox, call);
-                return EPERM;
-        }
+                rc = EPERM;
+                goto error;
+        }
+
+        call->flags |= IPC_CALL_FORWARDED;
         
         /*
@@ -465 +468 @@
         
         return ipc_forward(call, phone, &TASK->answerbox, mode);
+
+error:
+        need_old = answer_need_old(call);
+        ipc_data_t old;
+
+        if (need_old)
+                old = call->data;
+
+        answer_preprocess(call, need_old ? &old : NULL);
+        ipc_answer(&TASK->answerbox, call);
+        return rc;
 }