Changeset f9841e69 in mainline

Timestamp:

2012-09-02T21:52:11Z (12 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

9ef1b79b

Parents:

fcfa926b

Message:

Call answer_preprocess() also when ipc_forward() returns error.

Location:

kernel/generic

Files:

• include/ipc/ipc.h (modified) (1 diff)
• src/ipc/ipc.c (modified) (2 diffs)
• src/ipc/sysipc.c (modified) (2 diffs)

kernel/generic/include/ipc/ipc.h

@@ -168 +168 @@
 extern int ipc_forward(call_t *, phone_t *, answerbox_t *, unsigned int);
 extern void ipc_answer(answerbox_t *, call_t *);
+extern void _ipc_answer_free_call(call_t *, bool);
 
 extern void ipc_phone_init(phone_t *);

kernel/generic/src/ipc/ipc.c

@@ -171 +171 @@
  *
  */
-static void _ipc_answer_free_call(call_t *call, bool selflocked)
+void _ipc_answer_free_call(call_t *call, bool selflocked)
 {
         /* Count sent answer */
@@ -306 +306 @@
         if (phone->state != IPC_PHONE_CONNECTED) {
                 mutex_unlock(&phone->lock);
-                if (call->flags & IPC_CALL_FORWARDED) {
-                        IPC_SET_RETVAL(call->data, EFORWARD);
-                        _ipc_answer_free_call(call, false);
-                } else {
+                if (!(call->flags & IPC_CALL_FORWARDED)) {
                         if (phone->state == IPC_PHONE_HUNGUP)
                                 ipc_backsend_err(phone, call, EHANGUP);

kernel/generic/src/ipc/sysipc.c

@@ -412 +412 @@
 {
         call_t *call = get_call(callid);
-        bool need_old;
+        phone_t *phone;
+        bool need_old = answer_need_old(call);
+        bool after_forward = false;
+        ipc_data_t old;
         int rc;
 
         if (!call)
                 return ENOENT;
-        
-        phone_t *phone;
+
+        if (need_old)
+                old = call->data;
+        
         if (phone_get(phoneid, &phone) != EOK) {
                 rc = ENOENT;
@@ -465 +470 @@
         }
         
-        return ipc_forward(call, phone, &TASK->answerbox, mode);
+        rc = ipc_forward(call, phone, &TASK->answerbox, mode);
+        if (rc != EOK) {
+                after_forward = true;
+                goto error;
+        }
+
+        return EOK;
 
 error:
-        need_old = answer_need_old(call);
-        ipc_data_t old;
-
-        if (need_old)
-                old = call->data;
-
         IPC_SET_RETVAL(call->data, EFORWARD);
         answer_preprocess(call, need_old ? &old : NULL);
-        ipc_answer(&TASK->answerbox, call);
+        if (after_forward)
+                _ipc_answer_free_call(call, false);
+        else
+                ipc_answer(&TASK->answerbox, call);
+
         return rc;
 }