summaryrefslogtreecommitdiff
path: root/pjsip/src/pjsua-lib/pjsua_core.c
diff options
context:
space:
mode:
authorNanang Izzuddin <nanang@teluu.com>2010-09-07 09:36:15 +0000
committerNanang Izzuddin <nanang@teluu.com>2010-09-07 09:36:15 +0000
commitb14c7d99d296b6e4de74581b1cdc1281b9f8255c (patch)
tree632dc15c04b4b7207137a70926ba9e5918a53625 /pjsip/src/pjsua-lib/pjsua_core.c
parentc7f48f004e14c0be8b4c5fcd82c6a5ccc64c170a (diff)
Re #1120:
- Added enum pjsua_sip_timer_use for session timer usage types, containing: inactive, optional, required, always - Replaced require_timer (boolean) with above enum in global and account config setting. - Updated pjsua app --use-timer option accordingly. git-svn-id: http://svn.pjsip.org/repos/pjproject/trunk@3305 74dad513-b988-da41-8d7b-12977e46ad98
Diffstat (limited to 'pjsip/src/pjsua-lib/pjsua_core.c')
-rw-r--r--pjsip/src/pjsua-lib/pjsua_core.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/pjsip/src/pjsua-lib/pjsua_core.c b/pjsip/src/pjsua-lib/pjsua_core.c
index 368996d1..a0e43b21 100644
--- a/pjsip/src/pjsua-lib/pjsua_core.c
+++ b/pjsip/src/pjsua-lib/pjsua_core.c
@@ -109,6 +109,7 @@ PJ_DEF(void) pjsua_config_default(pjsua_config *cfg)
#endif
cfg->hangup_forked_call = PJ_TRUE;
+ cfg->use_timer = PJSUA_SIP_TIMER_OPTIONAL;
pjsip_timer_setting_default(&cfg->timer_setting);
}
@@ -171,7 +172,7 @@ PJ_DEF(void) pjsua_acc_config_default(pjsua_acc_config *cfg)
cfg->transport_id = PJSUA_INVALID_ID;
cfg->allow_contact_rewrite = PJ_TRUE;
cfg->require_100rel = pjsua_var.ua_cfg.require_100rel;
- cfg->require_timer = pjsua_var.ua_cfg.require_timer;
+ cfg->use_timer = pjsua_var.ua_cfg.use_timer;
cfg->timer_setting = pjsua_var.ua_cfg.timer_setting;
cfg->ka_interval = 15;
cfg->ka_data = pj_str("\r\n");