Changeset 5513 for pjproject/branches/projects/uwp/pjsip-apps/src/pjsua/pjsua_app_config.c

Timestamp:

Dec 28, 2016 3:40:07 AM (7 years ago)

Author:

nanang

Message:

Re #1900: More merged from trunk (r5512 mistakenly contains merged changes in third-party dir only).

Location:

pjproject/branches/projects/uwp

Files:

• . (modified) (1 prop)
• pjsip-apps/src/pjsua/pjsua_app_config.c (modified) (9 diffs)

pjproject/branches/projects/uwp/pjsip-apps/src/pjsua/pjsua_app_config.c

@@ -560 +560 @@
 
         case OPT_LOG_LEVEL:
-            c = pj_strtoul(pj_cstr(&tmp, pj_optarg));
+            c = (int)pj_strtoul(pj_cstr(&tmp, pj_optarg));
             if (c < 0 || c > 6) {
                 PJ_LOG(1,(THIS_FILE,
@@ -572 +572 @@
 
         case OPT_APP_LOG_LEVEL:
-            cfg->log_cfg.console_level = pj_strtoul(pj_cstr(&tmp, pj_optarg));
+            cfg->log_cfg.console_level = (unsigned)pj_strtoul(pj_cstr(&tmp, pj_optarg));
             if (cfg->log_cfg.console_level > 6) {
                 PJ_LOG(1,(THIS_FILE,
@@ -627 +627 @@
                 return PJ_EINVAL;
             }
-            cfg->media_cfg.clock_rate = lval;
+            cfg->media_cfg.clock_rate = (unsigned)lval;
             break;
 
@@ -637 +637 @@
                 return PJ_EINVAL;
             }
-            cfg->media_cfg.snd_clock_rate = lval;
+            cfg->media_cfg.snd_clock_rate = (unsigned)lval;
             break;
 
@@ -718 +718 @@
 
         case OPT_REG_TIMEOUT:   /* reg-timeout */
-            cur_acc->reg_timeout = pj_strtoul(pj_cstr(&tmp,pj_optarg));
+            cur_acc->reg_timeout = (unsigned)pj_strtoul(pj_cstr(&tmp,pj_optarg));
             if (cur_acc->reg_timeout < 1 || cur_acc->reg_timeout > 3600) {
                 PJ_LOG(1,(THIS_FILE,
@@ -747 +747 @@
                 return PJ_EINVAL;
             }
-            cur_acc->use_timer = lval;
-            cfg->cfg.use_timer = lval;
+            cur_acc->use_timer = (pjsua_sip_timer_use)lval;
+            cfg->cfg.use_timer = (pjsua_sip_timer_use)lval;
             break;
 
         case OPT_TIMER_SE: /** session timer session expiration */
-            cur_acc->timer_setting.sess_expires = pj_strtoul(pj_cstr(&tmp, pj_optarg));
+            cur_acc->timer_setting.sess_expires = (unsigned)pj_strtoul(pj_cstr(&tmp, pj_optarg));
             if (cur_acc->timer_setting.sess_expires < 90) {
                 PJ_LOG(1,(THIS_FILE,
@@ -763 +763 @@
 
         case OPT_TIMER_MIN_SE: /** session timer minimum session expiration */
-            cur_acc->timer_setting.min_se = pj_strtoul(pj_cstr(&tmp, pj_optarg));
+            cur_acc->timer_setting.min_se = (unsigned)pj_strtoul(pj_cstr(&tmp, pj_optarg));
             if (cur_acc->timer_setting.min_se < 90) {
                 PJ_LOG(1,(THIS_FILE,
@@ -810 +810 @@
 
         case OPT_AUTO_UPDATE_NAT:   /* OPT_AUTO_UPDATE_NAT */
-            cur_acc->allow_contact_rewrite  = pj_strtoul(pj_cstr(&tmp, pj_optarg));
+            cur_acc->allow_contact_rewrite  = (pj_bool_t)pj_strtoul(pj_cstr(&tmp, pj_optarg));
             break;
 
@@ -871 +871 @@
 
         case OPT_REG_RETRY_INTERVAL:
-            cur_acc->reg_retry_interval = pj_strtoul(pj_cstr(&tmp, pj_optarg));
+            cur_acc->reg_retry_interval = (unsigned)pj_strtoul(pj_cstr(&tmp, pj_optarg));
             break;