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

Timestamp:

Feb 4, 2014 10:13:56 AM (11 years ago)

Author:

bennylp

Message:

Misc (re #1630): Fixing warnings about variable set but not used with recent gcc

File:

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

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

@@ -1 +1 @@
 /* $Id$ */
-/* 
+/*
  * Copyright (C) 2008-2011 Teluu Inc. (http://www.teluu.com)
  * Copyright (C) 2003-2008 Benny Prijono <benny@prijono.org>
@@ -16 +16 @@
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA 
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 #include <pjsua-lib/pjsua.h>
@@ -39 +39 @@
  * The INFO method.
  */
-const pjsip_method pjsip_info_method = 
+const pjsip_method pjsip_info_method =
 {
     PJSIP_OTHER_METHOD,
@@ -49 +49 @@
  * session state has changed.
  */
-static void pjsua_call_on_state_changed(pjsip_inv_session *inv, 
+static void pjsua_call_on_state_changed(pjsip_inv_session *inv,
                                         pjsip_event *e);
 
@@ -55 +55 @@
  * has forked.
  */
-static void pjsua_call_on_forked( pjsip_inv_session *inv, 
+static void pjsua_call_on_forked( pjsip_inv_session *inv,
                                   pjsip_event *e);
 
@@ -164 +164 @@
     /* Check the route URI's and force loose route if required */
     for (i=0; i<pjsua_var.ua_cfg.outbound_proxy_cnt; ++i) {
-        status = normalize_route_uri(pjsua_var.pool, 
+        status = normalize_route_uri(pjsua_var.pool,
                                      &pjsua_var.ua_cfg.outbound_proxy[i]);
         if (status != PJ_SUCCESS)
@@ -258 +258 @@
 #if 1
     /* New algorithm: round-robin */
-    if (pjsua_var.next_call_id >= (int)pjsua_var.ua_cfg.max_calls || 
+    if (pjsua_var.next_call_id >= (int)pjsua_var.ua_cfg.max_calls ||
         pjsua_var.next_call_id < 0)
     {
@@ -264 +264 @@
     }
 
-    for (cid=pjsua_var.next_call_id; 
-         cid<(int)pjsua_var.ua_cfg.max_calls; 
-         ++cid) 
+    for (cid=pjsua_var.next_call_id;
+         cid<(int)pjsua_var.ua_cfg.max_calls;
+         ++cid)
     {
         if (pjsua_var.calls[cid].inv == NULL &&
@@ -310 +310 @@
     if (pj_stristr(dst_uri, &sips))
         return 2;
-    
+
     if (!pj_list_empty(&acc->route_set)) {
         pjsip_route_hdr *r = acc->route_set.next;
         pjsip_uri *uri = r->name_addr.uri;
         pjsip_sip_uri *sip_uri;
-        
+
         sip_uri = (pjsip_sip_uri*)pjsip_uri_get_uri(uri);
         if (pj_stricmp2(&sip_uri->transport_param, "tls")==0)
@@ -338 +338 @@
         pjsip_uri *uri = r->name_addr.uri;
         pjsip_sip_uri *sip_uri;
-        
+
         sip_uri = (pjsip_sip_uri*)pjsip_uri_get_uri(uri);
         if (pj_stricmp2(&sip_uri->transport_param, "tls")==0)
@@ -468 +468 @@
     /* Set credentials: */
     if (acc->cred_cnt) {
-        pjsip_auth_clt_set_credentials( &dlg->auth_sess, 
+        pjsip_auth_clt_set_credentials( &dlg->auth_sess,
                                         acc->cred_cnt, acc->cred);
     }
@@ -479 +479 @@
     status = pjsip_inv_invite(inv, &tdata);
     if (status != PJ_SUCCESS) {
-        pjsua_perror(THIS_FILE, "Unable to create initial INVITE request", 
+        pjsua_perror(THIS_FILE, "Unable to create initial INVITE request",
                      status);
         goto on_error;
@@ -499 +499 @@
         cb_called = PJ_TRUE;
 
-        /* Upon failure to send first request, the invite 
+        /* Upon failure to send first request, the invite
          * session would have been cleared.
          */
@@ -617 +617 @@
 
     /* Check that account is valid */
-    PJ_ASSERT_RETURN(acc_id>=0 || acc_id<(int)PJ_ARRAY_SIZE(pjsua_var.acc), 
+    PJ_ASSERT_RETURN(acc_id>=0 || acc_id<(int)PJ_ARRAY_SIZE(pjsua_var.acc),
                      PJ_EINVAL);
 
@@ -631 +631 @@
 
     /* Create sound port if none is instantiated, to check if sound device
-     * can be used. But only do this with the conference bridge, as with 
-     * audio switchboard (i.e. APS-Direct), we can only open the sound 
+     * can be used. But only do this with the conference bridge, as with
+     * audio switchboard (i.e. APS-Direct), we can only open the sound
      * device once the correct format has been known
      */
-    if (!pjsua_var.is_mswitch && pjsua_var.snd_port==NULL && 
-        pjsua_var.null_snd==NULL && !pjsua_var.no_snd) 
+    if (!pjsua_var.is_mswitch && pjsua_var.snd_port==NULL &&
+        pjsua_var.null_snd==NULL && !pjsua_var.no_snd)
     {
         status = pjsua_set_snd_dev(pjsua_var.cap_dev, pjsua_var.play_dev);
@@ -679 +679 @@
     tmp_pool = pjsua_pool_create("tmpcall10", 512, 256);
 
-    /* Verify that destination URI is valid before calling 
-     * pjsua_acc_create_uac_contact, or otherwise there  
+    /* Verify that destination URI is valid before calling
+     * pjsua_acc_create_uac_contact, or otherwise there
      * a misleading "Invalid Contact URI" error will be printed
      * when pjsua_acc_create_uac_contact() fails.
@@ -692 +692 @@
 
         if (uri == NULL) {
-            pjsua_perror(THIS_FILE, "Unable to make call", 
+            pjsua_perror(THIS_FILE, "Unable to make call",
                          PJSIP_EINVALIDREQURI);
             status = PJSIP_EINVALIDREQURI;
@@ -714 +714 @@
                                               acc_id, dest_uri);
         if (status != PJ_SUCCESS) {
-            pjsua_perror(THIS_FILE, "Unable to generate Contact header", 
+            pjsua_perror(THIS_FILE, "Unable to generate Contact header",
                          status);
             goto on_error;
@@ -721 +721 @@
 
     /* Create outgoing dialog: */
-    status = pjsip_dlg_create_uac( pjsip_ua_instance(), 
+    status = pjsip_dlg_create_uac( pjsip_ua_instance(),
                                    &acc->cfg.id, &contact,
                                    dest_uri,
@@ -745 +745 @@
     /* Attach user data */
     call->user_data = user_data;
-    
+
     /* Store variables required for the callback after the async
      * media transport creation is completed.
@@ -762 +762 @@
 
     /* Init media channel */
-    status = pjsua_media_channel_init(call->index, PJSIP_ROLE_UAC, 
+    status = pjsua_media_channel_init(call->index, PJSIP_ROLE_UAC,
                                       call->secure_level, dlg->pool,
                                       NULL, NULL, PJ_TRUE,
@@ -813 +813 @@
 
 /* Get the NAT type information in remote's SDP */
-static void update_remote_nat_type(pjsua_call *call, 
+static void update_remote_nat_type(pjsua_call *call,
                                    const pjmedia_sdp_session *sdp)
 {
@@ -900 +900 @@
 {
     struct call_answer *answer, *next;
-    
+
     answer = call->async_call.call_var.inc_call.answers.next;
     while (answer != &call->async_call.call_var.inc_call.answers) {
@@ -906 +906 @@
         pjsua_call_answer2(call->index, answer->opt, answer->code,
                            answer->reason, answer->msg_data);
-        
+
         /* Call might have been disconnected if application is answering
          * with 200/OK and the media failed to start.
@@ -953 +953 @@
 
     status = pjsua_media_channel_create_sdp(call_id,
-                                            call->async_call.dlg->pool, 
+                                            call->async_call.dlg->pool,
                                             offer, &answer, &sip_err_code);
     if (status != PJ_SUCCESS) {
@@ -977 +977 @@
         sip_err_code = PJSIP_ERRNO_TO_SIP_STATUS(status);
         goto on_return;
-    } 
+    }
 
 on_return:
@@ -1007 +1007 @@
         if (call->async_call.call_var.inc_call.replaced_dlg) {
             /* Process pending call replace */
-            pjsip_dialog *replaced_dlg = 
+            pjsip_dialog *replaced_dlg =
                         call->async_call.call_var.inc_call.replaced_dlg;
             process_incoming_call_replace(call, replaced_dlg);
@@ -1054 +1054 @@
     /* Don't want to accept the call if shutdown is in progress */
     if (pjsua_var.thread_quit_flag) {
-        pjsip_endpt_respond_stateless(pjsua_var.endpt, rdata, 
+        pjsip_endpt_respond_stateless(pjsua_var.endpt, rdata,
                                       PJSIP_SC_TEMPORARILY_UNAVAILABLE, NULL,
                                       NULL, NULL);
@@ -1069 +1069 @@
 
     if (call_id == PJSUA_INVALID_ID) {
-        pjsip_endpt_respond_stateless(pjsua_var.endpt, rdata, 
+        pjsip_endpt_respond_stateless(pjsua_var.endpt, rdata,
                                       PJSIP_SC_BUSY_HERE, NULL,
                                       NULL, NULL);
-        PJ_LOG(2,(THIS_FILE, 
+        PJ_LOG(2,(THIS_FILE,
                   "Unable to accept incoming call (too many calls)"));
         goto on_return;
@@ -1098 +1098 @@
 
             pjsip_get_response_addr(response->pool, rdata, &res_addr);
-            pjsip_endpt_send_response(pjsua_var.endpt, &res_addr, response, 
+            pjsip_endpt_send_response(pjsua_var.endpt, &res_addr, response,
                                       NULL, NULL);
 
@@ -1152 +1152 @@
                 st_text = *pjsip_get_status_text(st_code);
 
-            pjsip_endpt_respond(pjsua_var.endpt, NULL, rdata, 
+            pjsip_endpt_respond(pjsua_var.endpt, NULL, rdata,
                                 st_code, &st_text, NULL, NULL, NULL);
             goto on_return;
@@ -1158 +1158 @@
     }
 
-    /* 
+    /*
      * Get which account is most likely to be associated with this incoming
      * call. We need the account to find which contact URI to put for
@@ -1190 +1190 @@
             pjsip_warning_hdr *w;
 
-            pjsua_perror(THIS_FILE, "Bad SDP in incoming INVITE", 
+            pjsua_perror(THIS_FILE, "Bad SDP in incoming INVITE",
                          status);
 
-            w = pjsip_warning_hdr_create_from_status(rdata->tp_info.pool, 
+            w = pjsip_warning_hdr_create_from_status(rdata->tp_info.pool,
                                              pjsip_endpt_name(pjsua_var.endpt),
                                              status);
@@ -1199 +1199 @@
             pj_list_push_back(&hdr_list, w);
 
-            pjsip_endpt_respond(pjsua_var.endpt, NULL, rdata, 400, 
+            pjsip_endpt_respond(pjsua_var.endpt, NULL, rdata, 400,
                                 &reason, &hdr_list, NULL, NULL);
             goto on_return;
         }
 
-        /* Do quick checks on SDP before passing it to transports. More elabore 
+        /* Do quick checks on SDP before passing it to transports. More elabore
          * checks will be done in pjsip_inv_verify_request2() below.
          */
         if (offer->media_count==0) {
             const pj_str_t reason = pj_str("Missing media in SDP");
-            pjsip_endpt_respond(pjsua_var.endpt, NULL, rdata, 400, &reason, 
+            pjsip_endpt_respond(pjsua_var.endpt, NULL, rdata, 400, &reason,
                                 NULL, NULL, NULL);
             goto on_return;
@@ -1241 +1241 @@
 
             pjsip_get_response_addr(response->pool, rdata, &res_addr);
-            pjsip_endpt_send_response(pjsua_var.endpt, &res_addr, response, 
+            pjsip_endpt_send_response(pjsua_var.endpt, &res_addr, response,
                                       NULL, NULL);
 
@@ -1251 +1251 @@
 
         goto on_return;
-    } 
+    }
 
     /* Get suitable Contact header */
@@ -1260 +1260 @@
                                               acc_id, rdata);
         if (status != PJ_SUCCESS) {
-            pjsua_perror(THIS_FILE, "Unable to generate Contact header", 
+            pjsua_perror(THIS_FILE, "Unable to generate Contact header",
                          status);
             pjsip_endpt_respond_stateless(pjsua_var.endpt, rdata, 500, NULL,
@@ -1286 +1286 @@
     /* Set credentials */
     if (pjsua_var.acc[acc_id].cred_cnt) {
-        pjsip_auth_clt_set_credentials(&dlg->auth_sess, 
+        pjsip_auth_clt_set_credentials(&dlg->auth_sess,
                                        pjsua_var.acc[acc_id].cred_cnt,
                                        pjsua_var.acc[acc_id].cred);
@@ -1292 +1292 @@
 
     /* Set preference */
-    pjsip_auth_clt_set_prefs(&dlg->auth_sess, 
+    pjsip_auth_clt_set_prefs(&dlg->auth_sess,
                              &pjsua_var.acc[acc_id].cfg.auth_pref);
 
@@ -1298 +1298 @@
      * did not require it.
      */
-    if (pjsua_var.acc[acc_id].cfg.use_timer == PJSUA_SIP_TIMER_INACTIVE && 
+    if (pjsua_var.acc[acc_id].cfg.use_timer == PJSUA_SIP_TIMER_INACTIVE &&
         (options & PJSIP_INV_REQUIRE_TIMER) == 0)
     {
@@ -1323 +1323 @@
         pjsip_warning_hdr *w;
 
-        w = pjsip_warning_hdr_create_from_status(dlg->pool, 
+        w = pjsip_warning_hdr_create_from_status(dlg->pool,
                                                  pjsip_endpt_name(pjsua_var.endpt),
                                                  status);
@@ -1361 +1361 @@
      */
     if (offer || replaced_dlg) {
-        status = pjsua_media_channel_init(call->index, PJSIP_ROLE_UAS, 
-                                          call->secure_level, 
+        status = pjsua_media_channel_init(call->index, PJSIP_ROLE_UAS,
+                                          call->secure_level,
                                           rdata->tp_info.pool,
                                           offer,
@@ -1377 +1377 @@
                  */
                 pjsip_dlg_respond(dlg, rdata, sip_err_code, NULL, NULL, NULL);
-                pjsip_inv_terminate(call->inv, sip_err_code, PJ_FALSE); 
+                pjsip_inv_terminate(call->inv, sip_err_code, PJ_FALSE);
                 call->inv = NULL;
                 call->async_call.dlg = NULL;
@@ -1385 +1385 @@
             pjsua_perror(THIS_FILE, "Error initializing media channel", status);
             pjsip_dlg_respond(dlg, rdata, sip_err_code, NULL, NULL, NULL);
-            pjsip_inv_terminate(call->inv, sip_err_code, PJ_FALSE); 
-            call->inv = NULL; 
+            pjsip_inv_terminate(call->inv, sip_err_code, PJ_FALSE);
+            call->inv = NULL;
             call->async_call.dlg = NULL;
             goto on_return;
@@ -1393 +1393 @@
 
     /* Create answer */
-/*  
-    status = pjsua_media_channel_create_sdp(call->index, rdata->tp_info.pool, 
+/*
+    status = pjsua_media_channel_create_sdp(call->index, rdata->tp_info.pool,
                                             offer, &answer, &sip_err_code);
     if (status != PJ_SUCCESS) {
@@ -1405 +1405 @@
 
     /* Init Session Timers */
-    status = pjsip_timer_init_session(inv, 
+    status = pjsip_timer_init_session(inv,
                                     &pjsua_var.acc[acc_id].cfg.timer_setting);
     if (status != PJ_SUCCESS) {
@@ -1420 +1420 @@
 
     /* Update NAT type of remote endpoint, only when there is SDP in
-     * incoming INVITE! 
+     * incoming INVITE!
      */
     if (pjsua_var.ua_cfg.nat_type_in_sdp && inv->neg &&
-        pjmedia_sdp_neg_get_state(inv->neg) > PJMEDIA_SDP_NEG_STATE_LOCAL_OFFER) 
+        pjmedia_sdp_neg_get_state(inv->neg) > PJMEDIA_SDP_NEG_STATE_LOCAL_OFFER)
     {
         const pjmedia_sdp_session *remote_sdp;
@@ -1489 +1489 @@
         }
     } else {
-        /* Notify application if on_incoming_call() is overriden, 
+        /* Notify application if on_incoming_call() is overriden,
          * otherwise hangup the call with 480
          */
@@ -1495 +1495 @@
             pjsua_var.ua_cfg.cb.on_incoming_call(acc_id, call_id, rdata);
         } else {
-            pjsua_call_hangup(call_id, PJSIP_SC_TEMPORARILY_UNAVAILABLE, 
+            pjsua_call_hangup(call_id, PJSIP_SC_TEMPORARILY_UNAVAILABLE,
                               NULL, NULL);
         }
@@ -1551 +1551 @@
                 break;
         }
-        
+
         has_pjsua_lock = PJ_FALSE;
 
@@ -1596 +1596 @@
         return PJ_ETIMEDOUT;
     }
-    
+
     *p_call = call;
     *p_dlg = dlg;
@@ -1701 +1701 @@
                    sizeof(info->buf_.last_status_text));
     }
-    
+
     /* Audio & video count offered by remote */
     info->rem_offerer   = call->rem_offerer;
@@ -1727 +1727 @@
             pjmedia_vid_dev_index cap_dev = PJMEDIA_VID_INVALID_DEV;
 
-            info->media[info->media_cnt].stream.vid.win_in = 
+            info->media[info->media_cnt].stream.vid.win_in =
                                                 call_med->strm.v.rdr_win_id;
 
@@ -1763 +1763 @@
             pjmedia_vid_dev_index cap_dev = PJMEDIA_VID_INVALID_DEV;
 
-            info->prov_media[info->prov_media_cnt].stream.vid.win_in = 
+            info->prov_media[info->prov_media_cnt].stream.vid.win_in =
                                                 call_med->strm.v.rdr_win_id;
 
@@ -1874 +1874 @@
  * Get media transport info for the specified media index.
  */
-PJ_DEF(pj_status_t) 
+PJ_DEF(pj_status_t)
 pjsua_call_get_med_transport_info(pjsua_call_id call_id,
                                   unsigned med_idx,
@@ -1890 +1890 @@
 
     call = &pjsua_var.calls[call_id];
-    
+
     if (med_idx >= call->med_cnt) {
         PJSUA_UNLOCK();
@@ -1900 +1900 @@
     pjmedia_transport_info_init(t);
     status = pjmedia_transport_get_info(call_med->tp, t);
-    
+
     PJSUA_UNLOCK();
     return status;
@@ -1932 +1932 @@
 
     status = pjsua_media_channel_create_sdp(call_id,
-                                            call->async_call.dlg->pool, 
+                                            call->async_call.dlg->pool,
                                             NULL, &sdp, &sip_err_code);
     if (status != PJ_SUCCESS) {
@@ -1984 +1984 @@
  * Send response to incoming INVITE request.
  */
-PJ_DEF(pj_status_t) pjsua_call_answer( pjsua_call_id call_id, 
+PJ_DEF(pj_status_t) pjsua_call_answer( pjsua_call_id call_id,
                                        unsigned code,
                                        const pj_str_t *reason,
@@ -2042 +2042 @@
      *   answer code 183 or 2xx is issued
      */
-    if (!call->med_ch_cb && 
+    if (!call->med_ch_cb &&
         (call->opt_inited || (code==183 || code/100==2)) &&
         (!call->inv->neg ||
-         pjmedia_sdp_neg_get_state(call->inv->neg) == 
+         pjmedia_sdp_neg_get_state(call->inv->neg) ==
                 PJMEDIA_SDP_NEG_STATE_NULL))
     {
@@ -2076 +2076 @@
     if (call->med_ch_cb) {
         struct call_answer *answer;
-        
+
         PJ_LOG(4,(THIS_FILE, "Pending answering call %d upon completion "
                              "of media transport", call_id));
@@ -2114 +2114 @@
     status = pjsip_inv_answer(call->inv, code, reason, NULL, &tdata);
     if (status != PJ_SUCCESS) {
-        pjsua_perror(THIS_FILE, "Error creating response", 
+        pjsua_perror(THIS_FILE, "Error creating response",
                      status);
         goto on_return;
@@ -2131 +2131 @@
     status = pjsip_inv_send_msg(call->inv, tdata);
     if (status != PJ_SUCCESS)
-        pjsua_perror(THIS_FILE, "Error sending response", 
+        pjsua_perror(THIS_FILE, "Error sending response",
                      status);
 
@@ -2160 +2160 @@
                              call_id));
     }
-    
+
     PJ_ASSERT_RETURN(call_id>=0 && call_id<(int)pjsua_var.ua_cfg.max_calls,
                      PJ_EINVAL);
@@ -2186 +2186 @@
                        sizeof(call->last_text_buf_));
         }
-        
+
         goto on_return;
     }
@@ -2201 +2201 @@
     status = pjsip_inv_end_session(call->inv, code, reason, &tdata);
     if (status != PJ_SUCCESS) {
-        pjsua_perror(THIS_FILE, 
-                     "Failed to create end session message", 
+        pjsua_perror(THIS_FILE,
+                     "Failed to create end session message",
                      status);
         goto on_return;
     }
 
-    /* pjsip_inv_end_session may return PJ_SUCCESS with NULL 
+    /* pjsip_inv_end_session may return PJ_SUCCESS with NULL
      * as p_tdata when INVITE transaction has not been answered
      * with any provisional responses.
@@ -2220 +2220 @@
     status = pjsip_inv_send_msg(call->inv, tdata);
     if (status != PJ_SUCCESS) {
-        pjsua_perror(THIS_FILE, 
-                     "Failed to send end session message", 
+        pjsua_perror(THIS_FILE,
+                     "Failed to send end session message",
                      status);
         goto on_return;
@@ -2252 +2252 @@
                      PJ_EINVAL);
 
-    status = acquire_call("pjsua_call_process_redirect()", call_id, 
+    status = acquire_call("pjsua_call_process_redirect()", call_id,
                           &call, &dlg);
     if (status != PJ_SUCCESS)
@@ -2398 +2398 @@
         goto on_return;
     }
-
-    status = apply_call_setting(call, opt, NULL);
-    if (status != PJ_SUCCESS) {
-        pjsua_perror(THIS_FILE, "Failed to apply call setting", status);
-        goto on_return;
-    }
-
-    /* Create SDP */
-    if (call->local_hold && (call->opt.flag & PJSUA_CALL_UNHOLD)==0) {
-        status = create_sdp_of_call_hold(call, &sdp);
-    } else {
-        status = pjsua_media_channel_create_sdp(call->index, 
-                                                call->inv->pool_prov,
-                                                NULL, &sdp, NULL);
-        call->local_hold = PJ_FALSE;
-    }
-    if (status != PJ_SUCCESS) {
-        pjsua_perror(THIS_FILE, "Unable to get SDP from media endpoint", 
-                     status);
-        goto on_return;
-    }
-
-    if ((call->opt.flag & PJSUA_CALL_UPDATE_CONTACT) &&
-            pjsua_acc_is_valid(call->acc_id))
-    {
-        new_contact = &pjsua_var.acc[call->acc_id].contact;
-    }
-
-    /* Create re-INVITE with new offer */
-    status = pjsip_inv_reinvite( call->inv, new_contact, sdp, &tdata);
-    if (status != PJ_SUCCESS) {
-        pjsua_perror(THIS_FILE, "Unable to create re-INVITE", status);
-        goto on_return;
-    }
-
-    /* Add additional headers etc */
-    pjsua_process_msg_data( tdata, msg_data);
-
-    /* Send the request */
-    status = pjsip_inv_send_msg( call->inv, tdata);
-    if (status != PJ_SUCCESS) {
-        pjsua_perror(THIS_FILE, "Unable to send re-INVITE", status);
-        goto on_return;
-    }
-
-on_return:
-    if (dlg) pjsip_dlg_dec_lock(dlg);
-    pj_log_pop_indent();
-    return status;
-}
-
-
-/*
- * Send UPDATE request.
- */
-PJ_DEF(pj_status_t) pjsua_call_update( pjsua_call_id call_id,
-                                       unsigned options,
-                                       const pjsua_msg_data *msg_data)
-{
-    pjsua_call *call;
-    pjsip_dialog *dlg = NULL;
-    pj_status_t status;
-
-    status = acquire_call("pjsua_call_update()", call_id, &call, &dlg);
-    if (status != PJ_SUCCESS)
-        goto on_return;
-
-    if (options != call->opt.flag)
-        call->opt.flag = options;
-
-    status = pjsua_call_update2(call_id, NULL, msg_data);
-
-on_return:
-    if (dlg) pjsip_dlg_dec_lock(dlg);
-    return status;
-}
-
-
-/*
- * Send UPDATE request.
- */
-PJ_DEF(pj_status_t) pjsua_call_update2(pjsua_call_id call_id,
-                                       const pjsua_call_setting *opt,
-                                       const pjsua_msg_data *msg_data)
-{
-    pjmedia_sdp_session *sdp;
-    pj_str_t *new_contact = NULL;
-    pjsip_tx_data *tdata;
-    pjsua_call *call;
-    pjsip_dialog *dlg = NULL;
-    pj_status_t status;
-
-    PJ_ASSERT_RETURN(call_id>=0 && call_id<(int)pjsua_var.ua_cfg.max_calls,
-                     PJ_EINVAL);
-
-    PJ_LOG(4,(THIS_FILE, "Sending UPDATE on call %d", call_id));
-    pj_log_push_indent();
-
-    status = acquire_call("pjsua_call_update2()", call_id, &call, &dlg);
-    if (status != PJ_SUCCESS)
-        goto on_return;
 
     status = apply_call_setting(call, opt, NULL);
@@ -2515 +2414 @@
         call->local_hold = PJ_FALSE;
     }
-
     if (status != PJ_SUCCESS) {
         pjsua_perror(THIS_FILE, "Unable to get SDP from media endpoint",
@@ -2528 +2426 @@
     }
 
-    /* Create UPDATE with new offer */
-    status = pjsip_inv_update(call->inv, new_contact, sdp, &tdata);
-    if (status != PJ_SUCCESS) {
-        pjsua_perror(THIS_FILE, "Unable to create UPDATE request", status);
+    /* Create re-INVITE with new offer */
+    status = pjsip_inv_reinvite( call->inv, new_contact, sdp, &tdata);
+    if (status != PJ_SUCCESS) {
+        pjsua_perror(THIS_FILE, "Unable to create re-INVITE", status);
         goto on_return;
     }
@@ -2541 +2439 @@
     status = pjsip_inv_send_msg( call->inv, tdata);
     if (status != PJ_SUCCESS) {
-        pjsua_perror(THIS_FILE, "Unable to send UPDATE request", status);
+        pjsua_perror(THIS_FILE, "Unable to send re-INVITE", status);
         goto on_return;
     }
@@ -2553 +2451 @@
 
 /*
+ * Send UPDATE request.
+ */
+PJ_DEF(pj_status_t) pjsua_call_update( pjsua_call_id call_id,
+                                       unsigned options,
+                                       const pjsua_msg_data *msg_data)
+{
+    pjsua_call *call;
+    pjsip_dialog *dlg = NULL;
+    pj_status_t status;
+
+    status = acquire_call("pjsua_call_update()", call_id, &call, &dlg);
+    if (status != PJ_SUCCESS)
+        goto on_return;
+
+    if (options != call->opt.flag)
+        call->opt.flag = options;
+
+    status = pjsua_call_update2(call_id, NULL, msg_data);
+
+on_return:
+    if (dlg) pjsip_dlg_dec_lock(dlg);
+    return status;
+}
+
+
+/*
+ * Send UPDATE request.
+ */
+PJ_DEF(pj_status_t) pjsua_call_update2(pjsua_call_id call_id,
+                                       const pjsua_call_setting *opt,
+                                       const pjsua_msg_data *msg_data)
+{
+    pjmedia_sdp_session *sdp;
+    pj_str_t *new_contact = NULL;
+    pjsip_tx_data *tdata;
+    pjsua_call *call;
+    pjsip_dialog *dlg = NULL;
+    pj_status_t status;
+
+    PJ_ASSERT_RETURN(call_id>=0 && call_id<(int)pjsua_var.ua_cfg.max_calls,
+                     PJ_EINVAL);
+
+    PJ_LOG(4,(THIS_FILE, "Sending UPDATE on call %d", call_id));
+    pj_log_push_indent();
+
+    status = acquire_call("pjsua_call_update2()", call_id, &call, &dlg);
+    if (status != PJ_SUCCESS)
+        goto on_return;
+
+    status = apply_call_setting(call, opt, NULL);
+    if (status != PJ_SUCCESS) {
+        pjsua_perror(THIS_FILE, "Failed to apply call setting", status);
+        goto on_return;
+    }
+
+    /* Create SDP */
+    if (call->local_hold && (call->opt.flag & PJSUA_CALL_UNHOLD)==0) {
+        status = create_sdp_of_call_hold(call, &sdp);
+    } else {
+        status = pjsua_media_channel_create_sdp(call->index,
+                                                call->inv->pool_prov,
+                                                NULL, &sdp, NULL);
+        call->local_hold = PJ_FALSE;
+    }
+
+    if (status != PJ_SUCCESS) {
+        pjsua_perror(THIS_FILE, "Unable to get SDP from media endpoint",
+                     status);
+        goto on_return;
+    }
+
+    if ((call->opt.flag & PJSUA_CALL_UPDATE_CONTACT) &&
+            pjsua_acc_is_valid(call->acc_id))
+    {
+        new_contact = &pjsua_var.acc[call->acc_id].contact;
+    }
+
+    /* Create UPDATE with new offer */
+    status = pjsip_inv_update(call->inv, new_contact, sdp, &tdata);
+    if (status != PJ_SUCCESS) {
+        pjsua_perror(THIS_FILE, "Unable to create UPDATE request", status);
+        goto on_return;
+    }
+
+    /* Add additional headers etc */
+    pjsua_process_msg_data( tdata, msg_data);
+
+    /* Send the request */
+    status = pjsip_inv_send_msg( call->inv, tdata);
+    if (status != PJ_SUCCESS) {
+        pjsua_perror(THIS_FILE, "Unable to send UPDATE request", status);
+        goto on_return;
+    }
+
+on_return:
+    if (dlg) pjsip_dlg_dec_lock(dlg);
+    pj_log_pop_indent();
+    return status;
+}
+
+
+/*
  * Initiate call transfer to the specified address.
  */
-PJ_DEF(pj_status_t) pjsua_call_xfer( pjsua_call_id call_id, 
+PJ_DEF(pj_status_t) pjsua_call_xfer( pjsua_call_id call_id,
                                      const pj_str_t *dest,
                                      const pjsua_msg_data *msg_data)
@@ -2571 +2571 @@
     PJ_ASSERT_RETURN(call_id>=0 && call_id<(int)pjsua_var.ua_cfg.max_calls &&
                      dest, PJ_EINVAL);
-    
+
     PJ_LOG(4,(THIS_FILE, "Transferring call %d to %.*s", call_id,
                          (int)dest->slen, dest->ptr));
@@ -2579 +2579 @@
     if (status != PJ_SUCCESS)
         goto on_return;
-   
+
     /* Create xfer client subscription. */
     pj_bzero(&xfer_cb, sizeof(xfer_cb));
@@ -2618 +2618 @@
     }
 
-    /* For simplicity (that's what this program is intended to be!), 
+    /* For simplicity (that's what this program is intended to be!),
      * leave the original invite session as it is. More advanced application
      * may want to hold the INVITE, or terminate the invite, or whatever.
@@ -2633 +2633 @@
  * Initiate attended call transfer to the specified address.
  */
-PJ_DEF(pj_status_t) pjsua_call_xfer_replaces( pjsua_call_id call_id, 
+PJ_DEF(pj_status_t) pjsua_call_xfer_replaces( pjsua_call_id call_id,
                                               pjsua_call_id dest_call_id,
                                               unsigned options,
@@ -2645 +2645 @@
     pjsip_uri *uri;
     pj_status_t status;
-    
+
 
     PJ_ASSERT_RETURN(call_id>=0 && call_id<(int)pjsua_var.ua_cfg.max_calls,
                      PJ_EINVAL);
-    PJ_ASSERT_RETURN(dest_call_id>=0 && 
+    PJ_ASSERT_RETURN(dest_call_id>=0 &&
                       dest_call_id<(int)pjsua_var.ua_cfg.max_calls,
                      PJ_EINVAL);
-    
+
     PJ_LOG(4,(THIS_FILE, "Transferring call %d replacing with call %d",
                          call_id, dest_call_id));
     pj_log_push_indent();
 
-    status = acquire_call("pjsua_call_xfer_replaces()", dest_call_id, 
+    status = acquire_call("pjsua_call_xfer_replaces()", dest_call_id,
                           &dest_call, &dest_dlg);
     if (status != PJ_SUCCESS) {
@@ -2663 +2663 @@
         return status;
     }
-        
-    /* 
+
+    /*
      * Create REFER destination URI with Replaces field.
      */
@@ -2672 +2672 @@
                       dest_dlg->call_id->id.slen +
                       dest_dlg->remote.info->tag.slen +
-                      dest_dlg->local.info->tag.slen + 32 
+                      dest_dlg->local.info->tag.slen + 32
                       < (long)sizeof(str_dest_buf),
                       { status=PJSIP_EURITOOLONG; goto on_error; });
@@ -2681 +2681 @@
 
     uri = (pjsip_uri*) pjsip_uri_get_uri(dest_dlg->remote.info->uri);
-    len = pjsip_uri_print(PJSIP_URI_IN_REQ_URI, uri, 
+    len = pjsip_uri_print(PJSIP_URI_IN_REQ_URI, uri,
                           str_dest_buf+1, sizeof(str_dest_buf)-1);
     if (len < 0) {
@@ -2692 +2692 @@
 
     /* Build the URI */
-    len = pj_ansi_snprintf(str_dest_buf + str_dest.slen, 
+    len = pj_ansi_snprintf(str_dest_buf + str_dest.slen,
                            sizeof(str_dest_buf) - str_dest.slen,
                            "?%s"
@@ -2709 +2709 @@
     PJ_ASSERT_ON_FAIL(len > 0 && len <= (int)sizeof(str_dest_buf)-str_dest.slen,
                       { status=PJSIP_EURITOOLONG; goto on_error; });
-    
+
     str_dest.ptr = str_dest_buf;
     str_dest.slen += len;
 
     pjsip_dlg_dec_lock(dest_dlg);
-    
+
     status = pjsua_call_xfer(call_id, &str_dest, msg_data);
 
@@ -2730 +2730 @@
  * Send instant messaging inside INVITE session.
  */
-PJ_DEF(pj_status_t) pjsua_call_send_im( pjsua_call_id call_id, 
+PJ_DEF(pj_status_t) pjsua_call_send_im( pjsua_call_id call_id,
                                         const pj_str_t *mime_type,
                                         const pj_str_t *content,
@@ -2754 +2754 @@
     if (status != PJ_SUCCESS)
         goto on_return;
-    
+
     /* Set default media type if none is specified */
     if (mime_type == NULL) {
@@ -2769 +2769 @@
 
     /* Add accept header. */
-    pjsip_msg_add_hdr( tdata->msg, 
+    pjsip_msg_add_hdr( tdata->msg,
                        (pjsip_hdr*)pjsua_im_create_accept(tdata->pool));
 
@@ -2797 +2797 @@
 
     /* Send the request. */
-    status = pjsip_dlg_send_request( call->inv->dlg, tdata, 
+    status = pjsip_dlg_send_request( call->inv->dlg, tdata,
                                      pjsua_var.mod.id, im_data);
     if (status != PJ_SUCCESS) {
@@ -2814 +2814 @@
  * Send IM typing indication inside INVITE session.
  */
-PJ_DEF(pj_status_t) pjsua_call_send_typing_ind( pjsua_call_id call_id, 
+PJ_DEF(pj_status_t) pjsua_call_send_typing_ind( pjsua_call_id call_id,
                                                 pj_bool_t is_typing,
                                                 const pjsua_msg_data*msg_data)
@@ -3099 +3099 @@
         pjmedia_transport_info tpinfo;
         pjmedia_ice_transport_info *ice_info;
-        
+
         if (call_med->tp_st == PJSUA_MED_TP_NULL ||
             call_med->tp_st == PJSUA_MED_TP_DISABLED ||
@@ -3106 +3106 @@
             continue;
         }
-        
+
         pjmedia_transport_info_init(&tpinfo);
         pjmedia_transport_get_info(call_med->tp, &tpinfo);
@@ -3122 +3122 @@
             break;
         }
-        
+
         /* Check if ICE needs to send reinvite */
         if (!ice_need_reinv &&
@@ -3137 +3137 @@
         }
     }
-    
+
     if (ice_complete && need_reinv)
         *need_reinv = ice_need_reinv;
-    
+
     return ice_complete;
 }
@@ -3177 +3177 @@
      * remote does not support UPDATE method.
      */
-    if (inv->state == PJSIP_INV_STATE_EARLY && 
+    if (inv->state == PJSIP_INV_STATE_EARLY &&
         pjsip_dlg_remote_has_cap(inv->dlg, PJSIP_H_ALLOW, NULL, &ST_UPDATE)!=
         PJSIP_DIALOG_CAP_SUPPORTED)
@@ -3197 +3197 @@
         return PJ_SUCCESS;
 
-    
+
     /* Okay! So we need to send re-INVITE/UPDATE */
 
@@ -3218 +3218 @@
                   ));
     }
-    
+
     /* Generate SDP re-offer */
     status = pjsua_media_channel_create_sdp(call->index, pool, NULL,
@@ -3235 +3235 @@
     if (need_lock_codec) {
         const pjmedia_sdp_session *ref_sdp;
-        
+
         /* Get local active SDP as reference */
         status = pjmedia_sdp_neg_get_active_local(call->inv->neg, &ref_sdp);
         if (status != PJ_SUCCESS)
             return status;
-        
+
         /* Verify media count. Note that remote may add/remove media line
          * in the answer. When answer has less media, it must have been
@@ -3262 +3262 @@
             pjmedia_sdp_media *m = new_offer->media[i];
             pjsua_call_media *call_med = &call->media[i];
-    
+
             /* Verify if media is deactivated */
             if (call_med->state == PJSUA_CALL_MEDIA_NONE ||
@@ -3270 +3270 @@
                 continue;
             }
-    
+
             /* Reset formats */
             m->desc.fmt_count = 0;
             pjmedia_sdp_attr_remove_all(&m->attr_count, m->attr, "rtpmap");
             pjmedia_sdp_attr_remove_all(&m->attr_count, m->attr, "fmtp");
-            
+
             /* Copy only the first format + any non-AV formats from
              * the active local SDP.
@@ -3284 +3284 @@
                 if (is_non_av_fmt(ref_m, fmt) || (++codec_cnt == 1)) {
                     pjmedia_sdp_attr *a;
-                    
+
                     m->desc.fmt[m->desc.fmt_count++] = *fmt;
                     a = pjmedia_sdp_attr_find2(ref_m->attr_count, ref_m->attr,
@@ -3300 +3300 @@
     {
         const pjmedia_sdp_session *cur_sdp;
-        
+
         /* Get local active SDP */
         status = pjmedia_sdp_neg_get_active_local(call->inv->neg, &cur_sdp);
@@ -3356 +3356 @@
     }
 
-    
+
     if (rem_can_update) {
         status = pjsip_inv_update(inv, NULL, new_offer, &tdata);
@@ -3388 +3388 @@
     if (need_lock_codec)
         ++call->lock_codec.retry_cnt;
-    
+
     return PJ_SUCCESS;
 }
@@ -3397 +3397 @@
  * session state has changed.
  */
-static void pjsua_call_on_state_changed(pjsip_inv_session *inv, 
+static void pjsua_call_on_state_changed(pjsip_inv_session *inv,
                                         pjsip_event *e)
 {
@@ -3418 +3418 @@
             if (call->res_time.sec == 0)
                 pj_gettimeofday(&call->res_time);
-            call->last_code = (pjsip_status_code) 
+            call->last_code = (pjsip_status_code)
                               e->body.tsx_state.tsx->status_code;
-            pj_strncpy(&call->last_text, 
+            pj_strncpy(&call->last_text,
                        &e->body.tsx_state.tsx->status_text,
                        sizeof(call->last_text_buf_));
@@ -3439 +3439 @@
             if (call->res_time.sec == 0)
                 pj_gettimeofday(&call->res_time);
-            if (e->type == PJSIP_EVENT_TSX_STATE && 
-                e->body.tsx_state.tsx->status_code > call->last_code) 
+            if (e->type == PJSIP_EVENT_TSX_STATE &&
+                e->body.tsx_state.tsx->status_code > call->last_code)
             {
-                call->last_code = (pjsip_status_code) 
+                call->last_code = (pjsip_status_code)
                                   e->body.tsx_state.tsx->status_code;
-                pj_strncpy(&call->last_text, 
+                pj_strncpy(&call->last_text,
                            &e->body.tsx_state.tsx->status_text,
                            sizeof(call->last_text_buf_));
@@ -3461 +3461 @@
             break;
         default:
-            call->last_code = (pjsip_status_code) 
+            call->last_code = (pjsip_status_code)
                               e->body.tsx_state.tsx->status_code;
-            pj_strncpy(&call->last_text, 
+            pj_strncpy(&call->last_text,
                        &e->body.tsx_state.tsx->status_text,
                        sizeof(call->last_text_buf_));
@@ -3475 +3475 @@
         int st_code = -1;
         pjsip_evsub_state ev_state = PJSIP_EVSUB_STATE_ACTIVE;
-        
+
 
         switch (call->inv->state) {
@@ -3554 +3554 @@
 
         PJSUA_LOCK();
-        
+
         pjsua_media_channel_deinit(call->index);
 
@@ -3577 +3577 @@
  * has forked.
  */
-static void pjsua_call_on_forked( pjsip_inv_session *inv, 
+static void pjsua_call_on_forked( pjsip_inv_session *inv,
                                   pjsip_event *e)
 {
@@ -3592 +3592 @@
 pjsip_dialog* on_dlg_forked(pjsip_dialog *dlg, pjsip_rx_data *res)
 {
-    if (dlg->uac_has_2xx && 
+    if (dlg->uac_has_2xx &&
         res->msg_info.cseq->method.id == PJSIP_INVITE_METHOD &&
         pjsip_rdata_get_tsx(res) == NULL &&
-        res->msg_info.msg->line.status.code/100 == 2) 
+        res->msg_info.msg->line.status.code/100 == 2)
     {
         pjsip_dialog *forked_dlg;
@@ -3631 +3631 @@
  * Disconnect call upon error.
  */
-static void call_disconnect( pjsip_inv_session *inv, 
+static void call_disconnect( pjsip_inv_session *inv,
                              int code )
 {
-    pjsua_call *call;
     pjsip_tx_data *tdata;
     pj_status_t status;
-
-    call = (pjsua_call*) inv->dlg->mod_data[pjsua_var.mod.id];
 
     status = pjsip_inv_end_session(inv, code, NULL, &tdata);
@@ -3644 +3641 @@
         return;
 
+#if DISABLED_FOR_TICKET_1185
+    pjsua_call *call;
+
     /* Add SDP in 488 status */
-#if DISABLED_FOR_TICKET_1185
+    call = (pjsua_call*) inv->dlg->mod_data[pjsua_var.mod.id];
+
     if (call && call->tp && tdata->msg->type==PJSIP_RESPONSE_MSG &&
-        code==PJSIP_SC_NOT_ACCEPTABLE_HERE) 
+        code==PJSIP_SC_NOT_ACCEPTABLE_HERE)
     {
         pjmedia_sdp_session *local_sdp;
@@ -3654 +3655 @@
         pjmedia_transport_info_init(&ti);
         pjmedia_transport_get_info(call->med_tp, &ti);
-        status = pjmedia_endpt_create_sdp(pjsua_var.med_endpt, tdata->pool, 
+        status = pjmedia_endpt_create_sdp(pjsua_var.med_endpt, tdata->pool,
                                           1, &ti.sock_info, &local_sdp);
         if (status == PJ_SUCCESS) {
@@ -3699 +3700 @@
 
         /* Disconnect call if we're not in the middle of initializing an
-         * UAS dialog and if this is not a re-INVITE 
+         * UAS dialog and if this is not a re-INVITE
          */
         if (inv->state != PJSIP_INV_STATE_NULL &&
-            inv->state != PJSIP_INV_STATE_CONFIRMED) 
+            inv->state != PJSIP_INV_STATE_CONFIRMED)
         {
             call_disconnect(inv, PJSIP_SC_UNSUPPORTED_MEDIA_TYPE);
@@ -3714 +3715 @@
     status = pjmedia_sdp_neg_get_active_local(call->inv->neg, &local_sdp);
     if (status != PJ_SUCCESS) {
-        pjsua_perror(THIS_FILE, 
-                     "Unable to retrieve currently active local SDP", 
+        pjsua_perror(THIS_FILE,
+                     "Unable to retrieve currently active local SDP",
                      status);
         //call_disconnect(inv, PJSIP_SC_UNSUPPORTED_MEDIA_TYPE);
@@ -3723 +3724 @@
     status = pjmedia_sdp_neg_get_active_remote(call->inv->neg, &remote_sdp);
     if (status != PJ_SUCCESS) {
-        pjsua_perror(THIS_FILE, 
-                     "Unable to retrieve currently active remote SDP", 
+        pjsua_perror(THIS_FILE,
+                     "Unable to retrieve currently active remote SDP",
                      status);
         //call_disconnect(inv, PJSIP_SC_UNSUPPORTED_MEDIA_TYPE);
@@ -3738 +3739 @@
     status = pjsua_media_channel_update(call->index, local_sdp, remote_sdp);
     if (status != PJ_SUCCESS) {
-        pjsua_perror(THIS_FILE, "Unable to create media session", 
+        pjsua_perror(THIS_FILE, "Unable to create media session",
                      status);
         call_disconnect(inv, PJSIP_SC_NOT_ACCEPTABLE_HERE);
@@ -3768 +3769 @@
     unsigned mi;
 
-    /* Call-hold is done by set the media direction to 'sendonly' 
-     * (PJMEDIA_DIR_ENCODING), except when current media direction is 
+    /* Call-hold is done by set the media direction to 'sendonly'
+     * (PJMEDIA_DIR_ENCODING), except when current media direction is
      * 'inactive' (PJMEDIA_DIR_NONE).
      * (See RFC 3264 Section 8.4 and RFC 4317 Section 3.1)
      */
-    /* http://trac.pjsip.org/repos/ticket/880 
+    /* http://trac.pjsip.org/repos/ticket/880
        if (call->dir != PJMEDIA_DIR_ENCODING) {
      */
@@ -3883 +3884 @@
         pjsip_status_code code = PJSIP_SC_OK;
         pjsua_call_setting opt = call->opt;
-        
+
         (*pjsua_var.ua_cfg.cb.on_call_rx_offer)(call->index, offer, NULL,
                                                 &code, &opt);
@@ -3895 +3896 @@
         call->opt = opt;
     }
-    
+
     /* Re-init media for the new remote offer before creating SDP */
     status = apply_call_setting(call, &call->opt, offer);
@@ -3901 +3902 @@
         goto on_return;
 
-    status = pjsua_media_channel_create_sdp(call->index, 
-                                            call->inv->pool_prov, 
+    status = pjsua_media_channel_create_sdp(call->index,
+                                            call->inv->pool_prov,
                                             offer, &answer, NULL);
     if (status != PJ_SUCCESS) {
@@ -3972 +3973 @@
     /* See if we've put call on hold. */
     if (call->local_hold) {
-        PJ_LOG(4,(THIS_FILE, 
+        PJ_LOG(4,(THIS_FILE,
                   "Call %d: call is on-hold locally, creating call-hold SDP ",
                   call->index));
@@ -3980 +3981 @@
                   call->index));
 
-        status = pjsua_media_channel_create_sdp(call->index, 
-                                                call->inv->pool_prov, 
+        status = pjsua_media_channel_create_sdp(call->index,
+                                                call->inv->pool_prov,
                                                 NULL, offer, NULL);
     }
@@ -4001 +4002 @@
 static void xfer_client_on_evsub_state( pjsip_evsub *sub, pjsip_event *event)
 {
-    
+
     PJ_UNUSED_ARG(event);
 
@@ -4007 +4008 @@
 
     /*
-     * When subscription is accepted (got 200/OK to REFER), check if 
+     * When subscription is accepted (got 200/OK to REFER), check if
      * subscription suppressed.
      */
@@ -4020 +4021 @@
 
         /* Must be receipt of response message */
-        pj_assert(event->type == PJSIP_EVENT_TSX_STATE && 
+        pj_assert(event->type == PJSIP_EVENT_TSX_STATE &&
                   event->body.tsx_state.type == PJSIP_EVENT_RX_MSG);
         rdata = event->body.tsx_state.src.rdata;
@@ -4026 +4027 @@
         /* Find Refer-Sub header */
         refer_sub = (pjsip_generic_string_hdr*)
-                    pjsip_msg_find_hdr_by_name(rdata->msg_info.msg, 
+                    pjsip_msg_find_hdr_by_name(rdata->msg_info.msg,
                                                &REFER_SUB, NULL);
 
@@ -4037 +4038 @@
                 const pj_str_t ACCEPTED = { "Accepted", 8 };
                 pj_bool_t cont = PJ_FALSE;
-                (*pjsua_var.ua_cfg.cb.on_call_transfer_status)(call->index, 
+                (*pjsua_var.ua_cfg.cb.on_call_transfer_status)(call->index,
                                                                200,
                                                                &ACCEPTED,
@@ -4052 +4053 @@
 
         } else {
-            /* Notify application about call transfer progress. 
+            /* Notify application about call transfer progress.
              * Initially notify with 100/Accepted status.
              */
@@ -4058 +4059 @@
                 const pj_str_t ACCEPTED = { "Accepted", 8 };
                 pj_bool_t cont = PJ_FALSE;
-                (*pjsua_var.ua_cfg.cb.on_call_transfer_status)(call->index, 
+                (*pjsua_var.ua_cfg.cb.on_call_transfer_status)(call->index,
                                                                100,
                                                                &ACCEPTED,
@@ -4070 +4071 @@
      */
     else if (pjsip_evsub_get_state(sub) == PJSIP_EVSUB_STATE_ACTIVE ||
-             pjsip_evsub_get_state(sub) == PJSIP_EVSUB_STATE_TERMINATED) 
+             pjsip_evsub_get_state(sub) == PJSIP_EVSUB_STATE_TERMINATED)
     {
         pjsua_call *call;
@@ -4082 +4083 @@
         call = (pjsua_call*) pjsip_evsub_get_mod_data(sub, pjsua_var.mod.id);
 
-        /* When subscription is terminated, clear the xfer_sub member of 
+        /* When subscription is terminated, clear the xfer_sub member of
          * the inv_data.
          */
@@ -4108 +4109 @@
             body = msg->body;
             if (!body) {
-                PJ_LOG(2,(THIS_FILE, 
+                PJ_LOG(2,(THIS_FILE,
                           "Warning: received NOTIFY without message body"));
                 goto on_return;
@@ -4117 +4118 @@
                 pj_stricmp2(&body->content_type.subtype, "sipfrag") != 0)
             {
-                PJ_LOG(2,(THIS_FILE, 
+                PJ_LOG(2,(THIS_FILE,
                           "Warning: received NOTIFY with non message/sipfrag "
                           "content"));
@@ -4124 +4125 @@
 
             /* Try to parse the content */
-            status = pjsip_parse_status_line((char*)body->data, body->len, 
+            status = pjsip_parse_status_line((char*)body->data, body->len,
                                              &status_line);
             if (status != PJ_SUCCESS) {
-                PJ_LOG(2,(THIS_FILE, 
+                PJ_LOG(2,(THIS_FILE,
                           "Warning: received NOTIFY with invalid "
                           "message/sipfrag content"));
@@ -4141 +4142 @@
         is_last = (pjsip_evsub_get_state(sub)==PJSIP_EVSUB_STATE_TERMINATED);
         cont = !is_last;
-        (*pjsua_var.ua_cfg.cb.on_call_transfer_status)(call->index, 
+        (*pjsua_var.ua_cfg.cb.on_call_transfer_status)(call->index,
                                                        status_line.code,
                                                        &status_line.reason,
@@ -4156 +4157 @@
             pjsip_tx_data *tdata;
 
-            status = pjsip_evsub_initiate(sub, &pjsip_subscribe_method, 
+            status = pjsip_evsub_initiate(sub, &pjsip_subscribe_method,
                                           0, &tdata);
             if (status == PJ_SUCCESS)
@@ -4179 +4180 @@
 
     /*
-     * When subscription is terminated, clear the xfer_sub member of 
+     * When subscription is terminated, clear the xfer_sub member of
      * the inv_data.
      */
@@ -4254 +4255 @@
      */
     ref_by_hdr = (pjsip_hdr*)
-                 pjsip_msg_find_hdr_by_name(rdata->msg_info.msg, &str_ref_by, 
+                 pjsip_msg_find_hdr_by_name(rdata->msg_info.msg, &str_ref_by,
                                             NULL);
 
@@ -4261 +4262 @@
     if (pjsua_var.ua_cfg.cb.on_call_transfer_request) {
         (*pjsua_var.ua_cfg.cb.on_call_transfer_request)(existing_call->index,
-                                                        &refer_to->hvalue, 
+                                                        &refer_to->hvalue,
                                                         &code);
     }
@@ -4268 +4269 @@
     if (pjsua_var.ua_cfg.cb.on_call_transfer_request2) {
         (*pjsua_var.ua_cfg.cb.on_call_transfer_request2)(existing_call->index,
-                                                         &refer_to->hvalue, 
+                                                         &refer_to->hvalue,
                                                          &code,
                                                          &call_opt);
@@ -4284 +4285 @@
               (int)inv->dlg->remote.info_str.slen,
               inv->dlg->remote.info_str.ptr,
-              (int)refer_to->hvalue.slen, 
+              (int)refer_to->hvalue.slen,
               refer_to->hvalue.ptr));
 
@@ -4295 +4296 @@
         pjsip_hdr *hdr;
 
-        status = pjsip_dlg_create_response(inv->dlg, rdata, code, NULL, 
+        status = pjsip_dlg_create_response(inv->dlg, rdata, code, NULL,
                                            &tdata);
         if (status != PJ_SUCCESS) {
@@ -4304 +4305 @@
 
         /* Add Refer-Sub header */
-        hdr = (pjsip_hdr*) 
+        hdr = (pjsip_hdr*)
                pjsip_generic_string_hdr_create(tdata->pool, &str_refer_sub,
                                               &str_false);
@@ -4348 +4349 @@
             pjsip_hdr *hdr;
 
-            hdr = (pjsip_hdr*) 
-                   pjsip_generic_string_hdr_create(inv->dlg->pool, 
+            hdr = (pjsip_hdr*)
+                   pjsip_generic_string_hdr_create(inv->dlg->pool,
                                                    &str_refer_sub,
                                                    &str_true);
@@ -4363 +4364 @@
                                     100, NULL, &tdata);
         if (status != PJ_SUCCESS) {
-            pjsua_perror(THIS_FILE, "Unable to create NOTIFY to REFER", 
+            pjsua_perror(THIS_FILE, "Unable to create NOTIFY to REFER",
                          status);
             goto on_return;
@@ -4379 +4380 @@
      * We need to get a null terminated string from a pj_str_t.
      * So grab the pointer from the hvalue and NULL terminate it, knowing
-     * that the NULL position will be occupied by a newline. 
+     * that the NULL position will be occupied by a newline.
      */
     uri = refer_to->hvalue.ptr;
@@ -4399 +4400 @@
     tmp = pj_str(uri);
     status = pjsua_call_make_call(existing_call->acc_id, &tmp, &call_opt,
-                                  existing_call->user_data, &msg_data, 
+                                  existing_call->user_data, &msg_data,
                                   &new_call);
     if (status != PJ_SUCCESS) {
@@ -4408 +4409 @@
                                        500, NULL, &tdata);
             if (status != PJ_SUCCESS) {
-                pjsua_perror(THIS_FILE, "Unable to create NOTIFY to REFER", 
+                pjsua_perror(THIS_FILE, "Unable to create NOTIFY to REFER",
                               status);
                 goto on_return;
@@ -4414 +4415 @@
             status = pjsip_xfer_send_request(sub, tdata);
             if (status != PJ_SUCCESS) {
-                pjsua_perror(THIS_FILE, "Unable to send NOTIFY to REFER", 
+                pjsua_perror(THIS_FILE, "Unable to send NOTIFY to REFER",
                               status);
                 goto on_return;
@@ -4430 +4431 @@
 
         /* Put the invite_data in the subscription. */
-        pjsip_evsub_set_mod_data(sub, pjsua_var.mod.id, 
+        pjsip_evsub_set_mod_data(sub, pjsua_var.mod.id,
                                  &pjsua_var.calls[new_call]);
     }
@@ -4512 +4513 @@
             pj_list_push_back(&hdr_list, accept_hdr);
 
-            pjsip_dlg_respond( inv->dlg, rdata, PJSIP_SC_NOT_ACCEPTABLE_HERE, 
+            pjsip_dlg_respond( inv->dlg, rdata, PJSIP_SC_NOT_ACCEPTABLE_HERE,
                                NULL, &hdr_list, NULL );
             goto on_return;
@@ -4518 +4519 @@
 
         /* Respond with 200 first, so that remote doesn't retransmit in case
-         * the UI takes too long to process the message. 
+         * the UI takes too long to process the message.
          */
         pjsip_dlg_respond( inv->dlg, rdata, 200, NULL, NULL, NULL);
@@ -4626 +4627 @@
 
     if (pjsua_var.ua_cfg.cb.on_call_redirected) {
-        op = (*pjsua_var.ua_cfg.cb.on_call_redirected)(call->index, 
+        op = (*pjsua_var.ua_cfg.cb.on_call_redirected)(call->index,
                                                          target, e);
     } else {