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

Timestamp:

Mar 16, 2011 3:52:20 AM (14 years ago)

Author:

bennylp

Message:

Fixed #1209: new enhancement: Option to update Contact URI when sending re-INVITE or UPDATE

File:

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

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

@@ -1661 +1661 @@
  */
 PJ_DEF(pj_status_t) pjsua_call_reinvite( pjsua_call_id call_id,
-                                         pj_bool_t unhold,
+                                         unsigned options,
                                          const pjsua_msg_data *msg_data)
 {
     pjmedia_sdp_session *sdp;
+    pj_str_t *new_contact = NULL;
     pjsip_tx_data *tdata;
     pjsua_call *call;
@@ -1685 +1686 @@
 
     /* Create SDP */
-    if (call->local_hold && !unhold) {
+    if (call->local_hold && (options & PJSUA_CALL_UNHOLD)==0) {
         status = create_sdp_of_call_hold(call, &sdp);
     } else {
@@ -1700 +1701 @@
     }
 
+    if ((options & 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, NULL, sdp, &tdata);
+    status = pjsip_inv_reinvite( call->inv, new_contact, sdp, &tdata);
     if (status != PJ_SUCCESS) {
         pjsua_perror(THIS_FILE, "Unable to create re-INVITE", status);
@@ -1733 +1740 @@
 {
     pjmedia_sdp_session *sdp;
+    pj_str_t *new_contact = NULL;
     pjsip_tx_data *tdata;
     pjsua_call *call;
@@ -1758 +1766 @@
     }
 
+    if ((options & 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, NULL, sdp, &tdata);
+    status = pjsip_inv_update(call->inv, new_contact, sdp, &tdata);
     if (status != PJ_SUCCESS) {
         pjsua_perror(THIS_FILE, "Unable to create UPDATE request", status);