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

Timestamp:

Dec 1, 2010 8:20:28 AM (13 years ago)

Author:

nanang

Message:

Fix #1165:

• Fixed pjsua_media_channel_create_sdp() to re-calculate audio index of the remote offer, instead of using existing audio index calculated by pjsua_media_channel_init(), as for subsequent SDP offer/answer, pjsua_media_channel_init() may not be called.
• Fixed SRTP transport to be able to switch SRTP status from active to inactive/by-passed and vice versa.

File:

• pjproject/trunk/pjmedia/src/pjmedia/transport_srtp.c (modified) (3 diffs)

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

@@ -646 +646 @@
 
     p_srtp->session_inited = PJ_FALSE;
+    pj_bzero(&p_srtp->rx_policy, sizeof(p_srtp->rx_policy));
+    pj_bzero(&p_srtp->tx_policy, sizeof(p_srtp->tx_policy));
 
     pj_lock_release(p_srtp->mutex);
@@ -1222 +1224 @@
     
     srtp->offerer_side = sdp_remote == NULL;
+    srtp->bypass_srtp = PJ_FALSE;
 
     m_rem = sdp_remote ? sdp_remote->media[media_index] : NULL;
@@ -1577 +1580 @@
     srtp->bypass_srtp = PJ_TRUE;
     srtp->peer_use = PJMEDIA_SRTP_DISABLED;
+    if (srtp->session_inited) {
+        pjmedia_transport_srtp_stop(tp);
+    }
 
 PROPAGATE_MEDIA_START: