From 78b3a41d1e054c7cd2f29ff66b3aef258ab87010 Mon Sep 17 00:00:00 2001 From: Nanang Izzuddin Date: Tue, 4 Aug 2009 14:36:17 +0000 Subject: 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 --- pjsip-apps/src/pjsua/pjsua_app.c | 20 +++++++++++++++++--- 1 file changed, 17 insertions(+), 3 deletions(-) (limited to 'pjsip-apps/src/pjsua') diff --git a/pjsip-apps/src/pjsua/pjsua_app.c b/pjsip-apps/src/pjsua/pjsua_app.c index 4f534f90..41630132 100644 --- a/pjsip-apps/src/pjsua/pjsua_app.c +++ b/pjsip-apps/src/pjsua/pjsua_app.c @@ -180,7 +180,8 @@ static void usage(void) puts (" --registrar=url Set the URL of registrar server"); puts (" --id=url Set the URL of local ID (used in From header)"); puts (" --contact=url Optionally override the Contact information"); - puts (" --contact-params=S Append the specified parameters S in Contact URI"); + puts (" --contact-params=S Append the specified parameters S in Contact header"); + puts (" --contact-uri-params=S Append the specified parameters S in Contact URI"); puts (" --proxy=url Optional URL of proxy server to visit"); puts (" May be specified multiple times"); puts (" --reg-timeout=SEC Optional registration interval (default 55)"); @@ -471,7 +472,7 @@ static pj_status_t parse_args(int argc, char *argv[], OPT_HELP, OPT_VERSION, OPT_NULL_AUDIO, OPT_SND_AUTO_CLOSE, OPT_LOCAL_PORT, OPT_IP_ADDR, OPT_PROXY, OPT_OUTBOUND_PROXY, OPT_REGISTRAR, OPT_REG_TIMEOUT, OPT_PUBLISH, OPT_ID, OPT_CONTACT, - OPT_BOUND_ADDR, OPT_CONTACT_PARAMS, + OPT_BOUND_ADDR, OPT_CONTACT_PARAMS, OPT_CONTACT_URI_PARAMS, OPT_100REL, OPT_USE_IMS, OPT_REALM, OPT_USERNAME, OPT_PASSWORD, OPT_NAMESERVER, OPT_STUN_DOMAIN, OPT_STUN_SRV, OPT_ADD_BUDDY, OPT_OFFER_X_MS_MSG, OPT_NO_PRESENCE, @@ -529,6 +530,7 @@ static pj_status_t parse_args(int argc, char *argv[], { "id", 1, 0, OPT_ID}, { "contact", 1, 0, OPT_CONTACT}, { "contact-params",1,0, OPT_CONTACT_PARAMS}, + { "contact-uri-params",1,0, OPT_CONTACT_URI_PARAMS}, { "auto-update-nat", 1, 0, OPT_AUTO_UPDATE_NAT}, { "use-compact-form", 0, 0, OPT_USE_COMPACT_FORM}, { "accept-redirect", 1, 0, OPT_ACCEPT_REDIRECT}, @@ -851,6 +853,10 @@ static pj_status_t parse_args(int argc, char *argv[], cur_acc->contact_params = pj_str(pj_optarg); break; + case OPT_CONTACT_URI_PARAMS: + cur_acc->contact_uri_params = pj_str(pj_optarg); + break; + case OPT_AUTO_UPDATE_NAT: /* OPT_AUTO_UPDATE_NAT */ cur_acc->allow_contact_rewrite = pj_strtoul(pj_cstr(&tmp, pj_optarg)); break; @@ -1405,7 +1411,7 @@ static void write_account_settings(int acc_index, pj_str_t *result) pj_strcat2(result, line); } - /* Contact parameters */ + /* Contact header parameters */ if (acc_cfg->contact_params.slen) { pj_ansi_sprintf(line, "--contact-params %.*s\n", (int)acc_cfg->contact_params.slen, @@ -1413,6 +1419,14 @@ static void write_account_settings(int acc_index, pj_str_t *result) pj_strcat2(result, line); } + /* Contact URI parameters */ + if (acc_cfg->contact_uri_params.slen) { + pj_ansi_sprintf(line, "--contact-uri-params %.*s\n", + (int)acc_cfg->contact_uri_params.slen, + acc_cfg->contact_uri_params.ptr); + pj_strcat2(result, line); + } + /* */ if (acc_cfg->allow_contact_rewrite!=1) { -- cgit v1.2.3