Changeset 5755 for pjproject/trunk/pjsip/include/pjsua2/account.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/account.hpp (modified) (2 diffs)

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

@@ -704 +704 @@
 
 /**
+ * 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;
+
+public:
+    /**
+     * Convert from pjsip
+     */
+    void fromPj(const pjmedia_srtp_crypto &prm);
+
+    /**
+     * Convert to pjsip
+     */
+    pjmedia_srtp_crypto toPj() const;
+};
+
+struct SrtpOpt : public PersistentObject
+{
+    /**
+     * Specify SRTP cryptos. If empty, all crypto will be enabled.
+     * Available crypto can be enumerated using Endpoint::srtpCryptoEnum().
+     *
+     * Default: empty.
+     */
+    vector<SrtpCrypto>          cryptos;
+
+    /**
+     * Specify SRTP keying methods, valid keying method is defined in
+     * pjmedia_srtp_keying_method. If empty, all keying methods will be
+     * enabled with priority order: SDES, DTLS-SRTP.
+     *
+     * Default: empty.
+     */
+    IntVector                   keyings;
+
+public:
+    /**
+     * Default constructor initializes with default values.
+     */
+    SrtpOpt();
+
+    /**
+     * Convert from pjsip
+     */
+    void fromPj(const pjsua_srtp_opt &prm);
+
+    /**
+     * Convert to pjsip
+     */
+    pjsua_srtp_opt toPj() const;
+
+public:
+    /**
+     * Read this object from a container node.
+     *
+     * @param node              Container to read values from.
+     */
+    virtual void readObject(const ContainerNode &node) throw(Error);
+
+    /**
+     * Write this object to a container node.
+     *
+     * @param node              Container to write values to.
+     */
+    virtual void writeObject(ContainerNode &node) const throw(Error);
+};
+
+/**
  * Account media config (applicable for both audio and video). This will be
  * specified in AccountConfig.
@@ -753 +836 @@
      */
     int                 srtpSecureSignaling;
+
+    /**
+     * Specify SRTP settings, like cryptos and keying methods.
+     */
+    SrtpOpt             srtpOpt;
 
     /**