summaryrefslogtreecommitdiff
path: root/pjsip/src/pjsua-lib/pjsua_core.c
diff options
context:
space:
mode:
authorNanang Izzuddin <nanang@teluu.com>2009-08-11 12:42:38 +0000
committerNanang Izzuddin <nanang@teluu.com>2009-08-11 12:42:38 +0000
commit6f204c13ce8519524eb4da79359ac9b2aea08252 (patch)
treefd03248a6aa6c121822cbca2507113cf5b86b0f0 /pjsip/src/pjsua-lib/pjsua_core.c
parent04fbadef1554da3b61c412e030081d1f05c6a99a (diff)
Ticket #833:
- Initial version of Session Timers (RFC 4028). - Added new options in pjsua app to configure Session Timers settings. - Added python tests for Session Timers. git-svn-id: http://svn.pjsip.org/repos/pjproject/trunk@2858 74dad513-b988-da41-8d7b-12977e46ad98
Diffstat (limited to 'pjsip/src/pjsua-lib/pjsua_core.c')
-rw-r--r--pjsip/src/pjsua-lib/pjsua_core.c13
1 files changed, 13 insertions, 0 deletions
diff --git a/pjsip/src/pjsua-lib/pjsua_core.c b/pjsip/src/pjsua-lib/pjsua_core.c
index 30ae00e7..6cd9cac5 100644
--- a/pjsip/src/pjsua-lib/pjsua_core.c
+++ b/pjsip/src/pjsua-lib/pjsua_core.c
@@ -87,6 +87,8 @@ PJ_DEF(void) pjsua_logging_config_dup(pj_pool_t *pool,
PJ_DEF(void) pjsua_config_default(pjsua_config *cfg)
{
+ pjsip_timer_setting timer_setting;
+
pj_bzero(cfg, sizeof(*cfg));
cfg->max_calls = ((PJSUA_MAX_CALLS) < 4) ? (PJSUA_MAX_CALLS) : 4;
@@ -98,6 +100,10 @@ PJ_DEF(void) pjsua_config_default(pjsua_config *cfg)
cfg->srtp_secure_signaling = PJSUA_DEFAULT_SRTP_SECURE_SIGNALING;
#endif
cfg->hangup_forked_call = PJ_TRUE;
+
+ pjsip_timer_default_setting(&timer_setting);
+ cfg->timer_se = timer_setting.sess_expires;
+ cfg->timer_min_se = timer_setting.min_se;
}
PJ_DEF(void) pjsua_config_dup(pj_pool_t *pool,
@@ -150,6 +156,9 @@ 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->timer_se = pjsua_var.ua_cfg.timer_se;
+ cfg->timer_min_se = pjsua_var.ua_cfg.timer_min_se;
cfg->ka_interval = 15;
cfg->ka_data = pj_str("\r\n");
#if defined(PJMEDIA_HAS_SRTP) && (PJMEDIA_HAS_SRTP != 0)
@@ -721,6 +730,10 @@ PJ_DEF(pj_status_t) pjsua_init( const pjsua_config *ua_cfg,
status = pjsip_100rel_init_module(pjsua_var.endpt);
PJ_ASSERT_RETURN(status == PJ_SUCCESS, status);
+ /* Initialize session timer support */
+ status = pjsip_timer_init_module(pjsua_var.endpt);
+ PJ_ASSERT_RETURN(status == PJ_SUCCESS, status);
+
/* Initialize and register PJSUA application module. */
{
const pjsip_module mod_initializer =