Changeset 6115

Timestamp:

Dec 4, 2019 9:01:19 AM (5 years ago)

Author:

nanang

Message:

Fix #2254: Updated SDP encoder of SDES to avoid deactivating/disabling media, it should be done by the parent/SRTP instead.

Location:

pjproject/trunk

Files:

• pjmedia/src/pjmedia/transport_srtp.c (modified) (1 diff)
• pjmedia/src/pjmedia/transport_srtp_sdes.c (modified) (4 diffs)
• tests/pjsua/scripts-sipp/uac-srtp-dtls-lower-prio.py (added)
• tests/pjsua/scripts-sipp/uac-srtp-dtls-lower-prio.xml (added)

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

@@ -1641 +1641 @@
 
     /* All keying method failed to process remote SDP? */
-    if (srtp->keying_cnt == 0)
+    if (srtp->keying_cnt == 0) {
+        if (keying_status != PJ_SUCCESS) {
+            DEACTIVATE_MEDIA(sdp_pool, sdp_local->media[media_index]);
+        }
         return keying_status;
+    }
 
     /* Bypass SRTP & skip keying as SRTP is disabled and verification on

pjproject/trunk/pjmedia/src/pjmedia/transport_srtp_sdes.c

@@ -473 +473 @@
                 for (j=0; j<cr_attr_count; ++j) {
                     if (tags[j] == tags[cr_attr_count]) {
-                        DEACTIVATE_MEDIA(sdp_pool, m_loc);
+                        //DEACTIVATE_MEDIA(sdp_pool, m_loc);
                         return PJMEDIA_SRTP_ESDPDUPCRYPTOTAG;
                     }
@@ -514 +514 @@
                      */
                     if ((!has_crypto_attr || matched_idx == -1) &&
-                        rem_proto == PJMEDIA_TP_PROTO_RTP_AVP)
+                        !PJMEDIA_TP_PROTO_HAS_FLAG(rem_proto,
+                                                   PJMEDIA_TP_PROFILE_SRTP))
                     {
                         return PJ_SUCCESS;
@@ -527 +528 @@
             /* No crypto attr */
             if (!has_crypto_attr) {
-                DEACTIVATE_MEDIA(sdp_pool, m_loc);
+                //DEACTIVATE_MEDIA(sdp_pool, m_loc);
                 return PJMEDIA_SRTP_ESDPREQCRYPTO;
             }
@@ -533 +534 @@
             /* No crypto match */
             if (matched_idx == -1) {
-                DEACTIVATE_MEDIA(sdp_pool, m_loc);
+                //DEACTIVATE_MEDIA(sdp_pool, m_loc);
                 return PJMEDIA_SRTP_ENOTSUPCRYPTO;
             }