Changeset 5314

Timestamp:

May 24, 2016 7:37:16 AM (8 years ago)

Author:

nanang

Message:

Fix #1923: Delay call-answer triggered from simulated onIncomingCall() to avoid assertion.

File:

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

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

@@ -953 +953 @@
 {
     struct call_answer *answer, *next;
+
+    /* No initial answer yet, this function should be called again later */
+    if (!call->inv->last_answer)
+        return;
 
     answer = call->async_call.call_var.inc_call.answers.next;
@@ -1631 +1635 @@
         if (pjsua_var.ua_cfg.cb.on_incoming_call) {
             pjsua_var.ua_cfg.cb.on_incoming_call(acc_id, call_id, rdata);
+
+            /* onIncomingCall() may be simulated by onCreateMediaTransport()
+             * when media init is done synchrounously (see #1916). And if app
+             * happens to answer the call from the callback, the answer should
+             * have been delayed (see #1923), so let's process the answer now.
+             */
+            if (call->med_ch_cb == NULL)
+                process_pending_call_answer(call);
         } else {
             pjsua_call_hangup(call_id, PJSIP_SC_TEMPORARILY_UNAVAILABLE,
@@ -2219 +2231 @@
     /* If media transport creation is not yet completed, we will answer
      * the call in the media transport creation callback instead.
+     * Or if initial answer is not sent yet, we will answer the call after
+     * initial answer is sent (see #1923).
      */
-    if (call->med_ch_cb) {
+    if (call->med_ch_cb || !call->inv->last_answer) {
         struct call_answer *answer;