Skip to content
Snippets Groups Projects
Commit 64d5a670 authored by Sébastien Blin's avatar Sébastien Blin Committed by Adrien Béraud
Browse files

dring: remove unused getTlsDefaultSettings

Change-Id: I1173c7d3a5cc35dc28f3077404cdade6f08354f0
parent 36966f4c
Branches
No related tags found
No related merge requests found
...@@ -1202,12 +1202,6 @@ ...@@ -1202,12 +1202,6 @@
</arg> </arg>
</method> </method>
<method name="getTlsDefaultSettings" tp:name-for-bindings="getTlsDefaultSettings">
<annotation name="org.qtproject.QtDBus.QtTypeName.Out0" value="MapStringString"/>
<arg type="a{ss}" name="details" direction="out">
</arg>
</method>
<method name="validateCertificate" tp:name-for-bindings="validateCertificate"> <method name="validateCertificate" tp:name-for-bindings="validateCertificate">
<arg type="s" name="accountId" direction="in"></arg> <arg type="s" name="accountId" direction="in"></arg>
<arg type="s" name="certificate" direction="in"> <arg type="s" name="certificate" direction="in">
......
...@@ -204,12 +204,6 @@ DBusConfigurationManager::setMessageDisplayed(const std::string& accountID, cons ...@@ -204,12 +204,6 @@ DBusConfigurationManager::setMessageDisplayed(const std::string& accountID, cons
return DRing::setMessageDisplayed(accountID, contactId, messageId, status); return DRing::setMessageDisplayed(accountID, contactId, messageId, status);
} }
auto
DBusConfigurationManager::getTlsDefaultSettings() -> decltype(DRing::getTlsDefaultSettings())
{
return DRing::getTlsDefaultSettings();
}
auto auto
DBusConfigurationManager::getCodecList() -> decltype(DRing::getCodecList()) DBusConfigurationManager::getCodecList() -> decltype(DRing::getCodecList())
{ {
......
...@@ -91,7 +91,6 @@ class DRING_PUBLIC DBusConfigurationManager : ...@@ -91,7 +91,6 @@ class DRING_PUBLIC DBusConfigurationManager :
bool cancelMessage(const std::string& accountID, const uint64_t& messageId); bool cancelMessage(const std::string& accountID, const uint64_t& messageId);
void setIsComposing(const std::string& accountID, const std::string& to, const bool& isWriting); void setIsComposing(const std::string& accountID, const std::string& to, const bool& isWriting);
bool setMessageDisplayed(const std::string& accountID, const std::string& contactId, const std::string& messageId, const int32_t& status); bool setMessageDisplayed(const std::string& accountID, const std::string& contactId, const std::string& messageId, const int32_t& status);
std::map<std::string, std::string> getTlsDefaultSettings();
std::vector<std::string> getSupportedCiphers(const std::string& accountID); std::vector<std::string> getSupportedCiphers(const std::string& accountID);
std::vector<unsigned> getCodecList(); std::vector<unsigned> getCodecList();
std::vector<std::string> getSupportedTlsMethod(); std::vector<std::string> getSupportedTlsMethod();
......
...@@ -105,8 +105,6 @@ bool lookupAddress(const std::string& account, const std::string& nameserver, co ...@@ -105,8 +105,6 @@ bool lookupAddress(const std::string& account, const std::string& nameserver, co
bool registerName(const std::string& account, const std::string& password, const std::string& name); bool registerName(const std::string& account, const std::string& password, const std::string& name);
bool searchUser(const std::string& account, const std::string& query); bool searchUser(const std::string& account, const std::string& query);
std::map<std::string, std::string> getTlsDefaultSettings();
std::vector<unsigned> getCodecList(); std::vector<unsigned> getCodecList();
std::vector<std::string> getSupportedTlsMethod(); std::vector<std::string> getSupportedTlsMethod();
std::vector<std::string> getSupportedCiphers(const std::string& accountID); std::vector<std::string> getSupportedCiphers(const std::string& accountID);
......
...@@ -96,8 +96,6 @@ bool lookupAddress(const std::string& account, const std::string& nameserver, co ...@@ -96,8 +96,6 @@ bool lookupAddress(const std::string& account, const std::string& nameserver, co
bool registerName(const std::string& account, const std::string& password, const std::string& name); bool registerName(const std::string& account, const std::string& password, const std::string& name);
bool searchUser(const std::string& account, const std::string& query); bool searchUser(const std::string& account, const std::string& query);
std::map<std::string, std::string> getTlsDefaultSettings();
std::vector<unsigned> getCodecList(); std::vector<unsigned> getCodecList();
std::vector<std::string> getSupportedTlsMethod(); std::vector<std::string> getSupportedTlsMethod();
std::vector<std::string> getSupportedCiphers(const std::string& accountID); std::vector<std::string> getSupportedCiphers(const std::string& accountID);
......
...@@ -96,26 +96,6 @@ testAccountICEInitialization(const std::string& accountID) ...@@ -96,26 +96,6 @@ testAccountICEInitialization(const std::string& accountID)
return jami::Manager::instance().testAccountICEInitialization(accountID); return jami::Manager::instance().testAccountICEInitialization(accountID);
} }
std::map<std::string, std::string>
getTlsDefaultSettings()
{
std::stringstream portstr;
portstr << jami::sip_utils::DEFAULT_SIP_TLS_PORT;
return {{jami::Conf::CONFIG_TLS_LISTENER_PORT, portstr.str()},
{jami::Conf::CONFIG_TLS_CA_LIST_FILE, ""},
{jami::Conf::CONFIG_TLS_CERTIFICATE_FILE, ""},
{jami::Conf::CONFIG_TLS_PRIVATE_KEY_FILE, ""},
{jami::Conf::CONFIG_TLS_PASSWORD, ""},
{jami::Conf::CONFIG_TLS_METHOD, "Default"},
{jami::Conf::CONFIG_TLS_CIPHERS, ""},
{jami::Conf::CONFIG_TLS_SERVER_NAME, ""},
{jami::Conf::CONFIG_TLS_VERIFY_SERVER, "true"},
{jami::Conf::CONFIG_TLS_VERIFY_CLIENT, "true"},
{jami::Conf::CONFIG_TLS_REQUIRE_CLIENT_CERTIFICATE, "true"},
{jami::Conf::CONFIG_TLS_NEGOTIATION_TIMEOUT_SEC, "2"}};
}
std::map<std::string, std::string> std::map<std::string, std::string>
validateCertificate(const std::string&, const std::string& certificate) validateCertificate(const std::string&, const std::string& certificate)
{ {
......
...@@ -109,8 +109,6 @@ DRING_PUBLIC bool setMessageDisplayed(const std::string& accountID, ...@@ -109,8 +109,6 @@ DRING_PUBLIC bool setMessageDisplayed(const std::string& accountID,
const std::string& messageId, const std::string& messageId,
int status); int status);
DRING_PUBLIC std::map<std::string, std::string> getTlsDefaultSettings();
DRING_PUBLIC std::vector<unsigned> getCodecList(); DRING_PUBLIC std::vector<unsigned> getCodecList();
DRING_PUBLIC std::vector<std::string> getSupportedTlsMethod(); DRING_PUBLIC std::vector<std::string> getSupportedTlsMethod();
DRING_PUBLIC std::vector<std::string> getSupportedCiphers(const std::string& accountID); DRING_PUBLIC std::vector<std::string> getSupportedCiphers(const std::string& accountID);
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment