Changeset 5103 for pjproject/trunk

Timestamp:

Jun 1, 2015 3:44:16 AM (9 years ago)

Author:

nanang

Message:

Close #1856: Offer only current active crypto on re-INVITE.

File:

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

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

@@ -1364 +1364 @@
         /* Generate crypto attribute if not yet */
         if (pjmedia_sdp_media_find_attr(m_loc, &ID_CRYPTO, NULL) == NULL) {
+            /* Offer only current active crypto if any, otherwise offer all
+             * crypto-suites in the setting.
+             */
             for (i=0; i<srtp->setting.crypto_count; ++i) {
-                /* Offer crypto-suites based on setting. */
+                if (srtp->tx_policy.name.slen &&
+                    pj_stricmp(&srtp->tx_policy.name,
+                               &srtp->setting.crypto[i].name) != 0)
+                {
+                    continue;
+                }
+
                 buffer_len = MAXLEN;
                 status = generate_crypto_attr_value(srtp->pool, buffer, &buffer_len,