Changeset 5323 for pjproject

Timestamp:

May 27, 2016 2:55:12 AM (8 years ago)

Author:

riza

Message:

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

Location:

pjproject/trunk/pjsip

Files:

• include/pjsua-lib/pjsua_internal.h (modified) (1 diff)
• src/pjsua-lib/pjsua_call.c (modified) (2 diffs)

pjproject/trunk/pjsip/include/pjsua-lib/pjsua_internal.h

@@ -173 +173 @@
                 pj_bool_t        hangup;  /**< Call is hangup?              */
             } out_call;
-            struct {
+            struct {            
                 call_answer      answers;/**< A list of call answers.       */
+                pj_bool_t        hangup;/**< Call is hangup?                */
                 pjsip_dialog    *replaced_dlg; /**< Replaced dialog.        */
             } inc_call;

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

@@ -1638 +1638 @@
             /* 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.
+             * happens to answer/hangup the call from the callback, the 
+             * answer/hangup should have been delayed (see #1923), 
+             * so let's process the answer/hangup now.
              */
-            if (call->med_ch_cb == NULL)
+            if (call->async_call.call_var.inc_call.hangup) {
+                pjsua_call_hangup(call_id, call->last_code, &call->last_text,
+                                  NULL);
+            } else if (call->med_ch_cb == NULL) {
                 process_pending_call_answer(call);
+            }
         } else {
             pjsua_call_hangup(call_id, PJSIP_SC_TEMPORARILY_UNAVAILABLE,
@@ -2337 +2342 @@
      * the call in the media transport creation callback instead.
      */
-    if (call->med_ch_cb && !call->inv) {
+    if ((call->med_ch_cb && !call->inv) ||
+        ((call->inv != NULL) && (call->inv->state == PJSIP_INV_STATE_NULL)))
+    {
         PJ_LOG(4,(THIS_FILE, "Pending call %d hangup upon completion "
                              "of media transport", call_id));
-        call->async_call.call_var.out_call.hangup = PJ_TRUE;
+
+        if (call->inv->role == PJSIP_ROLE_UAS)
+            call->async_call.call_var.inc_call.hangup = PJ_TRUE;
+        else
+            call->async_call.call_var.out_call.hangup = PJ_TRUE;
+
         if (code == 0)
             call->last_code = PJSIP_SC_REQUEST_TERMINATED;