Changeset 4269 for pjproject

Timestamp:

Sep 28, 2012 10:07:22 AM (12 years ago)

Author:

nanang

Message:

Re #1587: Respond to call replace request with the last provisional response sent in the replaced call.

File:

• pjproject/trunk/pjsip/src/pjsua-lib/pjsua_call.c (modified) (3 diffs)

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

@@ -812 +812 @@
     pjsip_inv_session *replaced_inv;
     struct pjsua_call *replaced_call;
-    pjsip_tx_data *tdata;
-    pj_status_t status;
+    pjsip_tx_data *tdata = NULL;
+    pj_status_t status = PJ_SUCCESS;
 
     /* Get the invite session in the dialog */
@@ -829 +829 @@
         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.
-         */
+        if (replaced_call->last_code > 100 && replaced_call->last_code < 200)
+        {
+            pjsip_status_code code = replaced_call->last_code;
+            pj_str_t *text = &replaced_call->last_text;
+
+            PJ_LOG(4,(THIS_FILE, "Answering replacement call %d with %d/%.*s",
+                                 call->index, code, text->slen, text->ptr));
+
+            /* Answer the new call with last response in the replaced call */
+            status = pjsip_inv_answer(call->inv, code, text, NULL, &tdata);
+        }
     } else {
         PJ_LOG(4,(THIS_FILE, "Answering replacement call %d with 200/OK",
@@ -840 +848 @@
     }
 
-    if (status == PJ_SUCCESS)
+    if (status == PJ_SUCCESS && tdata)
         status = pjsip_inv_send_msg(call->inv, tdata);