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

Timestamp:

Jun 6, 2006 6:40:40 PM (18 years ago)

Author:

bennylp

Message:

Another huge chunks of modifications in PJSUA API, too many things to mention!

File:

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

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

@@ -186 +186 @@
     pj_str_t from, to;
     pjsip_accept_hdr *accept_hdr;
+    pjsip_contact_hdr *contact_hdr;
     pjsip_msg *msg;
     pj_status_t status;
@@ -222 +223 @@
                                   NULL, NULL, NULL);
 
-    /* Build the From text. */
+    /* For the source URI, we use Contact header if present, since
+     * Contact header contains the port number information. If this is
+     * not available, then use From header.
+     */
     from.ptr = pj_pool_alloc(rdata->tp_info.pool, PJSIP_MAX_URL_SIZE);
-    from.slen = pjsip_uri_print(PJSIP_URI_IN_FROMTO_HDR, 
-                                rdata->msg_info.from->uri,
-                                from.ptr, PJSIP_MAX_URL_SIZE);
+    contact_hdr = pjsip_msg_find_hdr(rdata->msg_info.msg,
+                                     PJSIP_H_CONTACT, NULL);
+    if (contact_hdr) {
+        from.slen = pjsip_uri_print(PJSIP_URI_IN_CONTACT_HDR,
+                                    contact_hdr->uri, 
+                                    from.ptr, PJSIP_MAX_URL_SIZE);
+    } else {
+        from.slen = pjsip_uri_print(PJSIP_URI_IN_FROMTO_HDR, 
+                                    rdata->msg_info.from->uri,
+                                    from.ptr, PJSIP_MAX_URL_SIZE);
+    }
+
     if (from.slen < 1)
         from = pj_str("<--URI is too long-->");
@@ -337 +350 @@
                                     pj_bool_t is_typing)
 {
+    const pj_str_t STR_CONTACT = { "Contact", 7 };
     pjsip_tx_data *tdata;
     pj_status_t status;
@@ -351 +365 @@
 
 
+    /* Add accept header. */
+    pjsip_msg_add_hdr( tdata->msg, 
+                       (pjsip_hdr*)pjsua_im_create_accept(tdata->pool));
+
+
+    /* Add contact. */
+    pjsip_msg_add_hdr( tdata->msg, (pjsip_hdr*)
+        pjsip_generic_string_hdr_create(tdata->pool, 
+                                        &STR_CONTACT,
+                                        &pjsua.config.acc_config[acc_index].contact));
+
+
     /* Create "application/im-iscomposing+xml" msg body. */
     tdata->msg->body = pjsip_iscomposing_create_body( tdata->pool, is_typing,