Add option to specify contact URI when making call (PJSUA and PJSUA2) (#4647)

Author: Copilot

pjsip/include/pjsua-lib/pjsua.h

@@ -2665,6 +2665,13 @@ struct pjsua_msg_data
      */
     pj_str_t    local_uri;
 
+    /**
+     * Optional contact URI to be used for this call. If NULL, the contact
+     * will be generated automatically based on the account configuration.
+     * This field is currently used only by pjsua_call_make_call().
+     */
+    pj_str_t    contact_uri;
+
     /**
      * Additional message headers as linked list. Application can add
      * headers to the list by creating the header, either from the heap/pool

pjsip/include/pjsua2/siptypes.hpp

@@ -996,6 +996,14 @@ struct SipTxOption
      */
     string                  localUri;
 
+    /**
+     * Optional contact URI to be used for this call. If empty (""), the
+     * contact will be generated automatically based on the account
+     * configuration. At the moment this field is only used when sending
+     * initial INVITE requests.
+     */
+    string                  contactUri;
+
     /**
      * Additional message headers to be included in the outgoing message.
      *

pjsip/src/pjsua-lib/pjsua_call.c

@@ -947,6 +947,30 @@ PJ_DEF(pj_status_t) pjsua_call_make_call(pjsua_acc_id acc_id,
             status = PJSIP_EINVALIDREQURI;
             goto on_error;
         }
+
+        /* Verify contact URI if provided */
+        if (msg_data && msg_data->contact_uri.slen) {
+            pj_strdup_with_null(tmp_pool, &dup, &msg_data->contact_uri);
+            uri = pjsip_parse_uri(tmp_pool, dup.ptr, dup.slen, 0);
+            if (uri == NULL) {
+                pjsua_perror(THIS_FILE, "Invalid contact URI",
+                             PJSIP_EINVALIDREQURI);
+                status = PJSIP_EINVALIDREQURI;
+                goto on_error;
+            }
+        }
+
+        /* Verify local URI if provided */
+        if (msg_data && msg_data->local_uri.slen) {
+            pj_strdup_with_null(tmp_pool, &dup, &msg_data->local_uri);
+            uri = pjsip_parse_uri(tmp_pool, dup.ptr, dup.slen, 0);
+            if (uri == NULL) {
+                pjsua_perror(THIS_FILE, "Invalid local URI",
+                             PJSIP_EINVALIDREQURI);
+                status = PJSIP_EINVALIDREQURI;
+                goto on_error;
+            }
+        }
     }
 
     /* Mark call start time. */
@@ -956,9 +980,11 @@ PJ_DEF(pj_status_t) pjsua_call_make_call(pjsua_acc_id acc_id,
     call->res_time.sec = 0;
 
     /* Create suitable Contact header unless a Contact header has been
-     * set in the account.
+     * set in the account or message data.
      */
-    if (acc->contact.slen) {
+    if (msg_data && msg_data->contact_uri.slen) {
+        contact = msg_data->contact_uri;
+    } else if (acc->contact.slen) {
         contact = acc->contact;
     } else {
         status = pjsua_acc_create_uac_contact(tmp_pool, &contact,

pjsip/src/pjsua-lib/pjsua_core.c

@@ -178,6 +178,7 @@ PJ_DEF(pjsua_msg_data*) pjsua_msg_data_clone(pj_pool_t *pool,
 
     pj_strdup(pool, &msg_data->target_uri, &rhs->target_uri);
     pj_strdup(pool, &msg_data->local_uri, &rhs->local_uri);
+    pj_strdup(pool, &msg_data->contact_uri, &rhs->contact_uri);
 
     pj_list_init(&msg_data->hdr_list);
     hdr = rhs->hdr_list.next;

pjsip/src/pjsua2/siptypes.cpp

@@ -742,8 +742,9 @@ TsxStateEvent::TsxStateEvent()
 
 bool SipTxOption::isEmpty() const
 {
-    return (targetUri == "" && localUri == "" &&  headers.size() == 0 &&
-            contentType == "" && msgBody == "" && multipartContentType.type == "" &&
+    return (targetUri == "" && localUri == "" && contactUri == "" &&
+            headers.size() == 0 && contentType == "" && msgBody == "" &&
+            multipartContentType.type == "" &&
             multipartContentType.subType == "" && multipartParts.size() == 0);
 }
 
@@ -753,6 +754,8 @@ void SipTxOption::fromPj(const pjsua_msg_data &prm) PJSUA2_THROW(Error)
 
     localUri = pj2Str(prm.local_uri);
 
+    contactUri = pj2Str(prm.contact_uri);
+
     headers.clear();
     pjsip_hdr* pj_hdr = prm.hdr_list.next;
     while (pj_hdr != &prm.hdr_list) {
@@ -786,6 +789,8 @@ void SipTxOption::toPj(pjsua_msg_data &msg_data) const
 
     msg_data.local_uri = str2Pj(localUri);
 
+    msg_data.contact_uri = str2Pj(contactUri);
+
     pj_list_init(&msg_data.hdr_list);
     for (i = 0; i < headers.size(); i++) {
         pjsip_generic_string_hdr& pj_hdr = headers[i].toPj();