Changeset 5513 for pjproject/branches/projects/uwp/pjsip/src/pjsua-lib/pjsua_call.c

Timestamp:

Dec 28, 2016 3:40:07 AM (8 years ago)

Author:

nanang

Message:

Re #1900: More merged from trunk (r5512 mistakenly contains merged changes in third-party dir only).

Location:

pjproject/branches/projects/uwp

Files:

• . (modified) (1 prop)
• pjsip/src/pjsua-lib/pjsua_call.c (modified) (30 diffs)

pjproject/branches/projects/uwp/pjsip/src/pjsua-lib/pjsua_call.c

@@ -570 +570 @@
 {
     opt->flag &= ~(PJSUA_CALL_UNHOLD | PJSUA_CALL_UPDATE_CONTACT |
-                   PJSUA_CALL_NO_SDP_OFFER);
+                   PJSUA_CALL_NO_SDP_OFFER | PJSUA_CALL_REINIT_MEDIA |
+                   PJSUA_CALL_UPDATE_VIA);
 }
 
@@ -609 +610 @@
     call->opt = *opt;
 
+    if (call->opt.flag & PJSUA_CALL_REINIT_MEDIA) {
+        pjsua_media_channel_deinit(call->index);
+    }
+
     /* If call is established or media channel hasn't been initialized,
      * reinit media channel.
@@ -614 +619 @@
     if ((call->inv && call->inv->state == PJSIP_INV_STATE_CONNECTING &&
          call->med_cnt == 0) ||
-        (call->inv && call->inv->state == PJSIP_INV_STATE_CONFIRMED))
+        (call->inv && call->inv->state == PJSIP_INV_STATE_CONFIRMED) ||
+        (call->opt.flag & PJSUA_CALL_REINIT_MEDIA))
     {
         pjsip_role_e role = rem_sdp? PJSIP_ROLE_UAS : PJSIP_ROLE_UAC;
@@ -632 +638 @@
 
     return PJ_SUCCESS;
+}
+
+static void dlg_set_via(pjsip_dialog *dlg, pjsua_acc *acc)
+{
+    if (acc->cfg.allow_via_rewrite && acc->via_addr.host.slen > 0) {
+        pjsip_dlg_set_via_sent_by(dlg, &acc->via_addr, acc->via_tp);
+    } else if (!pjsua_sip_acc_is_using_stun(acc->index)) {
+        /* Choose local interface to use in Via if acc is not using
+         * STUN. See https://trac.pjsip.org/repos/ticket/1804
+         */
+        pjsip_host_port via_addr;
+        const void *via_tp;
+
+        if (pjsua_acc_get_uac_addr(acc->index, dlg->pool, &acc->cfg.id,
+                                   &via_addr, NULL, NULL,
+                                   &via_tp) == PJ_SUCCESS)
+        {
+            pjsip_dlg_set_via_sent_by(dlg, &via_addr,
+                                      (pjsip_transport*)via_tp);
+        }
+    }
 }
 
@@ -773 +800 @@
     pjsip_dlg_inc_lock(dlg);
 
-    if (acc->cfg.allow_via_rewrite && acc->via_addr.host.slen > 0) {
-        pjsip_dlg_set_via_sent_by(dlg, &acc->via_addr, acc->via_tp);
-    } else if (!pjsua_sip_acc_is_using_stun(acc_id)) {
-        /* Choose local interface to use in Via if acc is not using
-         * STUN. See https://trac.pjsip.org/repos/ticket/1804
-         */
-        pjsip_host_port via_addr;
-        const void *via_tp;
-
-        if (pjsua_acc_get_uac_addr(acc_id, dlg->pool, &acc->cfg.id,
-                                   &via_addr, NULL, NULL,
-                                   &via_tp) == PJ_SUCCESS)
-        {
-            pjsip_dlg_set_via_sent_by(dlg, &via_addr,
-                                      (pjsip_transport*)via_tp);
-        }
-    }
+    dlg_set_via(dlg, acc);
 
     /* Calculate call's secure level */
@@ -954 +965 @@
     struct call_answer *answer, *next;
 
+    /* No initial answer yet, this function should be called again later */
+    if (!call->inv->last_answer)
+        return;
+
     answer = call->async_call.call_var.inc_call.answers.next;
     while (answer != &call->async_call.call_var.inc_call.answers) {
@@ -983 +998 @@
     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 +1021 @@
         pjsua_media_channel_deinit(call->index);
         call->med_ch_cb = NULL;
+        pjsip_dlg_dec_lock(dlg);
         PJSUA_UNLOCK();
         return PJ_SUCCESS;
@@ -1068 +1093 @@
         }
     }
-
+    
+    pjsip_dlg_dec_lock(dlg);
+    
     PJSUA_UNLOCK();
     return status;
@@ -1089 +1116 @@
     pjsip_inv_session *inv = NULL;
     int acc_id;
-    pjsua_call *call;
+    pjsua_call *call = NULL;
     int call_id = -1;
     int sip_err_code = PJSIP_SC_INTERNAL_SERVER_ERROR;
@@ -1210 +1237 @@
             goto on_return;
         }
+    }
+
+    if (!replaced_dlg) {
+        /* Clone rdata. */
+        pjsip_rx_data_clone(rdata, 0, &call->incoming_data);
     }
 
@@ -1352 +1384 @@
 
     /* 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 +1492 @@
     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 +1536 @@
             pjsip_dlg_dec_lock(dlg);
 
+            pjsip_dlg_dec_session(dlg, &pjsua_var.mod);
+
             call->inv = NULL;
             call->async_call.dlg = NULL;
@@ -1610 +1646 @@
         if (pjsua_var.ua_cfg.cb.on_incoming_call) {
             pjsua_var.ua_cfg.cb.on_incoming_call(acc_id, call_id, rdata);
+
+            /* onIncomingCall() may be simulated by onCreateMediaTransport()
+             * when media init is done synchrounously (see #1916). And if app
+             * happens to answer/hangup the call from the callback, the 
+             * answer/hangup should have been delayed (see #1923), 
+             * so let's process the answer/hangup now.
+             */
+            if (call->async_call.call_var.inc_call.hangup) {
+                pjsua_call_hangup(call_id, call->last_code, &call->last_text,
+                                  NULL);
+            } else if (call->med_ch_cb == NULL && call->inv) {
+                process_pending_call_answer(call);
+            }
         } else {
             pjsua_call_hangup(call_id, PJSIP_SC_TEMPORARILY_UNAVAILABLE,
@@ -1619 +1668 @@
     /* This INVITE request has been handled. */
 on_return:
+    if (dlg) {
+        pjsip_dlg_dec_lock(dlg);
+    }
+
+    if (call && call->incoming_data) {
+        pjsip_rx_data_free_cloned(call->incoming_data);
+        call->incoming_data = NULL;
+    }
+    
     pj_log_pop_indent();
     PJSUA_UNLOCK();
@@ -2189 +2247 @@
     /* If media transport creation is not yet completed, we will answer
      * the call in the media transport creation callback instead.
+     * Or if initial answer is not sent yet, we will answer the call after
+     * initial answer is sent (see #1923).
      */
-    if (call->med_ch_cb) {
+    if (call->med_ch_cb || !call->inv->last_answer) {
         struct call_answer *answer;
 
@@ -2204 +2264 @@
         }
         if (reason) {
+            answer->reason = PJ_POOL_ZALLOC_T(call->inv->pool_prov, pj_str_t);
             pj_strdup(call->inv->pool_prov, answer->reason, reason);
         }
@@ -2292 +2353 @@
      * the call in the media transport creation callback instead.
      */
-    if (call->med_ch_cb && !call->inv) {
+    if ((call->med_ch_cb && !call->inv) ||
+        ((call->inv != NULL) && (call->inv->state == PJSIP_INV_STATE_NULL)))
+    {
         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 (call->inv->role == PJSIP_ROLE_UAS)
+            call->async_call.call_var.inc_call.hangup = PJ_TRUE;
+        else
+            call->async_call.call_var.out_call.hangup = PJ_TRUE;
+
         if (code == 0)
             call->last_code = PJSIP_SC_REQUEST_TERMINATED;
@@ -2438 +2506 @@
     }
 
+    if ((options & PJSUA_CALL_UPDATE_VIA) &&
+        pjsua_acc_is_valid(call->acc_id))
+    {
+        dlg_set_via(call->inv->dlg, &pjsua_var.acc[call->acc_id]);
+    }
+
     /* Create re-INVITE with new offer */
     status = pjsip_inv_reinvite( call->inv, new_contact, sdp, &tdata);
@@ -2559 +2633 @@
     }
 
+    if ((call->opt.flag & PJSUA_CALL_UPDATE_VIA) &&
+        pjsua_acc_is_valid(call->acc_id))
+    {
+        dlg_set_via(call->inv->dlg, &pjsua_var.acc[call->acc_id]);
+    }
+
     /* Create re-INVITE with new offer */
     status = pjsip_inv_reinvite( call->inv, new_contact, sdp, &tdata);
@@ -2668 +2748 @@
     }
 
+    if ((call->opt.flag & PJSUA_CALL_UPDATE_VIA) &&
+        pjsua_acc_is_valid(call->acc_id))
+    {
+        dlg_set_via(call->inv->dlg, &pjsua_var.acc[call->acc_id]);
+    }
+
     /* Create UPDATE with new offer */
     status = pjsip_inv_update(call->inv, new_contact, sdp, &tdata);
@@ -2784 +2870 @@
     pj_str_t str_dest;
     int len;
+    char call_id_dest_buf[PJSIP_MAX_URL_SIZE * 2];
+    int call_id_len;
     pjsip_uri *uri;
     pj_status_t status;
+    const pjsip_parser_const_t *pconst;
 
 
@@ -2830 +2919 @@
 
     str_dest.slen += len;
-
+        
+    /* This uses the the same scanner definition used for SIP parsing 
+     * to escape the call-id in the refer.
+     *
+     * A common pattern for call-ids is: name@domain. The '@' character, 
+     * when used in a URL parameter, throws off many SIP parsers. 
+     * URL escape it based off of the allowed characters for header values.
+    */
+    pconst = pjsip_parser_const();      
+    call_id_len = pj_strncpy2_escape(call_id_dest_buf, &dest_dlg->call_id->id,
+                                     PJ_ARRAY_SIZE(call_id_dest_buf),
+                                     &pconst->pjsip_HDR_CHAR_SPEC);
+    if (call_id_len < 0) {
+        status = PJSIP_EURITOOLONG;
+        goto on_error;
+    }
 
     /* Build the URI */
@@ -2841 +2945 @@
                            ((options&PJSUA_XFER_NO_REQUIRE_REPLACES) ?
                             "" : "Require=replaces&"),
-                           (int)dest_dlg->call_id->id.slen,
-                           dest_dlg->call_id->id.ptr,
+                           call_id_len,
+                           call_id_dest_buf,
                            (int)dest_dlg->remote.info->tag.slen,
                            dest_dlg->remote.info->tag.ptr,
@@ -4050 +4154 @@
     }
 
+    cleanup_call_setting_flag(&call->opt);
+
     if (pjsua_var.ua_cfg.cb.on_call_rx_offer) {
         pjsip_status_code code = PJSIP_SC_OK;
         pjsua_call_setting opt;
 
-        cleanup_call_setting_flag(&call->opt);
         opt = call->opt;
-
         (*pjsua_var.ua_cfg.cb.on_call_rx_offer)(call->index, offer, NULL,
                                                 &code, &opt);
@@ -4182 +4286 @@
 #endif
 
+    cleanup_call_setting_flag(&call->opt);
+
     if (pjsua_var.ua_cfg.cb.on_call_tx_offer) {
-        cleanup_call_setting_flag(&call->opt);
         (*pjsua_var.ua_cfg.cb.on_call_tx_offer)(call->index, NULL,
                                                 &call->opt);
@@ -4471 +4576 @@
 
     if (refer_sub) {
-        if (!pj_strnicmp2(&refer_sub->hvalue, "true", 4)==0)
+        if (pj_strnicmp2(&refer_sub->hvalue, "true", 4)!=0)
             no_refer_sub = PJ_TRUE;
     }
@@ -4777 +4882 @@
                tsx->state >= PJSIP_TSX_STATE_COMPLETED &&
                e->body.tsx_state.prev_state < PJSIP_TSX_STATE_COMPLETED &&
-               (tsx->status_code!=401 && tsx->status_code!=407 &&
+               (!PJSIP_IS_STATUS_IN_CLASS(tsx->status_code, 300) &&
+                tsx->status_code!=401 && tsx->status_code!=407 &&
                 tsx->status_code!=422))
     {
@@ -4822 +4928 @@
                tsx->state >= PJSIP_TSX_STATE_COMPLETED &&
                e->body.tsx_state.prev_state < PJSIP_TSX_STATE_COMPLETED &&
-               (tsx->status_code!=401 && tsx->status_code!=407 &&
+               (!PJSIP_IS_STATUS_IN_CLASS(tsx->status_code, 300) &&
+                tsx->status_code!=401 && tsx->status_code!=407 &&
                 tsx->status_code!=422))
     {