Changeset 3751 for pjproject

Timestamp:

Sep 16, 2011 3:12:27 AM (13 years ago)

Author:

bennylp

Message:

Fixed #1371: Soft deadlock when application query call info of other call inside a callback. The following APIs should be safe to be called in this situation:

• pjsua_call_get_info()
• pjsua_call_get_conf_port()

File:

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

pjproject/branches/1.x/pjsip/src/pjsua-lib/pjsua_call.c

@@ -1243 +1243 @@
     pjsua_call *call;
     pjsua_conf_port_id port_id;
-    pjsip_dialog *dlg;
-    pj_status_t status;
 
     PJ_ASSERT_RETURN(call_id>=0 && call_id<(int)pjsua_var.ua_cfg.max_calls, 
                      PJ_EINVAL);
 
-    status = acquire_call("pjsua_call_get_conf_port()", call_id, &call, &dlg);
-    if (status != PJ_SUCCESS)
-        return PJSUA_INVALID_ID;
-
+    /* Use PJSUA_LOCK() instead of acquire_call():
+     *  https://trac.pjsip.org/repos/ticket/1371
+     */
+    PJSUA_LOCK();
+
+    call = &pjsua_var.calls[call_id];
     port_id = call->conf_slot;
 
-    pjsip_dlg_dec_lock(dlg);
+    PJSUA_UNLOCK();
 
     return port_id;
@@ -1269 +1269 @@
 {
     pjsua_call *call;
-    pjsip_dialog *dlg;
-    pj_status_t status;
 
     PJ_ASSERT_RETURN(call_id>=0 && call_id<(int)pjsua_var.ua_cfg.max_calls,
@@ -1277 +1275 @@
     pj_bzero(info, sizeof(*info));
 
-    status = acquire_call("pjsua_call_get_info()", call_id, &call, &dlg);
-    if (status != PJ_SUCCESS) {
-        return status;
-    }
+    /* Use PJSUA_LOCK() instead of acquire_call():
+     *  https://trac.pjsip.org/repos/ticket/1371
+     */
+    PJSUA_LOCK();
+
+    call = &pjsua_var.calls[call_id];
 
     /* id and role */
@@ -1376 +1376 @@
     }
 
-    pjsip_dlg_dec_lock(dlg);
+    PJSUA_UNLOCK();
 
     return PJ_SUCCESS;