diff options
| author | Nanang Izzuddin <nanang@teluu.com> | 2009-08-11 16:26:20 +0000 |
|---|---|---|
| committer | Nanang Izzuddin <nanang@teluu.com> | 2009-08-11 16:26:20 +0000 |
| commit | f61fccd70f181bf9156cd523f7d27812f62db7d7 (patch) | |
| tree | 5522479e04b655e7a41f5e748a84c55c45f490c6 /pjsip-apps | |
| parent | 6f204c13ce8519524eb4da79359ac9b2aea08252 (diff) | |
Ticket #833:
- Renamed pjsip_timer_default_setting() to pjsip_timer_setting_default().
- Updated session timer settings in pjsua-lib as whole session timer setting struct (pyhton version remains using se & min_se).
- Added output param SIP status code in pjsip_timer_process_resp() and pjsip_timer_process_req() to specify the corresponding SIP status code when function returning non-PJ_SUCCESS.
- Fixed print header functions in sip_timer.c to have buffer check.
- Added PJSIP_SESS_TIMER_DEF_SE setting to specify the default value of session timer interval.
- Fixed role reference of the refresher, it is transaction role, not dialog role.
git-svn-id: http://svn.pjsip.org/repos/pjproject/trunk@2859 74dad513-b988-da41-8d7b-12977e46ad98
Diffstat (limited to 'pjsip-apps')
| -rw-r--r-- | pjsip-apps/src/pjsua/pjsua_app.c | 12 | ||||
| -rw-r--r-- | pjsip-apps/src/python/_pjsua.h | 8 |
2 files changed, 10 insertions, 10 deletions
diff --git a/pjsip-apps/src/pjsua/pjsua_app.c b/pjsip-apps/src/pjsua/pjsua_app.c index 94782173..f2ae35a9 100644 --- a/pjsip-apps/src/pjsua/pjsua_app.c +++ b/pjsip-apps/src/pjsua/pjsua_app.c @@ -838,25 +838,25 @@ static pj_status_t parse_args(int argc, char *argv[], break; case OPT_TIMER_SE: /** session timer session expiration */ - cur_acc->timer_se = pj_strtoul(pj_cstr(&tmp, pj_optarg)); - if (cur_acc->timer_se < 90) { + cur_acc->timer_setting.sess_expires = pj_strtoul(pj_cstr(&tmp, pj_optarg)); + if (cur_acc->timer_setting.min_se < 90) { PJ_LOG(1,(THIS_FILE, "Error: invalid value for --timer-se " "(expecting higher than 90)")); return PJ_EINVAL; } - cfg->cfg.timer_se = cur_acc->timer_se; + cfg->cfg.timer_setting.sess_expires = cur_acc->timer_setting.sess_expires; break; case OPT_TIMER_MIN_SE: /** session timer minimum session expiration */ - cur_acc->timer_min_se = pj_strtoul(pj_cstr(&tmp, pj_optarg)); - if (cur_acc->timer_min_se < 90) { + cur_acc->timer_setting.min_se = pj_strtoul(pj_cstr(&tmp, pj_optarg)); + if (cur_acc->timer_setting.min_se < 90) { PJ_LOG(1,(THIS_FILE, "Error: invalid value for --timer-min-se " "(expecting higher than 90)")); return PJ_EINVAL; } - cfg->cfg.timer_min_se = cur_acc->timer_min_se; + cfg->cfg.timer_setting.min_se = cur_acc->timer_setting.min_se; break; case OPT_USE_IMS: /* Activate IMS settings */ diff --git a/pjsip-apps/src/python/_pjsua.h b/pjsip-apps/src/python/_pjsua.h index 931fcbe6..7147e2ef 100644 --- a/pjsip-apps/src/python/_pjsua.h +++ b/pjsip-apps/src/python/_pjsua.h @@ -1734,8 +1734,8 @@ static void PyObj_pjsua_acc_config_import(PyObj_pjsua_acc_config *obj, obj->contact_uri_params = PyString_FromPJ(&cfg->contact_uri_params); obj->require_100rel = cfg->require_100rel; obj->require_timer = cfg->require_timer; - obj->timer_se = cfg->timer_se; - obj->timer_min_se = cfg->timer_min_se; + obj->timer_se = cfg->timer_setting.sess_expires; + obj->timer_min_se = cfg->timer_setting.min_se; obj->allow_contact_rewrite = cfg->allow_contact_rewrite; obj->ka_interval = cfg->ka_interval; Py_XDECREF(obj->ka_data); @@ -1783,8 +1783,8 @@ static void PyObj_pjsua_acc_config_export(pjsua_acc_config *cfg, cfg->contact_uri_params = PyString_ToPJ(obj->contact_uri_params); cfg->require_100rel = obj->require_100rel; cfg->require_timer = obj->require_timer; - cfg->timer_se = obj->timer_se; - cfg->timer_min_se = obj->timer_min_se; + cfg->timer_setting.sess_expires = obj->timer_se; + cfg->timer_setting.min_se = obj->timer_min_se; cfg->allow_contact_rewrite = obj->allow_contact_rewrite; cfg->ka_interval = obj->ka_interval; cfg->ka_data = PyString_ToPJ(obj->ka_data); |