diff options
| author | Liong Sauw Ming <ming@teluu.com> | 2013-03-06 06:58:40 +0000 |
|---|---|---|
| committer | Liong Sauw Ming <ming@teluu.com> | 2013-03-06 06:58:40 +0000 |
| commit | 1e75f3eca6d763ddd05b94f89590bb3c275919c0 (patch) | |
| tree | b74dc396300481ad5bdffd19467b5ac182598151 /pjsip/src/pjsua-lib | |
| parent | b8d87f66c7dba75491d7edb4432270472229015a (diff) | |
Fixed #1632: Remove Contact header in MESSAGE requests
git-svn-id: http://svn.pjsip.org/repos/pjproject/trunk@4424 74dad513-b988-da41-8d7b-12977e46ad98
Diffstat (limited to 'pjsip/src/pjsua-lib')
| -rw-r--r-- | pjsip/src/pjsua-lib/pjsua_im.c | 17 |
1 files changed, 12 insertions, 5 deletions
diff --git a/pjsip/src/pjsua-lib/pjsua_im.c b/pjsip/src/pjsua-lib/pjsua_im.c index 7c6886a4..fa2e8142 100644 --- a/pjsip/src/pjsua-lib/pjsua_im.c +++ b/pjsip/src/pjsua-lib/pjsua_im.c @@ -512,11 +512,9 @@ PJ_DEF(pj_status_t) pjsua_im_send( pjsua_acc_id acc_id, { 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; /* To and message body must be specified. */ @@ -551,6 +549,11 @@ PJ_DEF(pj_status_t) pjsua_im_send( pjsua_acc_id acc_id, /* Create suitable Contact header unless a Contact header has been * 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; } else { @@ -565,6 +568,7 @@ PJ_DEF(pj_status_t) pjsua_im_send( pjsua_acc_id acc_id, pjsip_msg_add_hdr( tdata->msg, (pjsip_hdr*) pjsip_generic_string_hdr_create(tdata->pool, &STR_CONTACT, &contact)); + */ /* Create IM data to keep message details and give it back to * application on the callback @@ -627,11 +631,9 @@ PJ_DEF(pj_status_t) pjsua_im_typing( pjsua_acc_id acc_id, pj_bool_t is_typing, 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; acc = &pjsua_var.acc[acc_id]; @@ -664,6 +666,11 @@ PJ_DEF(pj_status_t) pjsua_im_typing( pjsua_acc_id acc_id, /* Create suitable Contact header unless a Contact header has been * 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; } else { @@ -678,7 +685,7 @@ PJ_DEF(pj_status_t) pjsua_im_typing( pjsua_acc_id acc_id, pjsip_msg_add_hdr( tdata->msg, (pjsip_hdr*) pjsip_generic_string_hdr_create(tdata->pool, &STR_CONTACT, &contact)); - + */ /* Create "application/im-iscomposing+xml" msg body. */ tdata->msg->body = pjsip_iscomposing_create_body( tdata->pool, is_typing, |