Changeset 5954

Timestamp:

Mar 19, 2019 8:24:57 AM (6 years ago)

Author:

nanang

Message:

Fix #2183: Fixed bug of dialog not destroyed on late media scenario: pjsua_call_on_incoming() should decrement dialog session counter when media channel is not initialized.

File:

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

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

@@ -1377 +1377 @@
     int sip_err_code = PJSIP_SC_INTERNAL_SERVER_ERROR;
     pjmedia_sdp_session *offer=NULL;
+    pj_bool_t should_dec_dlg = PJ_TRUE;
     pj_status_t status;
 
@@ -1803 +1804 @@
                                           &sip_err_code, PJ_TRUE,
                                           &on_incoming_call_med_tp_complete);
-        if (status == PJ_SUCCESS) {
+        if (status == PJ_EPENDING) {
+            /* on_incoming_call_med_tp_complete() will call
+             * pjsip_dlg_dec_session().
+             */
+            should_dec_dlg = PJ_FALSE;
+        } else  if (status == PJ_SUCCESS) {
+            /* on_incoming_call_med_tp_complete2() will call
+             * pjsip_dlg_dec_session().
+             */
+            should_dec_dlg = PJ_FALSE;
+
             status = on_incoming_call_med_tp_complete2(call_id, NULL, 
                                                        rdata, &sip_err_code, 
@@ -1842 +1853 @@
             }
             pjsip_dlg_dec_lock(dlg);
-
-            pjsip_dlg_dec_session(dlg, &pjsua_var.mod);
 
             call->inv = NULL;
@@ -1986 +1995 @@
     if (dlg) {
         pjsip_dlg_dec_lock(dlg);
+    }
+
+    if (should_dec_dlg) {
+        pjsip_dlg_dec_session(dlg, &pjsua_var.mod);
     }