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

Timestamp:

Jun 22, 2010 6:02:13 AM (14 years ago)

Author:

bennylp

Message:

Fixed #1095 (New option to control the Route headers in REGISTER request). Details:

• added new account config setting: reg_use_proxy. This contains bitmask values to indicate whether outbound proxies and account proxies are to be added in the REGISTER request. Default value is to add both.
• added new pjsua cmdline option to control this: --reg-use-proxy
• miscellaneous minor fixes in other pjsua cmdline arguments

File:

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

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

@@ -193 +193 @@
     puts  ("  --proxy=url         Optional URL of proxy server to visit");
     puts  ("                      May be specified multiple times");
-    puts  ("  --reg-timeout=SEC   Optional registration interval (default 55)");
-    puts  ("  --rereg-delay=SEC   Optional auto retry registration interval (default 300)");
+    printf("  --reg-timeout=SEC   Optional registration interval (default %d)\n",
+            PJSUA_REG_INTERVAL);
+    printf("  --rereg-delay=SEC   Optional auto retry registration interval (default %d)\n",
+            PJSUA_REG_RETRY_INTERVAL);
+    puts  ("  --reg-use-proxy=N   Control the use of proxy settings in REGISTER.");
+    puts  ("                      0=no proxy, 1=outbound only, 2=acc only, 3=all (default)");
     puts  ("  --realm=string      Set realm");
     puts  ("  --username=string   Set authentication username");
@@ -202 +206 @@
     puts  ("  --use-100rel        Require reliable provisional response (100rel)");
     puts  ("  --use-timer         Require SIP session timers");
-    puts  ("  --timer-se=N        Session timers expiration period, in secs (def:1800)");
+    printf("  --timer-se=N        Session timers expiration period, in secs (def:%d)\n",
+            PJSIP_SESS_TIMER_DEF_SE);
     puts  ("  --timer-min-se=N    Session timers minimum expiration period, in secs (def:90)");
     puts  ("  --auto-update-nat=N Where N is 0 or 1 to enable/disable SIP traversal behind");
@@ -490 +495 @@
            OPT_BOUND_ADDR, OPT_CONTACT_PARAMS, OPT_CONTACT_URI_PARAMS,
            OPT_100REL, OPT_USE_IMS, OPT_REALM, OPT_USERNAME, OPT_PASSWORD,
-           OPT_REG_RETRY_INTERVAL,
+           OPT_REG_RETRY_INTERVAL, OPT_REG_USE_PROXY,
            OPT_MWI, OPT_NAMESERVER, OPT_STUN_SRV,
            OPT_ADD_BUDDY, OPT_OFFER_X_MS_MSG, OPT_NO_PRESENCE,
@@ -559 +564 @@
         { "password",   1, 0, OPT_PASSWORD},
         { "rereg-delay",1, 0, OPT_REG_RETRY_INTERVAL},
+        { "reg-use-proxy", 1, 0, OPT_REG_USE_PROXY},
         { "nameserver", 1, 0, OPT_NAMESERVER},
         { "stun-srv",   1, 0, OPT_STUN_SRV},
@@ -976 +982 @@
             break;
 
+        case OPT_REG_USE_PROXY:
+            cur_acc->reg_use_proxy = (unsigned)pj_strtoul(pj_cstr(&tmp, pj_optarg));
+            if (cur_acc->reg_use_proxy > 3) {
+                PJ_LOG(1,(THIS_FILE, "Error: invalid --reg-use-proxy value '%s'",
+                          pj_optarg));
+                return PJ_EINVAL;
+            }
+            break;
+
         case OPT_NEXT_CRED: /* next credential */
             cur_acc->cred_count++;
@@ -1570 +1585 @@
         if (i != acc_cfg->cred_count - 1)
             pj_strcat2(result, "--next-cred\n");
+    }
+
+    /* reg-use-proxy */
+    if (acc_cfg->reg_use_proxy != 3) {
+        pj_ansi_sprintf(line, "--reg-use-proxy %d\n",
+                              acc_cfg->reg_use_proxy);
+        pj_strcat2(result, line);
+    }
+
+    /* rereg-delay */
+    if (acc_cfg->reg_retry_interval != PJSUA_REG_RETRY_INTERVAL) {
+        pj_ansi_sprintf(line, "--rereg-delay %d\n",
+                              acc_cfg->reg_retry_interval);
+        pj_strcat2(result, line);
     }