Changeset 3384 for pjproject/trunk

Timestamp:

Dec 2, 2010 10:56:27 AM (14 years ago)

Author:

nanang

Message:

Re #1165: fixed SRTP transport to not update the SRTP activation flag, i.e: bypass_srtp, in transport_encode_sdp(), as it shouldn't change the media session states.

File:

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

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

@@ -349 +349 @@
 
 
+static pj_bool_t srtp_crypto_empty(const pjmedia_srtp_crypto* c)
+{
+    return (c->name.slen==0 || c->key.slen==0);
+}
+
+
 PJ_DEF(void) pjmedia_srtp_setting_default(pjmedia_srtp_setting *opt)
 {
@@ -1223 +1229 @@
     PJ_ASSERT_RETURN(tp && sdp_pool && sdp_local, PJ_EINVAL);
     
+    pj_bzero(&srtp->rx_policy_neg, sizeof(srtp->rx_policy_neg));
+    pj_bzero(&srtp->tx_policy_neg, sizeof(srtp->tx_policy_neg));
+
     srtp->offerer_side = sdp_remote == NULL;
-    srtp->bypass_srtp = PJ_FALSE;
 
     m_rem = sdp_remote ? sdp_remote->media[media_index] : NULL;
@@ -1436 +1444 @@
 
 BYPASS_SRTP:
-    srtp->bypass_srtp = PJ_TRUE;
+    /* Do not update this flag here as actually the media session hasn't been
+     * updated.
+     */
+    //srtp->bypass_srtp = PJ_TRUE;
 
 PROPAGATE_MEDIA_CREATE:
@@ -1457 +1468 @@
 
     PJ_ASSERT_RETURN(tp && pool && sdp_local && sdp_remote, PJ_EINVAL);
-
-    if (srtp->bypass_srtp)
-        goto BYPASS_SRTP;
 
     m_rem = sdp_remote->media[media_index];
@@ -1556 +1564 @@
     }
 
+    /* Make sure we have the SRTP policies */
+    if (srtp_crypto_empty(&srtp->tx_policy_neg) || 
+        srtp_crypto_empty(&srtp->rx_policy_neg))
+    {
+        goto BYPASS_SRTP;
+    }
+
     /* Reset probation counts */
     srtp->probation_cnt = PROBATION_CNT_INIT;
@@ -1575 +1590 @@
     }
 
+    srtp->bypass_srtp = PJ_FALSE;
+
     goto PROPAGATE_MEDIA_START;