Changeset 5755 for pjproject/trunk/pjsip/src/pjsua2/endpoint.cpp

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/pjsip/src/pjsua2/endpoint.cpp (modified) (2 diffs)

pjproject/trunk/pjsip/src/pjsua2/endpoint.cpp

@@ -1092 +1092 @@
     prm.stream = param->stream;
     prm.streamIdx = param->stream_idx;
-    prm.destroyPort = param->destroy_port;
+    prm.destroyPort = (param->destroy_port != PJ_FALSE);
     prm.pPort = (MediaPort)param->port;
     
@@ -2082 +2082 @@
 }
 
+/*
+ * Enumerate all SRTP crypto-suite names.
+ */
+StringVector Endpoint::srtpCryptoEnum() throw(Error)
+{
+    unsigned cnt = PJMEDIA_SRTP_MAX_CRYPTOS;
+    pjmedia_srtp_crypto cryptos[PJMEDIA_SRTP_MAX_CRYPTOS];
+    StringVector result;
+
+    PJSUA2_CHECK_EXPR(pjmedia_srtp_enum_crypto(&cnt, cryptos));
+
+    for (unsigned i = 0; i < cnt; ++i)
+        result.push_back(pj2Str(cryptos[i].name));
+
+    return result;
+}
+
 void Endpoint::handleIpChange(const IpChangeParam &param) throw(Error)
 {