Changeset 3376 for pjproject

Timestamp:

Dec 1, 2010 8:20:28 AM (14 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.

Location:

pjproject/trunk

Files:

• pjmedia/src/pjmedia/transport_srtp.c (modified) (3 diffs)
• pjsip/src/pjsua-lib/pjsua_media.c (modified) (2 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:

pjproject/trunk/pjsip/src/pjsua-lib/pjsua_media.c

@@ -1248 +1248 @@
 
 #if defined(PJMEDIA_HAS_SRTP) && (PJMEDIA_HAS_SRTP != 0)
-        srtp_active = acc->cfg.use_srtp && srtp != NULL;
+        srtp_active = acc->cfg.use_srtp;
 #else
         srtp_active = PJ_FALSE;
@@ -1300 +1300 @@
     if (call->med_tp == NULL) {
         return PJ_EBUSY;
+    }
+
+    if (rem_sdp && rem_sdp->media_count != 0) {
+        pj_bool_t srtp_active;
+
+#if defined(PJMEDIA_HAS_SRTP) && (PJMEDIA_HAS_SRTP != 0)
+        srtp_active = pjsua_var.acc[call->acc_id].cfg.use_srtp;
+#else
+        srtp_active = PJ_FALSE;
+#endif
+
+        call->audio_idx = find_audio_index(rem_sdp, srtp_active);
     }