Changeset 5755 for pjproject/trunk/pjsip/include/pjsua2/call.hpp

Timestamp:

Mar 15, 2018 3:00:59 AM (6 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/pjsip/include/pjsua2/call.hpp (modified) (2 diffs)

pjproject/trunk/pjsip/include/pjsua2/call.hpp

@@ -965 +965 @@
      */
     unsigned        flags;
-};
-
-/**
- * SRTP crypto.
- */
-struct SrtpCrypto
-{
-    /**
-     * Optional key. If empty, a random key will be autogenerated.
-     */
-    string      key;
-
-    /**
-     * Crypto name.
-     */
-    string      name;
-
-    /**
-     * Flags, bitmask from #pjmedia_srtp_crypto_option
-     */
-    unsigned    flags;
 };
 
@@ -1808 +1787 @@
 
     /**
+     * Warning: deprecated and may be removed in future release.
+     * Application can set SRTP crypto settings (including keys) and
+     * keying methods via AccountConfig.mediaConfig.srtpOpt.
+     * See also ticket #2100.
+     *
      * This callback is called when SRTP media transport is created.
      * Application can modify the SRTP setting \a srtpOpt to specify