Changeset 1709 for pjproject/branches/users/nanang/pjsip-apps/src/pjsua/pjsua_app.c

Timestamp:

Jan 18, 2008 6:49:29 PM (16 years ago)

Author:

bennylp

Message:

More ticket #452: SRTP creation/destruction, added use_srtp and srtp_secure_signaling in pjsua_account_config, updated pjsua

File:

• pjproject/branches/users/nanang/pjsip-apps/src/pjsua/pjsua_app.c (modified) (5 diffs)

pjproject/branches/users/nanang/pjsip-apps/src/pjsua/pjsua_app.c

@@ -121 +121 @@
     puts  ("SIP Account options:");
     puts  ("  --use-ims           Enable 3GPP/IMS related settings on this account");
+    puts  ("  --use-srtp=N        Use SRTP N= 0: disabled, 1: optional, 2: mandatory");
     puts  ("  --registrar=url     Set the URL of registrar server");
     puts  ("  --id=url            Set the URL of local ID (used in From header)");
@@ -166 +167 @@
     puts  ("Media Options:");
     puts  ("  --use-ice           Enable ICE (default:no)");
-    puts  ("  --use-srtp          Enable SRTP (default:no)");
     puts  ("  --add-codec=name    Manually add codec (default is to enable all)");
     puts  ("  --dis-codec=name    Disable codec (can be specified multiple times)");
@@ -443 +443 @@
         { "rtp-port",   1, 0, OPT_RTP_PORT},
         { "use-ice",    0, 0, OPT_USE_ICE},
-        { "use-srtp",   0, 0, OPT_USE_SRTP},
+        { "use-srtp",   1, 0, OPT_USE_SRTP},
         { "add-codec",  1, 0, OPT_ADD_CODEC},
         { "dis-codec",  1, 0, OPT_DIS_CODEC},
@@ -800 +800 @@
 
         case OPT_USE_SRTP:
-            cfg->media_cfg.enable_srtp = PJ_TRUE;
+            i = my_atoi(pj_optarg);
+            if (!pj_isdigit(*pj_optarg) || i > 2) {
+                PJ_LOG(1,(THIS_FILE, "Invalid value for --use-srtp option"));
+                return -1;
+            }
+            cur_acc->use_srtp = i;
             break;
 
@@ -1115 +1120 @@
         pj_ansi_sprintf(line, "--auto-update-nat %i\n",
                         (int)acc_cfg->auto_update_nat);
+        pj_strcat2(result, line);
+    }
+
+    /* SRTP */
+    if (acc_cfg->use_srtp) {
+        pj_ansi_sprintf(line, "--use-srtp %i\n",
+                        (int)acc_cfg->use_srtp);
         pj_strcat2(result, line);
     }