Changeset 2859 for pjproject/trunk/pjsip-apps/src/pjsua/pjsua_app.c

Timestamp:

Aug 11, 2009 4:26:20 PM (15 years ago)

Author:

nanang

Message:

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.

File:

• pjproject/trunk/pjsip-apps/src/pjsua/pjsua_app.c (modified) (3 diffs)

pjproject/trunk/pjsip-apps/src/pjsua/pjsua_app.c

@@ -839 +839 @@
 
         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 "
@@ -846 +846 @@
                 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 "
@@ -857 +857 @@
                 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;