Changeset 3219 for pjproject/trunk/pjmedia/src/pjmedia/transport_srtp.c

Timestamp:

Jun 23, 2010 12:38:28 PM (14 years ago)

Author:

bennylp

Message:

Fixed #1079 (Media transport should be kept alive during double-hold scenario). Details:

• now the stream will be destroyed but the media transport will be kept alive during doublehold scenario
• small fix in SRTP to also negotiate crypto even when the media is marked as inactive, otherwise it's possible that an "optional" endpoint would create RTP/AVP offer and send it to "mandatory" endpoint, which would be rejected and cause the media port to be set to zero

File:

• pjproject/trunk/pjmedia/src/pjmedia/transport_srtp.c (modified) (1 diff)

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

@@ -1166 +1166 @@
 
     /* If the media is inactive, do nothing. */
+    /* No, we still need to process SRTP offer/answer even if the media is
+     * marked as inactive, because the transport is still alive in this
+     * case (e.g. for keep-alive). See:
+     *   http://trac.pjsip.org/repos/ticket/1079
+     */
+    /*
     if (pjmedia_sdp_media_find_attr(m_loc, &ID_INACTIVE, NULL) || 
         (m_rem && pjmedia_sdp_media_find_attr(m_rem, &ID_INACTIVE, NULL)))
         goto BYPASS_SRTP;
+    */
 
     /* Check remote media transport & set local media transport