Changeset 4555 for pjproject

Timestamp:

Jul 10, 2013 4:27:05 AM (11 years ago)

Author:

ming

Message:

Closed #1688: Add support for different To and Target URI in outgoing call and sending IM

Location:

pjproject/trunk/pjsip

Files:

• include/pjsua-lib/pjsua.h (modified) (1 diff)
• src/pjsua-lib/pjsua_call.c (modified) (1 diff)
• src/pjsua-lib/pjsua_core.c (modified) (1 diff)
• src/pjsua-lib/pjsua_im.c (modified) (1 diff)

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

@@ -1686 +1686 @@
 {
     /**
+     * Optional remote target URI (i.e. Target header). If NULL, the target
+     * will be set to the remote URI (To header). At the moment this field
+     * is only used by #pjsua_call_make_call() and #pjsua_im_send().
+     */
+    pj_str_t    target_uri;
+
+    /**
      * Additional message headers as linked list. Application can add
      * headers to the list by creating the header, either from the heap/pool

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

@@ -723 +723 @@
     status = pjsip_dlg_create_uac( pjsip_ua_instance(), 
                                    &acc->cfg.id, &contact,
-                                   dest_uri, dest_uri, &dlg);
+                                   dest_uri,
+                                   (msg_data->target_uri.slen? 
+                                    &msg_data->target_uri: dest_uri),
+                                   &dlg);
     if (status != PJ_SUCCESS) {
         pjsua_perror(THIS_FILE, "Dialog creation failed", status);

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

@@ -162 +162 @@
     msg_data = PJ_POOL_ZALLOC_T(pool, pjsua_msg_data);
     PJ_ASSERT_RETURN(msg_data != NULL, NULL);
+
+    pj_strdup(pool, &msg_data->target_uri, &rhs->target_uri);
 
     pj_list_init(&msg_data->hdr_list);

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

@@ -525 +525 @@
     /* Create request. */
     status = pjsip_endpt_create_request(pjsua_var.endpt, 
-                                        &pjsip_message_method, to, 
+                                        &pjsip_message_method,
+                                        (msg_data->target_uri.slen? 
+                                         &msg_data->target_uri: to),
                                         &acc->cfg.id,
                                         to, NULL, NULL, -1, NULL, &tdata);