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

Timestamp:

Mar 6, 2013 6:58:40 AM (12 years ago)

Author:

ming

Message:

Fixed #1632: Remove Contact header in MESSAGE requests

File:

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

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

@@ -513 +513 @@
     pjsip_tx_data *tdata;
     const pj_str_t mime_text_plain = pj_str("text/plain");
-    const pj_str_t STR_CONTACT = { "Contact", 7 };
     pjsip_media_type media_type;
     pjsua_im_data *im_data;
     pjsua_acc *acc;
-    pj_str_t contact;
     pj_status_t status;
 
@@ -552 +550 @@
      * set in the account.
      */
+    /* Ticket #1632: According to RFC 3428:
+     * MESSAGE requests do not initiate dialogs.
+     * User Agents MUST NOT insert Contact header fields into MESSAGE requests
+     */
+    /*
     if (acc->contact.slen) {
         contact = acc->contact;
@@ -566 +569 @@
         pjsip_generic_string_hdr_create(tdata->pool, 
                                         &STR_CONTACT, &contact));
+    */
 
     /* Create IM data to keep message details and give it back to
@@ -628 +632 @@
                                      const pjsua_msg_data *msg_data)
 {
-    const pj_str_t STR_CONTACT = { "Contact", 7 };
     pjsua_im_data *im_data;
     pjsip_tx_data *tdata;
     pjsua_acc *acc;
-    pj_str_t contact;
     pj_status_t status;
 
@@ -665 +667 @@
      * set in the account.
      */
+    /* Ticket #1632: According to RFC 3428:
+     * MESSAGE requests do not initiate dialogs.
+     * User Agents MUST NOT insert Contact header fields into MESSAGE requests
+     */
+    /*
     if (acc->contact.slen) {
         contact = acc->contact;
@@ -679 +686 @@
         pjsip_generic_string_hdr_create(tdata->pool, 
                                         &STR_CONTACT, &contact));
-
+    */
 
     /* Create "application/im-iscomposing+xml" msg body. */