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

Timestamp:

Jan 23, 2008 8:39:07 PM (16 years ago)

Author:

bennylp

Message:

Ticket #61: Implement SRTP support in PJMEDIA and PJSUA-LIB, and updated applications because of the changes. This is a major modification back ported from SRTP branch. See ticket #61 for changelog detail of this commit

File:

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

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

@@ -121 +121 @@
     puts  ("SIP Account options:");
     puts  ("  --use-ims           Enable 3GPP/IMS related settings on this account");
+#if defined(PJMEDIA_HAS_SRTP) && (PJMEDIA_HAS_SRTP != 0)
+    puts  ("  --use-srtp=N        Use SRTP N= 0: disabled, 1: optional, 2: mandatory");
+#endif
     puts  ("  --registrar=url     Set the URL of registrar server");
     puts  ("  --id=url            Set the URL of local ID (used in From header)");
@@ -383 +386 @@
            OPT_ADD_BUDDY, OPT_OFFER_X_MS_MSG, OPT_NO_PRESENCE,
            OPT_AUTO_ANSWER, OPT_AUTO_HANGUP, OPT_AUTO_PLAY, OPT_AUTO_LOOP,
-           OPT_AUTO_CONF, OPT_CLOCK_RATE, OPT_USE_ICE,
+           OPT_AUTO_CONF, OPT_CLOCK_RATE, OPT_USE_ICE, OPT_USE_SRTP,
            OPT_PLAY_FILE, OPT_PLAY_TONE, OPT_RTP_PORT, OPT_ADD_CODEC, 
            OPT_ILBC_MODE, OPT_REC_FILE, OPT_AUTO_REC,
@@ -442 +445 @@
         { "rtp-port",   1, 0, OPT_RTP_PORT},
         { "use-ice",    0, 0, OPT_USE_ICE},
+#if defined(PJMEDIA_HAS_SRTP) && (PJMEDIA_HAS_SRTP != 0)
+        { "use-srtp",   1, 0, OPT_USE_SRTP},
+#endif
         { "add-codec",  1, 0, OPT_ADD_CODEC},
         { "dis-codec",  1, 0, OPT_DIS_CODEC},
@@ -797 +803 @@
             break;
 
+#if defined(PJMEDIA_HAS_SRTP) && (PJMEDIA_HAS_SRTP != 0)
+        case OPT_USE_SRTP:
+            app_config.cfg.use_srtp = my_atoi(pj_optarg);
+            if (!pj_isdigit(*pj_optarg) || app_config.cfg.use_srtp > 2) {
+                PJ_LOG(1,(THIS_FILE, "Invalid value for --use-srtp option"));
+                return -1;
+            }
+            break;
+#endif
+
         case OPT_RTP_PORT:
             cfg->rtp_cfg.port = my_atoi(pj_optarg);
@@ -1111 +1127 @@
         pj_strcat2(result, line);
     }
+
+#if defined(PJMEDIA_HAS_SRTP) && (PJMEDIA_HAS_SRTP != 0)
+    /* SRTP */
+    if (acc_cfg->use_srtp) {
+        pj_ansi_sprintf(line, "--use-srtp %i\n",
+                        (int)acc_cfg->use_srtp);
+        pj_strcat2(result, line);
+    }
+#endif
 
     /* Proxy */