diff options
| author | Nanang Izzuddin <nanang@teluu.com> | 2009-08-05 18:41:23 +0000 |
|---|---|---|
| committer | Nanang Izzuddin <nanang@teluu.com> | 2009-08-05 18:41:23 +0000 |
| commit | d0c5ad00ee36fb9c0922734dbba059d69b9830dd (patch) | |
| tree | 3eeffefcce4cb75a4f1a825b424434a8d62d9d00 /pjsip/src/pjsua-lib/pjsua_acc.c | |
| parent | a3dcee2a2b4e375e5f9efdac20896923f244d932 (diff) | |
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.
git-svn-id: http://svn.pjsip.org/repos/pjproject/trunk@2855 74dad513-b988-da41-8d7b-12977e46ad98
Diffstat (limited to 'pjsip/src/pjsua-lib/pjsua_acc.c')
| -rw-r--r-- | pjsip/src/pjsua-lib/pjsua_acc.c | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/pjsip/src/pjsua-lib/pjsua_acc.c b/pjsip/src/pjsua-lib/pjsua_acc.c index 05cedf49..4bfe98c1 100644 --- a/pjsip/src/pjsua-lib/pjsua_acc.c +++ b/pjsip/src/pjsua-lib/pjsua_acc.c @@ -573,6 +573,8 @@ static pj_bool_t acc_check_nat_addr(pjsua_acc *acc, pj_status_t status; pj_bool_t matched; pj_str_t srv_ip; + pjsip_contact_hdr *contact_hdr; + const pj_str_t STR_CONTACT = { "Contact", 7 }; tp = param->rdata->tp_info.transport; @@ -619,8 +621,11 @@ static pj_bool_t acc_check_nat_addr(pjsua_acc *acc, /* Compare received and rport with the URI in our registration */ pool = pjsua_pool_create("tmp", 512, 512); - uri = (pjsip_sip_uri*) - pjsip_parse_uri(pool, acc->contact.ptr, acc->contact.slen, 0); + contact_hdr = (pjsip_contact_hdr*) + pjsip_parse_hdr(pool, &STR_CONTACT, acc->contact.ptr, + acc->contact.slen, NULL); + pj_assert(contact_hdr != NULL); + uri = (pjsip_sip_uri*) contact_hdr->uri; pj_assert(uri != NULL); uri = (pjsip_sip_uri*) pjsip_uri_get_uri(uri); |