Changeset 521

Timestamp:

Jun 19, 2006 12:07:44 PM (18 years ago)

Author:

bennylp

Message:

Comment out PJSUA options that are no longer supported with new pjsua

File:

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

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

@@ -89 +89 @@
     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  ("  --realm=string      Set realm");
     puts  ("  --username=string   Set authentication username");
     puts  ("  --password=string   Set authentication password");
-    puts  ("  --reg-timeout=SEC   Optional registration interval (default 55)");
+    puts  ("  --next-cred         Add another credentials");
     puts  ("");
     puts  ("SIP Account Control:");
@@ -112 +113 @@
     puts  ("  --auto-loop         Automatically loop incoming RTP to outgoing RTP");
     puts  ("  --rtp-port=N        Base port to try for RTP (default=4000)");
+    /*
     puts  ("  --complexity=N      Specify encoding complexity (0-10, default=none(-1))");
     puts  ("  --quality=N         Specify encoding quality (0-10, default=4)");
     puts  ("  --ptime=MSEC        Override codec ptime to MSEC (default=specific)");
+    */
     puts  ("");
     puts  ("Buddy List (can be more than one):");
@@ -122 +125 @@
     puts  ("  --auto-answer=code  Automatically answer incoming calls with code (e.g. 200)");
     puts  ("  --max-calls=N       Maximum number of concurrent calls (default:4, max:255)");
+    /*
     puts  ("  --duration=SEC      Set maximum call duration (default:no limit)");
+    */
     puts  ("");
     fflush(stdout);
@@ -238 +243 @@
            OPT_PLAY_FILE, OPT_RTP_PORT, OPT_ADD_CODEC,
            OPT_COMPLEXITY, OPT_QUALITY, OPT_PTIME,
-           OPT_NEXT_ACCOUNT, OPT_MAX_CALLS, 
+           OPT_NEXT_ACCOUNT, OPT_NEXT_CRED, OPT_MAX_CALLS, 
            OPT_DURATION,
     };
@@ -277 +282 @@
         { "ptime",      1, 0, OPT_PTIME},
         { "next-account",0,0, OPT_NEXT_ACCOUNT},
+        { "next-cred",  0, 0, OPT_NEXT_CRED},
         { "max-calls",  1, 0, OPT_MAX_CALLS},
         { "duration",1,0, OPT_DURATION},
@@ -449 +455 @@
 
         case OPT_USERNAME:   /* Default authentication user */
-            cur_acc->cred_count = 1;
-            cur_acc->cred_info[0].username = pj_str(pj_optarg);
+            cur_acc->cred_info[cur_acc->cred_count].username = pj_str(pj_optarg);
+            cur_acc->cred_info[cur_acc->cred_count].scheme = pj_str("digest");
             break;
 
         case OPT_REALM:     /* Default authentication realm. */
-            cur_acc->cred_count = 1;
-            cur_acc->cred_info[0].realm = pj_str(pj_optarg);
+            cur_acc->cred_info[cur_acc->cred_count].realm = pj_str(pj_optarg);
             break;
 
         case OPT_PASSWORD:   /* authentication password */
-            cur_acc->cred_count = 1;
-            cur_acc->cred_info[0].data_type = PJSIP_CRED_DATA_PLAIN_PASSWD;
-            cur_acc->cred_info[0].data = pj_str(pj_optarg);
+            cur_acc->cred_info[cur_acc->cred_count].data_type = PJSIP_CRED_DATA_PLAIN_PASSWD;
+            cur_acc->cred_info[cur_acc->cred_count].data = pj_str(pj_optarg);
+            break;
+
+        case OPT_NEXT_CRED: /* next credential */
+            cur_acc->cred_count++;
             break;
 
@@ -543 +551 @@
             break;
 
+        /* These options were no longer valid after new pjsua */
+        /*
         case OPT_COMPLEXITY:
             cfg->complexity = my_atoi(pj_optarg);
@@ -561 +571 @@
             break;
 
+        case OPT_DURATION:
+            cfg->duration = my_atoi(pj_optarg);
+            break;
+
         case OPT_PTIME:
             cfg->ptime = my_atoi(pj_optarg);
@@ -569 +583 @@
             }
             break;
+
+        */
 
         case OPT_AUTO_ANSWER:
@@ -588 +604 @@
             break;
 
-        case OPT_DURATION:
-            cfg->duration = my_atoi(pj_optarg);
-            break;
-
         default:
             PJ_LOG(1,(THIS_FILE, "Invalid argument %s", argv[pj_optind-1]));
@@ -633 +645 @@
 
     for (i=0; i<cfg->acc_cnt; ++i) {
-        if (cfg->acc_cfg[i].cred_info[0].username.slen ||
-            cfg->acc_cfg[i].cred_info[0].realm.slen)
+        if (cfg->acc_cfg[i].cred_info[cfg->acc_cfg[i].cred_count].username.slen)
         {
-            cfg->acc_cfg[i].cred_count = 1;
-            cfg->acc_cfg[i].cred_info[0].scheme = pj_str("digest");
+            cfg->acc_cfg[i].cred_count++;
         }
     }
@@ -718 +728 @@
             pj_strcat2(result, line);
         }
+
+        if (i != acc_cfg->cred_count - 1)
+            pj_strcat2(result, "--next-cred\n");
     }