Skip to content
Snippets Groups Projects
Commit 47cb2370 authored by Stepan Salenikovich's avatar Stepan Salenikovich
Browse files

daemon: add missing ring account params

Read-only params which can be read by RingAccount::getAccountDetails():
SRTP.endable
SRTP.keyExchange
SRTP.rtpFallback
TLS.method
TLS.serverName
TLS.negotiationTimeoutSec
TLS.ciphers
TLS.verifyServer
TLS.verifyClient
TLS.requireCilentCertificate

Refs #72819

Change-Id: Ic375cfb95ad4caa8c67e63a728fe57cfd573b44b
parent 78a32cee
No related branches found
No related tags found
No related merge requests found
...@@ -509,6 +509,22 @@ std::map<std::string, std::string> RingAccount::getAccountDetails() const ...@@ -509,6 +509,22 @@ std::map<std::string, std::string> RingAccount::getAccountDetails() const
{ {
std::map<std::string, std::string> a = SIPAccountBase::getAccountDetails(); std::map<std::string, std::string> a = SIPAccountBase::getAccountDetails();
a.emplace(Conf::CONFIG_DHT_PORT, ring::to_string(dhtPort_)); a.emplace(Conf::CONFIG_DHT_PORT, ring::to_string(dhtPort_));
/* these settings cannot be changed (read only), but clients should still be
* able to read what they are */
a.emplace(Conf::CONFIG_SRTP_KEY_EXCHANGE, sip_utils::getKeyExchangeName(getSrtpKeyExchange()));
a.emplace(Conf::CONFIG_SRTP_ENABLE, isSrtpEnabled() ? TRUE_STR : FALSE_STR);
a.emplace(Conf::CONFIG_SRTP_RTP_FALLBACK, getSrtpFallback() ? TRUE_STR : FALSE_STR);
a.emplace(Conf::CONFIG_TLS_METHOD, "Automatic");
a.emplace(Conf::CONFIG_TLS_CIPHERS, "");
a.emplace(Conf::CONFIG_TLS_SERVER_NAME, "");
a.emplace(Conf::CONFIG_TLS_VERIFY_SERVER, TRUE_STR);
a.emplace(Conf::CONFIG_TLS_VERIFY_CLIENT, TRUE_STR);
a.emplace(Conf::CONFIG_TLS_REQUIRE_CLIENT_CERTIFICATE, TRUE_STR);
/* GNUTLS_DEFAULT_HANDSHAKE_TIMEOUT is defined as -1 */
a.emplace(Conf::CONFIG_TLS_NEGOTIATION_TIMEOUT_SEC, "-1");
return a; return a;
} }
......
...@@ -237,6 +237,10 @@ class RingAccount : public SIPAccountBase { ...@@ -237,6 +237,10 @@ class RingAccount : public SIPAccountBase {
return true; return true;
} }
virtual bool isSrtpEnabled() const {
return true;
}
virtual sip_utils::KeyExchangeProtocol getSrtpKeyExchange() const { virtual sip_utils::KeyExchangeProtocol getSrtpKeyExchange() const {
return sip_utils::KeyExchangeProtocol::SDES; return sip_utils::KeyExchangeProtocol::SDES;
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment