Changeset 4300 for pjproject/trunk

Timestamp:

Nov 26, 2012 2:04:17 AM (12 years ago)

Author:

ming

Message:

Fixes #1595: Allow call hangup immediately after outgoing call

Location:

pjproject/trunk/pjsip

Files:

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

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

@@ -171 +171 @@
             struct {
                 pjsua_msg_data  *msg_data;/**< Headers for outgoing INVITE. */
+                pj_bool_t        hangup;  /**< Call is hangup?              */
             } out_call;
             struct {

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

@@ -389 +389 @@
     }
 
-    /* pjsua_media_channel_deinit() has been called. */
-    if (call->async_call.med_ch_deinit)
+    /* pjsua_media_channel_deinit() has been called or
+     * call has been hung up.
+     */
+    if (call->async_call.med_ch_deinit ||
+        call->async_call.call_var.out_call.hangup)
+    {
+        PJ_LOG(4,(THIS_FILE, "Call has been hung up or media channel has "
+                             "been deinitialized"));
         goto on_error;
+    }
 
     /* Create offer */
@@ -488 +495 @@
 
     /* Done. */
+    call->med_ch_cb = NULL;
 
     pjsip_dlg_dec_lock(dlg);
@@ -514 +522 @@
         pjsua_media_channel_deinit(call_id);
     }
+
+    call->med_ch_cb = NULL;
+
+    pjsua_check_snd_dev_idle();
 
     PJSUA_UNLOCK();
@@ -2145 +2157 @@
     if (status != PJ_SUCCESS)
         goto on_return;
+
+    /* If media transport creation is not yet completed, we will hangup
+     * the call in the media transport creation callback instead.
+     */
+    if (call->med_ch_cb) {
+        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 (code == 0)
+            call->last_code = PJSIP_SC_REQUEST_TERMINATED;
+        else
+            call->last_code = code;
+        if (reason) {
+            pj_strncpy(&call->last_text, reason,
+                       sizeof(call->last_text_buf_));
+        }
+        
+        goto on_return;
+    }
 
     if (code==0) {

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

@@ -889 +889 @@
     int len;
     pjsip_inv_session *inv = pjsua_var.calls[call_id].inv;
-    pjsip_dialog *dlg = inv->dlg;
+    pjsip_dialog *dlg;
     char userinfo[128];
 
     /* Dump invite sesion info. */
 
+    dlg = (inv? inv->dlg: pjsua_var.calls[call_id].async_call.dlg);
     len = pjsip_hdr_print_on(dlg->remote.info, userinfo, sizeof(userinfo));
     if (len < 0)
@@ -902 +903 @@
     len = pj_ansi_snprintf(buf, size, "%s[%s] %s",
                            title,
-                           pjsip_inv_state_name(inv->state),
+                           pjsip_inv_state_name(inv? inv->state:
+                                                PJSIP_INV_STATE_DISCONNECTED),
                            userinfo);
     if (len < 1 || len >= (int)size) {