Commit cd11af96 authored by Guillaume Roguez's avatar Guillaume Roguez

Revert "ring: use turn.ring.cx as default TURN server"

We're facing a PJSIP issue when forcing a TURN server in case
of unavailability of this last.
So we prefer to revert this patch until we found a solution
for solving that.

This reverts commit bd2d9d27.
Reviewed-by: default avatarAlexandre Viau <alexandre.viau@savoirfairelinux.com>
Change-Id: I8ee88ae237a1ce56b74371cb513c7f98af1a5399
parent 7ea2e352
...@@ -79,10 +79,6 @@ static constexpr auto ICE_NEGOTIATION_TIMEOUT = std::chrono::seconds(60); ...@@ -79,10 +79,6 @@ static constexpr auto ICE_NEGOTIATION_TIMEOUT = std::chrono::seconds(60);
static constexpr auto TLS_TIMEOUT = std::chrono::seconds(30); static constexpr auto TLS_TIMEOUT = std::chrono::seconds(30);
static constexpr const char * const RING_URI_PREFIX = "ring:"; static constexpr const char * const RING_URI_PREFIX = "ring:";
static constexpr const char * DEFAULT_TURN_SERVER = "turn.ring.cx";
static constexpr const char * DEFAULT_TURN_USERNAME = "ring";
static constexpr const char * DEFAULT_TURN_PWD = "ring";
static constexpr const char * DEFAULT_TURN_REALM = "ring";
constexpr const char * const RingAccount::ACCOUNT_TYPE; constexpr const char * const RingAccount::ACCOUNT_TYPE;
/* constexpr */ const std::pair<uint16_t, uint16_t> RingAccount::DHT_PORT_RANGE {4000, 8888}; /* constexpr */ const std::pair<uint16_t, uint16_t> RingAccount::DHT_PORT_RANGE {4000, 8888};
...@@ -146,13 +142,6 @@ RingAccount::RingAccount(const std::string& accountID, bool /* presenceEnabled * ...@@ -146,13 +142,6 @@ RingAccount::RingAccount(const std::string& accountID, bool /* presenceEnabled *
cachePath_ = fileutils::get_cache_dir()+DIR_SEPARATOR_STR+getAccountID(); cachePath_ = fileutils::get_cache_dir()+DIR_SEPARATOR_STR+getAccountID();
dataPath_ = cachePath_ + DIR_SEPARATOR_STR "values"; dataPath_ = cachePath_ + DIR_SEPARATOR_STR "values";
idPath_ = fileutils::get_data_dir()+DIR_SEPARATOR_STR+getAccountID(); idPath_ = fileutils::get_data_dir()+DIR_SEPARATOR_STR+getAccountID();
// Force the SFL turn server if none provided yet
turnServer_ = DEFAULT_TURN_SERVER;
turnServerUserName_ = DEFAULT_TURN_USERNAME;
turnServerPwd_ = DEFAULT_TURN_PWD;
turnServerRealm_ = DEFAULT_TURN_REALM;
turnEnabled_ = true;
} }
RingAccount::~RingAccount() RingAccount::~RingAccount()
...@@ -536,7 +525,6 @@ void ...@@ -536,7 +525,6 @@ void
RingAccount::setAccountDetails(const std::map<std::string, std::string> &details) RingAccount::setAccountDetails(const std::map<std::string, std::string> &details)
{ {
SIPAccountBase::setAccountDetails(details); SIPAccountBase::setAccountDetails(details);
if (hostname_.empty()) if (hostname_.empty())
hostname_ = DHT_DEFAULT_BOOTSTRAP; hostname_ = DHT_DEFAULT_BOOTSTRAP;
parseInt(details, Conf::CONFIG_DHT_PORT, dhtPort_); parseInt(details, Conf::CONFIG_DHT_PORT, dhtPort_);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment