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

Timestamp:

Feb 5, 2016 4:29:17 AM (9 years ago)

Author:

nanang

Message:

Fixed #1902:

• Crash when endpoint has multiple worker threads and SIP TCP transport is disconnected during incoming call handling.
• Deprecated pjsip_dlg_create_uas(), replaced by pjsip_dlg_create_uas_and_inc_lock().
• Serialized transaction state notifications (of 'terminated' and 'destroyed') in case of transport error.

File:

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

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

@@ -983 +983 @@
     pjsip_tx_data *response = NULL;
     unsigned options = 0;
+    pjsip_dialog *dlg = call->async_call.dlg;
     int sip_err_code = (info? info->sip_err_code: 0);
     pj_status_t status = (info? info->status: PJ_SUCCESS);
 
     PJSUA_LOCK();
+    
+    /* Increment the dialog's lock to prevent it to be destroyed prematurely,
+     * such as in case of transport error.
+     */
+    pjsip_dlg_inc_lock(dlg);
+
+    /* Decrement dialog session. */
+    pjsip_dlg_dec_session(dlg, &pjsua_var.mod);    
 
     if (status != PJ_SUCCESS) {
@@ -997 +1006 @@
         pjsua_media_channel_deinit(call->index);
         call->med_ch_cb = NULL;
+        pjsip_dlg_dec_lock(dlg);
         PJSUA_UNLOCK();
         return PJ_SUCCESS;
@@ -1068 +1078 @@
         }
     }
-
+    
+    pjsip_dlg_dec_lock(dlg);
+    
     PJSUA_UNLOCK();
     return status;
@@ -1352 +1364 @@
 
     /* Create dialog: */
-    status = pjsip_dlg_create_uas( pjsip_ua_instance(), rdata,
-                                   &contact, &dlg);
+    status = pjsip_dlg_create_uas_and_inc_lock( pjsip_ua_instance(), rdata,
+                                                &contact, &dlg);
     if (status != PJ_SUCCESS) {
         pjsip_endpt_respond_stateless(pjsua_var.endpt, rdata, 500, NULL,
@@ -1460 +1472 @@
     call->async_call.dlg = dlg;
     pj_list_init(&call->async_call.call_var.inc_call.answers);
+
+    pjsip_dlg_inc_session(dlg, &pjsua_var.mod);
 
     /* Init media channel, only when there is offer or call replace request.
@@ -1502 +1516 @@
             pjsip_dlg_dec_lock(dlg);
 
+            pjsip_dlg_dec_session(dlg, &pjsua_var.mod);
+
             call->inv = NULL;
             call->async_call.dlg = NULL;
@@ -1619 +1635 @@
     /* This INVITE request has been handled. */
 on_return:
+    if (dlg) {
+        pjsip_dlg_dec_lock(dlg);
+    }
+    
     pj_log_pop_indent();
     PJSUA_UNLOCK();