Changeset 5746 for pjproject/trunk/pjsip-apps/src/pjsua/pjsua_app.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.c (modified) (2 diffs)

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

@@ -1011 +1011 @@
 }
 
+/*
+ * This callback is called when media transport SRTP needs to be created.
+ */
+static void on_create_media_transport_srtp(pjsua_call_id call_id,
+                                           unsigned media_idx,
+                                           pjmedia_srtp_setting *srtp_opt)
+{
+    PJ_UNUSED_ARG(call_id);
+    PJ_UNUSED_ARG(media_idx);
+
+    /* Set SRTP keying to use DTLS over SDES */
+    if (app_config.srtp_keying == 1) {
+        srtp_opt->keying_count = 2;
+        srtp_opt->keying[0] = PJMEDIA_SRTP_KEYING_DTLS_SRTP;
+        srtp_opt->keying[1] = PJMEDIA_SRTP_KEYING_SDES;
+    }
+}
+
+
 #ifdef TRANSPORT_ADAPTER_SAMPLE
 /*
@@ -1344 +1363 @@
     app_config.cfg.cb.on_snd_dev_operation = &on_snd_dev_operation;
     app_config.cfg.cb.on_call_media_event = &on_call_media_event;
+    app_config.cfg.cb.on_create_media_transport_srtp =
+                                            &on_create_media_transport_srtp;
 #ifdef TRANSPORT_ADAPTER_SAMPLE
     app_config.cfg.cb.on_create_media_transport = &on_create_media_transport;