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

Timestamp:

Sep 7, 2010 9:36:15 AM (14 years ago)

Author:

nanang

Message:

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.

File:

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

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

@@ -202 +202 @@
     puts  ("  --use-srtp=N        Use SRTP?  0:disabled, 1:optional, 2:mandatory,");
     puts  ("                      3:optional by duplicating media offer (def:0)");
-    puts  ("  --srtp-secure=N     SRTP require secure SIP? 0:no, 1:tls, 1:sips (def:1)");
+    puts  ("  --srtp-secure=N     SRTP require secure SIP? 0:no, 1:tls, 2:sips (def:1)");
 #endif
     puts  ("  --registrar=url     Set the URL of registrar server");
@@ -223 +223 @@
     puts  ("  --mwi               Subscribe to message summary/waiting indication");
     puts  ("  --use-100rel        Require reliable provisional response (100rel)");
-    puts  ("  --use-timer         Require SIP session timers");
+    puts  ("  --use-timer=N       Use SIP session timers? (default=1)");
+    puts  ("                      0:inactive, 1:optional, 2:mandatory, 3:always");
     printf("  --timer-se=N        Session timers expiration period, in secs (def:%d)\n",
             PJSIP_SESS_TIMER_DEF_SE);
@@ -263 +264 @@
     puts  ("  --tls-verify-client Verify client's certificate (default=no)");
     puts  ("  --tls-neg-timeout   Specify TLS negotiation timeout (default=no)");
-    puts  ("  --tls-srv-name      Specify TLS server name for multi-hosting server (optional)");
+    puts  ("  --tls-srv-name      Specify TLS server name for multihosting server");
 
     puts  ("");
@@ -654 +655 @@
 #endif
         { "set-qos",     0, 0, OPT_QOS},
-        { "use-timer",  0, 0, OPT_TIMER},
+        { "use-timer",  1, 0, OPT_TIMER},
         { "timer-se",   1, 0, OPT_TIMER_SE},
         { "timer-min-se", 1, 0, OPT_TIMER_MIN_SE},
@@ -882 +883 @@
 
         case OPT_TIMER: /** session timer */
-            cur_acc->require_timer = PJ_TRUE;
-            cfg->cfg.require_timer = PJ_TRUE;
+            lval = pj_strtoul(pj_cstr(&tmp, pj_optarg));
+            if (lval < 0 || lval > 3) {
+                PJ_LOG(1,(THIS_FILE, 
+                          "Error: expecting integer value 0-3 for --use-timer"));
+                return PJ_EINVAL;
+            }
+            cur_acc->use_timer = lval;
+            cfg->cfg.use_timer = lval;
             break;
 
@@ -1625 +1632 @@
 
     /* Session Timer extension */
-    if (acc_cfg->require_timer) {
-        pj_strcat2(result, "--use-timer\n");
+    if (acc_cfg->use_timer) {
+        pj_ansi_sprintf(line, "--use-timer %d\n",
+                              acc_cfg->use_timer);
+        pj_strcat2(result, line);
     }
     if (acc_cfg->timer_setting.min_se != 90) {
@@ -2104 +2113 @@
     }
     /* Session Timer extension */
-    if (config->cfg.require_timer) {
-        pj_strcat2(&cfg, "--use-timer\n");
+    if (config->cfg.use_timer) {
+        pj_ansi_sprintf(line, "--use-timer %d\n",
+                              config->cfg.use_timer);
+        pj_strcat2(&cfg, line);
     }
     if (config->cfg.timer_setting.min_se != 90) {