Changeset 5746 for pjproject/trunk/pjsip-apps/src/pjsua/pjsua_app_config.c

Timestamp:

Feb 26, 2018 7:50:18 AM (6 years ago)

Author:

nanang

Message:

Fixe #2096:

• Fixed re-INVITE scenario: always generate SRTP attr in SDP re-offer/answer as both offerer/answerer (as long as SRTP is not disabled of course), currently it does not generate SRTP attr if active session does not use SRTP.
• Fixed bug in retrieving video stream info from SDP that caused DTLS transport (UDP/TLS/RTP/SAVP) getting rejected.
• Added pjsua app param '--srtp-keying=0/1' to choose SRTP keying to be used in the outgoing offer (0=SDES (default), 1=DTLS-SRTP).
• Few minors, e.g: adding transport_srtp_dtls/sdes.c to pjmedia MSVC2015 project.

File:

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

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

@@ -192 +192 @@
     puts  ("  --turn-user         TURN username");
     puts  ("  --turn-passwd       TURN password");
+#if defined(PJMEDIA_HAS_SRTP) && (PJMEDIA_HAS_SRTP != 0)
+    puts  ("  --srtp-keying       SRTP keying method for outgoing SDP offer.");
+    puts  ("                      0=SDES (default), 1=DTLS");
+#endif
 
     puts  ("");
@@ -356 +360 @@
            OPT_USE_ICE, OPT_ICE_REGULAR, OPT_USE_SRTP, OPT_SRTP_SECURE,
            OPT_USE_TURN, OPT_ICE_MAX_HOSTS, OPT_ICE_NO_RTCP, OPT_TURN_SRV,
-           OPT_TURN_TCP, OPT_TURN_USER, OPT_TURN_PASSWD,
+           OPT_TURN_TCP, OPT_TURN_USER, OPT_TURN_PASSWD, OPT_SRTP_KEYING,
            OPT_PLAY_FILE, OPT_PLAY_TONE, OPT_RTP_PORT, OPT_ADD_CODEC,
            OPT_ILBC_MODE, OPT_REC_FILE, OPT_AUTO_REC,
@@ -453 +457 @@
         { "use-srtp",   1, 0, OPT_USE_SRTP},
         { "srtp-secure",1, 0, OPT_SRTP_SECURE},
+        { "srtp-keying",1, 0, OPT_SRTP_KEYING},
 #endif
         { "add-codec",  1, 0, OPT_ADD_CODEC},
@@ -1042 +1047 @@
             cur_acc->srtp_secure_signaling = app_config.cfg.srtp_secure_signaling;
             break;
+        case OPT_SRTP_KEYING:
+            app_config.srtp_keying = my_atoi(pj_optarg);
+            if (!pj_isdigit(*pj_optarg) || app_config.srtp_keying < 0 ||
+                app_config.srtp_keying > 1)
+            {
+                PJ_LOG(1,(THIS_FILE, "Invalid value for --srtp-keying option"));
+                return -1;
+            }
+            break;
 #endif
 
@@ -1926 +1940 @@
         pj_strcat2(&cfg, line);
     }
+    if (app_config.srtp_keying >= 0 && app_config.srtp_keying <= 1)
+    {
+        pj_ansi_sprintf(line, "--srtp-keying %d\n",
+                        app_config.srtp_keying);
+        pj_strcat2(&cfg, line);
+    }
 #endif