diff options
| author | Nanang Izzuddin <nanang@teluu.com> | 2009-08-04 14:36:17 +0000 |
|---|---|---|
| committer | Nanang Izzuddin <nanang@teluu.com> | 2009-08-04 14:36:17 +0000 |
| commit | 78b3a41d1e054c7cd2f29ff66b3aef258ab87010 (patch) | |
| tree | ec81d53b019eec13aafcbdf79345f2a266d33f3d /pjsip/src | |
| parent | 09ac78ac7c6694d8551de50d6ca135e95e4921da (diff) | |
Ticket #930:
- Changed semantic of pjsua_acc_config.contact_params, it is now used for specifying Contact header parameters (it was used for specifying Contact URI parameters).
- Added a new field pjsua_acc_config.contact_uri_params, for specifying Contact URI parameters.
- Added fields pjsua_acc_config.contact_params and pjsua_acc_config.contact_uri_params into python pjsua.
- Updated/added option in pjsua app to specify Contact header parameters and Contact URI parameters.
git-svn-id: http://svn.pjsip.org/repos/pjproject/trunk@2852 74dad513-b988-da41-8d7b-12977e46ad98
Diffstat (limited to 'pjsip/src')
| -rw-r--r-- | pjsip/src/pjsua-lib/pjsua_acc.c | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/pjsip/src/pjsua-lib/pjsua_acc.c b/pjsip/src/pjsua-lib/pjsua_acc.c index 5bfa5f04..05cedf49 100644 --- a/pjsip/src/pjsua-lib/pjsua_acc.c +++ b/pjsip/src/pjsua-lib/pjsua_acc.c @@ -712,7 +712,7 @@ static pj_bool_t acc_check_nat_addr(pjsua_acc *acc, tmp = (char*) pj_pool_alloc(pool, PJSIP_MAX_URL_SIZE); len = pj_ansi_snprintf(tmp, PJSIP_MAX_URL_SIZE, - "<sip:%.*s%s%s%.*s%s:%d;transport=%s%.*s>", + "<sip:%.*s%s%s%.*s%s:%d;transport=%s%.*s>%.*s", (int)acc->user_part.slen, acc->user_part.ptr, (acc->user_part.slen? "@" : ""), @@ -722,6 +722,8 @@ static pj_bool_t acc_check_nat_addr(pjsua_acc *acc, endquote, rport, tp->type_name, + (int)acc->cfg.contact_uri_params.slen, + acc->cfg.contact_uri_params.ptr, (int)acc->cfg.contact_params.slen, acc->cfg.contact_params.ptr); if (len < 1) { @@ -1698,7 +1700,7 @@ PJ_DEF(pj_status_t) pjsua_acc_create_uac_contact( pj_pool_t *pool, /* Create the contact header */ contact->ptr = (char*)pj_pool_alloc(pool, PJSIP_MAX_URL_SIZE); contact->slen = pj_ansi_snprintf(contact->ptr, PJSIP_MAX_URL_SIZE, - "%.*s%s<%s:%.*s%s%s%.*s%s:%d%s%.*s>", + "%.*s%s<%s:%.*s%s%s%.*s%s:%d%s%.*s>%.*s", (int)acc->display.slen, acc->display.ptr, (acc->display.slen?" " : ""), @@ -1712,6 +1714,8 @@ PJ_DEF(pj_status_t) pjsua_acc_create_uac_contact( pj_pool_t *pool, endquote, local_port, transport_param, + (int)acc->cfg.contact_uri_params.slen, + acc->cfg.contact_uri_params.ptr, (int)acc->cfg.contact_params.slen, acc->cfg.contact_params.ptr); @@ -1850,7 +1854,7 @@ PJ_DEF(pj_status_t) pjsua_acc_create_uas_contact( pj_pool_t *pool, /* Create the contact header */ contact->ptr = (char*) pj_pool_alloc(pool, PJSIP_MAX_URL_SIZE); contact->slen = pj_ansi_snprintf(contact->ptr, PJSIP_MAX_URL_SIZE, - "%.*s%s<%s:%.*s%s%s%.*s%s:%d%s%.*s>", + "%.*s%s<%s:%.*s%s%s%.*s%s:%d%s%.*s>%.*s", (int)acc->display.slen, acc->display.ptr, (acc->display.slen?" " : ""), @@ -1864,6 +1868,8 @@ PJ_DEF(pj_status_t) pjsua_acc_create_uas_contact( pj_pool_t *pool, endquote, local_port, transport_param, + (int)acc->cfg.contact_uri_params.slen, + acc->cfg.contact_uri_params.ptr, (int)acc->cfg.contact_params.slen, acc->cfg.contact_params.ptr); |