Changeset 4268 for pjproject/trunk/pjsip/src/pjsua-lib/pjsua_call.c

Timestamp:

Sep 28, 2012 8:56:08 AM (12 years ago)

Author:

nanang

Message:

Re #1587:

• Don't answer call replace request with 200 if the replaced call hasn't reach confirmed state and has UAS role.
• Only apply accept_replace_in_early_state when call is in early state.

File:

• pjproject/trunk/pjsip/src/pjsua-lib/pjsua_call.c (modified) (1 diff)

pjproject/trunk/pjsip/src/pjsua-lib/pjsua_call.c

@@ -826 +826 @@
                                              call->index);
 
-    PJ_LOG(4,(THIS_FILE, "Answering replacement call %d with 200/OK",
-                         call->index));
-
-    /* Answer the new call with 200 response */
-    status = pjsip_inv_answer(call->inv, 200, NULL, NULL, &tdata);
+    if (replaced_call->inv->state <= PJSIP_INV_STATE_EARLY &&
+        replaced_call->inv->role != PJSIP_ROLE_UAC)
+    {
+        /* Replaced call is not in confirmed state yet and we are not
+         * the call initiator, should not answer with 200 response here.
+         */
+    } else {
+        PJ_LOG(4,(THIS_FILE, "Answering replacement call %d with 200/OK",
+                             call->index));
+
+        /* Answer the new call with 200 response */
+        status = pjsip_inv_answer(call->inv, 200, NULL, NULL, &tdata);
+    }
+
     if (status == PJ_SUCCESS)
         status = pjsip_inv_send_msg(call->inv, tdata);