Changeset 4273 for pjproject/trunk

Timestamp:

Oct 2, 2012 2:47:08 AM (12 years ago)

Author:

bennylp

Message:

Fixed #1588: State PJSIP_INV_STATE_NULL is called after call has been disconnected

File:

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

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

@@ -360 +360 @@
     unsigned options = 0;
     pjsip_tx_data *tdata;
+    pj_bool_t cb_called = PJ_FALSE;
     pj_status_t status = (info? info->status: PJ_SUCCESS);
 
@@ -477 +478 @@
     status = pjsip_inv_send_msg(inv, tdata);
     if (status != PJ_SUCCESS) {
-        pjsua_perror(THIS_FILE, "Unable to send initial INVITE request", 
-                     status);
+        cb_called = PJ_TRUE;
 
         /* Upon failure to send first request, the invite 
@@ -495 +495 @@
 
 on_error:
-    if (inv == NULL && call_id != -1 && pjsua_var.ua_cfg.cb.on_call_state)
+    if (inv == NULL && call_id != -1 && !cb_called &&
+        pjsua_var.ua_cfg.cb.on_call_state)
+    {
         (*pjsua_var.ua_cfg.cb.on_call_state)(call_id, NULL);
+    }
 
     if (dlg) {