Changeset 5746 for pjproject/trunk/pjmedia/src/pjmedia/transport_srtp.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/pjmedia/src/pjmedia/transport_srtp.c (modified) (18 diffs)

pjproject/trunk/pjmedia/src/pjmedia/transport_srtp.c

@@ -120 +120 @@
 #endif
 
+/* Maximum number of SRTP keying method */
+#define MAX_KEYING                  2
+
 static const pj_str_t ID_RTP_AVP  = { "RTP/AVP", 7 };
 static const pj_str_t ID_RTP_SAVP = { "RTP/SAVP", 8 };
@@ -284 +287 @@
      * method, any other keying methods will be stopped and destroyed.
      */
+    unsigned             all_keying_cnt;
+    pjmedia_transport   *all_keying[MAX_KEYING];
+
+    /* Current active SRTP keying methods. */
     unsigned             keying_cnt;
-    pjmedia_transport   *keying[2];
+    pjmedia_transport   *keying[MAX_KEYING];
 
     /* If not zero, keying nego is ongoing (async-ly, e.g: by DTLS-SRTP).
@@ -718 +725 @@
 
     /* Initialize SRTP keying method. */
-    for (i = 0; i < srtp->setting.keying_count; ++i) {
+    for (i = 0; i < srtp->setting.keying_count && i < MAX_KEYING; ++i) {
         switch(srtp->setting.keying[i]) {
 
         case PJMEDIA_SRTP_KEYING_SDES:
 #if defined(PJMEDIA_SRTP_HAS_SDES) && (PJMEDIA_SRTP_HAS_SDES != 0)
-            sdes_create(srtp, &srtp->keying[srtp->keying_cnt++]);
+            sdes_create(srtp, &srtp->all_keying[srtp->all_keying_cnt++]);
 #endif
             break;
@@ -729 +736 @@
         case PJMEDIA_SRTP_KEYING_DTLS_SRTP:
 #if defined(PJMEDIA_SRTP_HAS_DTLS) && (PJMEDIA_SRTP_HAS_DTLS != 0)
-            dtls_create(srtp, &srtp->keying[srtp->keying_cnt++]);
+            dtls_create(srtp, &srtp->all_keying[srtp->all_keying_cnt++]);
 #endif
             break;
@@ -1039 +1046 @@
               sizeof(srtp_info));
 
-    /* Invoke get_info() of all keying methods */
+    /* Invoke get_info() from any active keying method */
     for (i=0; i < srtp->keying_cnt; i++)
         pjmedia_transport_get_info(srtp->keying[i], info);
@@ -1372 +1379 @@
     struct transport_srtp *srtp = (struct transport_srtp*) tp;
     unsigned member_tp_option;
-    pj_status_t last_err_st = PJ_EBUG;
+    pj_status_t keying_status = PJ_SUCCESS;
     pj_status_t status;
     unsigned i;
@@ -1384 +1391 @@
     srtp->offerer_side = (sdp_remote == NULL);
 
-    if (srtp->offerer_side && srtp->setting.use == PJMEDIA_SRTP_DISABLED)
+    if (srtp->offerer_side && srtp->setting.use == PJMEDIA_SRTP_DISABLED) {
         srtp->bypass_srtp = PJ_TRUE;
-    else
+        srtp->keying_cnt = 0;
+    } else {
+        srtp->bypass_srtp = PJ_FALSE;
+        srtp->keying_cnt = srtp->all_keying_cnt;
+        for (i = 0; i < srtp->all_keying_cnt; ++i)
+            srtp->keying[i] = srtp->all_keying[i];
+
         member_tp_option |= PJMEDIA_TPMED_NO_TRANSPORT_CHECKING;
+    }
 
     status = pjmedia_transport_media_create(srtp->member_tp, sdp_pool,
                                             member_tp_option, sdp_remote,
                                             media_index);
-    if (status != PJ_SUCCESS || srtp->bypass_srtp)
+    if (status != PJ_SUCCESS)
         return status;
 
@@ -1406 +1420 @@
                            srtp->keying_cnt, i);
             srtp->keying_cnt--;
-            last_err_st = st;
+            keying_status = st;
             continue;
         } else if (srtp->offerer_side) {
@@ -1420 +1434 @@
     /* All keying method failed to process remote SDP? */
     if (srtp->keying_cnt == 0)
-        return last_err_st;
+        return keying_status;
 
     return PJ_SUCCESS;
@@ -1432 +1446 @@
 {
     struct transport_srtp *srtp = (struct transport_srtp*) tp;
-    pj_status_t last_err_st = PJ_EBUG;
+    pj_status_t keying_status = PJ_SUCCESS;
     pj_status_t status;
     unsigned i;
@@ -1445 +1459 @@
     status = pjmedia_transport_encode_sdp(srtp->member_tp, sdp_pool,
                                           sdp_local, sdp_remote, media_index);
-    if (status != PJ_SUCCESS || srtp->bypass_srtp)
+    if (status != PJ_SUCCESS)
         return status;
 
@@ -1459 +1473 @@
                            srtp->keying_cnt, i);
             srtp->keying_cnt--;
-            last_err_st = st;
+            keying_status = st;
             continue;
         }
@@ -1483 +1497 @@
     /* All keying method failed to process remote SDP? */
     if (srtp->keying_cnt == 0)
-        return last_err_st;
+        return keying_status;
 
     return PJ_SUCCESS;
@@ -1496 +1510 @@
 {
     struct transport_srtp *srtp = (struct transport_srtp*) tp;
-    pj_status_t last_err_st = PJ_EBUG;
+    pj_status_t keying_status = PJ_SUCCESS;
     pj_status_t status;
     unsigned i;
@@ -1505 +1519 @@
                                            sdp_local, sdp_remote,
                                            media_index);
-    if (status != PJ_SUCCESS || srtp->bypass_srtp)
+    if (status != PJ_SUCCESS)
         return status;
 
@@ -1518 +1532 @@
                            srtp->keying_cnt, i);
             srtp->keying_cnt--;
-            last_err_st = status;
+            keying_status = status;
             continue;
         }
@@ -1542 +1556 @@
     /* All keying method failed to process remote SDP? */
     if (srtp->keying_cnt == 0)
-        return last_err_st;
+        return keying_status;
 
     /* If SRTP key is being negotiated, just return now.
@@ -1624 +1638 @@
 
 #endif
-
-