Changeset 2855 for pjproject/trunk/pjsip/src/pjsua-lib/pjsua_im.c

Timestamp:

Aug 5, 2009 6:41:23 PM (15 years ago)

Author:

nanang

Message:

Ticket #930:

• Updated semantic of contact param in functions pjsip_dlg_create_uac(), pjsip_dlg_create_uas(), pjsip_endpt_create_request() and also variable pjsua_acc.contact to be Contact header value (was Contact URI).
• Updated docs related to above modifications.
• Fixed pjsua_im_send() in generating contact header, it should use pjsua_acc.contact instead, if it is set.

File:

• pjproject/trunk/pjsip/src/pjsua-lib/pjsua_im.c (modified) (9 diffs)

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

@@ -510 +510 @@
     pjsip_media_type media_type;
     pjsua_im_data *im_data;
+    pjsua_acc *acc;
     pj_str_t contact;
     pj_status_t status;
@@ -515 +516 @@
     /* To and message body must be specified. */
     PJ_ASSERT_RETURN(to && content, PJ_EINVAL);
+
+    acc = &pjsua_var.acc[acc_id];
 
     /* Create request. */
     status = pjsip_endpt_create_request(pjsua_var.endpt, 
                                         &pjsip_message_method, to, 
-                                        &pjsua_var.acc[acc_id].cfg.id,
+                                        &acc->cfg.id,
                                         to, NULL, NULL, -1, NULL, &tdata);
     if (status != PJ_SUCCESS) {
@@ -529 +532 @@
      * the request.
      */
-    if (pjsua_var.acc[acc_id].cfg.transport_id != PJSUA_INVALID_ID) {
+    if (acc->cfg.transport_id != PJSUA_INVALID_ID) {
         pjsip_tpselector tp_sel;
 
-        pjsua_init_tpselector(pjsua_var.acc[acc_id].cfg.transport_id, &tp_sel);
+        pjsua_init_tpselector(acc->cfg.transport_id, &tp_sel);
         pjsip_tx_data_set_transport(tdata, &tp_sel);
     }
@@ -540 +543 @@
                        (pjsip_hdr*)pjsua_im_create_accept(tdata->pool));
 
-    /* Add contact. */
-    status = pjsua_acc_create_uac_contact(tdata->pool, &contact, acc_id, to);
-    if (status != PJ_SUCCESS) {
-        pjsua_perror(THIS_FILE, "Unable to generate Contact header", status);
-        pjsip_tx_data_dec_ref(tdata);
-        return status;
+    /* Create suitable Contact header unless a Contact header has been
+     * set in the account.
+     */
+    if (acc->contact.slen) {
+        contact = acc->contact;
+    } else {
+        status = pjsua_acc_create_uac_contact(tdata->pool, &contact, acc_id, to);
+        if (status != PJ_SUCCESS) {
+            pjsua_perror(THIS_FILE, "Unable to generate Contact header", status);
+            pjsip_tx_data_dec_ref(tdata);
+            return status;
+        }
     }
 
@@ -585 +594 @@
 
     /* Add route set */
-    pjsua_set_msg_route_set(tdata, &pjsua_var.acc[acc_id].route_set);
+    pjsua_set_msg_route_set(tdata, &acc->route_set);
 
     /* Send request (statefully) */
@@ -610 +619 @@
     pjsua_im_data *im_data;
     pjsip_tx_data *tdata;
+    pjsua_acc *acc;
     pj_str_t contact;
     pj_status_t status;
 
+    acc = &pjsua_var.acc[acc_id];
+
     /* Create request. */
     status = pjsip_endpt_create_request( pjsua_var.endpt, &pjsip_message_method,
-                                         to, &pjsua_var.acc[acc_id].cfg.id,
+                                         to, &acc->cfg.id,
                                          to, NULL, NULL, -1, NULL, &tdata);
     if (status != PJ_SUCCESS) {
@@ -626 +638 @@
      * the request.
      */
-    if (pjsua_var.acc[acc_id].cfg.transport_id != PJSUA_INVALID_ID) {
+    if (acc->cfg.transport_id != PJSUA_INVALID_ID) {
         pjsip_tpselector tp_sel;
 
-        pjsua_init_tpselector(pjsua_var.acc[acc_id].cfg.transport_id, &tp_sel);
+        pjsua_init_tpselector(acc->cfg.transport_id, &tp_sel);
         pjsip_tx_data_set_transport(tdata, &tp_sel);
     }
@@ -638 +650 @@
 
 
-    /* Add contact. */
-    status = pjsua_acc_create_uac_contact(tdata->pool, &contact, acc_id, to);
-    if (status != PJ_SUCCESS) {
-        pjsua_perror(THIS_FILE, "Unable to generate Contact header", status);
-        pjsip_tx_data_dec_ref(tdata);
-        return status;
+    /* Create suitable Contact header unless a Contact header has been
+     * set in the account.
+     */
+    if (acc->contact.slen) {
+        contact = acc->contact;
+    } else {
+        status = pjsua_acc_create_uac_contact(tdata->pool, &contact, acc_id, to);
+        if (status != PJ_SUCCESS) {
+            pjsua_perror(THIS_FILE, "Unable to generate Contact header", status);
+            pjsip_tx_data_dec_ref(tdata);
+            return status;
+        }
     }
 
@@ -659 +677 @@
 
     /* Add route set */
-    pjsua_set_msg_route_set(tdata, &pjsua_var.acc[acc_id].route_set);
+    pjsua_set_msg_route_set(tdata, &acc->route_set);
 
     /* Create data to reauthenticate */