Changeset 5755 for pjproject/trunk/pjmedia/src/pjmedia/transport_srtp_dtls.c

Timestamp:

Mar 15, 2018 3:00:59 AM (7 years ago)

Author:

nanang

Message:

Close #2100:

• Added new APIs:
  • PJMEDIA: pjmedia_srtp_enum_crypto(), pjmedia_srtp_enum_keying()
  • PJSUA: pjsua_config.srtp_opt, pjsua_acc_config.srtp_opt, pjsua_srtp_opt_default()
  • PJSUA2: AccountMediaConfig::srtpOpt, Endpoint::srtpCryptoEnum()
• Deprecated PJSUA callback on_create_media_transport_srtp() (not removed yet, just warnings).
• Slightly refactored SRTP code:
  • Fixed potential issue with on_create_media_transport_srtp(), some PJSUA internal values in pjmedia_srtp_setting may be overridden by app.
  • Fixed few issues in SRTP and keying mechanism, e.g: premature local SDP modification (it should be done after verification).
  • Potential minor backward compatibility issue: default value of pjmedia_srtp_setting.crypto_count is now zero, previously it was initialized with all crypto via pjmedia_srtp_setting_default(), actually zero and all cryptos in this setting semantically are the same.

File:

• pjproject/trunk/pjmedia/src/pjmedia/transport_srtp_dtls.c (modified) (2 diffs)

pjproject/trunk/pjmedia/src/pjmedia/transport_srtp_dtls.c

@@ -1016 +1016 @@
          */
         pjmedia_sdp_media *m_rem = sdp_remote->media[media_index];
+        pjmedia_sdp_attr *attr_setup;
 
         if (pj_stricmp(&m_rem->desc.transport, &ID_TP_DTLS_SRTP)!=0) {
@@ -1021 +1022 @@
             status = PJMEDIA_SRTP_ESDPINTRANSPORT;
             goto on_return;
+        }
+
+        /* Check for a=setup in remote SDP. */
+        attr_setup = pjmedia_sdp_media_find_attr(m_rem, &ID_SETUP, NULL);
+        if (!attr_setup)
+            attr_setup = pjmedia_sdp_attr_find(sdp_remote->attr_count,
+                                      sdp_remote->attr, &ID_SETUP, NULL);
+        switch (ds->srtp->setting.use) {
+            case PJMEDIA_SRTP_DISABLED:
+                if (attr_setup)
+                    return PJMEDIA_SRTP_ESDPINTRANSPORT;
+                break;
+            case PJMEDIA_SRTP_OPTIONAL:
+                break;
+            case PJMEDIA_SRTP_MANDATORY:
+                if (!attr_setup)
+                    return PJMEDIA_SRTP_ESDPINTRANSPORT;
+                break;
         }
     }