diff --git a/sflphone-common/src/account.cpp b/sflphone-common/src/account.cpp
index 67fbe9589a4b38d7be50d5e28ac3c71f58722361..c82915b40cc167d25e0683d526bf02ed08e6c990 100644
--- a/sflphone-common/src/account.cpp
+++ b/sflphone-common/src/account.cpp
@@ -68,9 +68,7 @@ void Account::loadConfig()
void Account::setRegistrationState (RegistrationState state)
{
-
if (state != _registrationState) {
- _debug ("Account: set registration state");
_registrationState = state;
// Notify the client
@@ -100,8 +98,6 @@ void Account::loadDefaultCodecs()
void Account::setActiveCodecs (const std::vector <std::string> &list)
{
- _debug ("Account: Set active codec");
-
// first clear the previously stored codecs
_codecOrder.clear();
@@ -113,7 +109,6 @@ void Account::setActiveCodecs (const std::vector <std::string> &list)
while ( (unsigned int) i < size) {
payload = std::atoi (list[i].data());
- _info ("Account: Adding codec with RTP payload type %d", payload);
_codecOrder.push_back ( (AudioCodecType) payload);
i++;
}
diff --git a/sflphone-common/src/audio/audiortp/AudioRtpSession.cpp b/sflphone-common/src/audio/audiortp/AudioRtpSession.cpp
index 7ad415b7a1a38d756fe89aca6dfe0befc1a0bdf8..afcce72cca592ab873cb7b8197d38d77ef097c60 100644
--- a/sflphone-common/src/audio/audiortp/AudioRtpSession.cpp
+++ b/sflphone-common/src/audio/audiortp/AudioRtpSession.cpp
@@ -180,7 +180,6 @@ void AudioRtpSession::setDestinationIpAddress (void)
// Store remote ip in case we would need to forget current destination
_remote_ip = ost::InetHostAddress (_ca->getLocalSDP()->getRemoteIP().c_str());
-
if (!_remote_ip) {
_warn ("AudioRtpSession: Target IP address (%s) is not correct!",
_ca->getLocalSDP()->getRemoteIP().data());
@@ -206,8 +205,10 @@ void AudioRtpSession::updateDestinationIpAddress (void)
// Destination address are stored in a list in ccrtp
// This method remove the current destination entry
- if (!forgetDestination (_remote_ip, _remote_port, _remote_port+1))
- _warn ("AudioRtpSession: Could not remove previous destination");
+ if (!forgetDestination (_remote_ip, _remote_port, _remote_port+1)) {
+ _warn ("AudioRtpSession: Could not remove previous destination: %s:%d",
+ inet_ntoa(_remote_ip.getAddress()), _remote_port);
+ }
// new destination is stored in call
// we just need to recall this method
diff --git a/sflphone-common/src/config/yamlemitter.cpp b/sflphone-common/src/config/yamlemitter.cpp
index 88e9b5b2b506491d65bae1548d0e30ca43d27d1b..30eacbb9b9b75d385adb2588f35fb4945314f35d 100644
--- a/sflphone-common/src/config/yamlemitter.cpp
+++ b/sflphone-common/src/config/yamlemitter.cpp
@@ -47,9 +47,6 @@ YamlEmitter::~YamlEmitter()
void YamlEmitter::open() throw(YamlEmitterException)
{
-
- _debug ("YamlEmiter: Open");
-
fd = fopen (filename.c_str(), "w");
if (!fd)
@@ -75,8 +72,6 @@ void YamlEmitter::open() throw(YamlEmitterException)
void YamlEmitter::close() throw(YamlEmitterException)
{
- _debug ("YamlEmitter: Close");
-
yaml_emitter_delete (&emitter);
if (!fd)
@@ -85,10 +80,6 @@ void YamlEmitter::close() throw(YamlEmitterException)
if (fclose (fd))
throw YamlEmitterException ("Error closing file descriptor");
-
-
- _debug ("YamlEmitter: Configuration file closed successfully");
-
}
void YamlEmitter::serializeData() throw(YamlEmitterException)
diff --git a/sflphone-common/src/config/yamlparser.cpp b/sflphone-common/src/config/yamlparser.cpp
index 9d3595786781dfbf9534d35a1b3549a8ba3fdb4f..5b6591eb48e9a7961796bae0c96e949492dbd719 100644
--- a/sflphone-common/src/config/yamlparser.cpp
+++ b/sflphone-common/src/config/yamlparser.cpp
@@ -507,31 +507,23 @@ void YamlParser::mainNativeDataMapping (MappingNode *map) throw(YamlParserExcept
while (iter != map->getMapping()->end()) {
- _debug ("Iterating: %s", iter->first.c_str());
-
if (accounts.compare (iter->first) == 0) {
- _debug ("YamlParser: Adding voip account preferences");
accountSequence = (SequenceNode *) (iter->second);
} else if (addressbook.compare (iter->first) == 0) {
- _debug ("YamlParser: Adding addressbook preference");
addressbookSequence = (SequenceNode *) (iter->second);
} else if (audio.compare (iter->first) == 0) {
- _debug ("YamlParser: Adding audio preference");
audioSequence = (SequenceNode *) (iter->second);
} else if (hooks.compare (iter->first) == 0) {
- _debug ("YamlParser: Adding hooks preference");
hooksSequence = (SequenceNode *) (iter->second);
} else if (preferences.compare (iter->first) == 0) {
- _debug ("YamlParser: Adding preference preference");
preferenceSequence = (SequenceNode *) (iter->second);
} else if (voiplink.compare (iter->first) == 0) {
- _debug ("YamlParser: Adding voip preference");
voiplinkSequence = (SequenceNode *) (iter->second);
} else if (shortcuts.compare (iter->first) == 0) {
- _debug ("YamlParser: Adding shortcut preference");
shortcutSequence = (SequenceNode *) (iter->second);
- } else
- throw YamlParserException ("Unknow map key in configuration");
+ } else {
+ throw YamlParserException ("Unknown map key in configuration");
+ }
iter++;
}
diff --git a/sflphone-common/src/dbus/configurationmanager.cpp b/sflphone-common/src/dbus/configurationmanager.cpp
index 59359e90851ce6b09f500c3a73154fe4e022f166..17c566c73557374970547076a0125ae2f75e0587 100644
--- a/sflphone-common/src/dbus/configurationmanager.cpp
+++ b/sflphone-common/src/dbus/configurationmanager.cpp
@@ -53,8 +53,6 @@ ConfigurationManager::ConfigurationManager (DBus::Connection& connection) :
std::map<std::string, std::string> ConfigurationManager::getAccountDetails (
const std::string& accountID)
{
-
- _debug ("ConfigurationManager: get account details %s", accountID.c_str());
return Manager::instance().getAccountDetails (accountID);
}
@@ -452,9 +450,6 @@ std::vector<std::string> ConfigurationManager::getCodecDetails (
std::vector<std::string> ConfigurationManager::getActiveCodecList (
const std::string& accountID)
{
-
- _debug ("Send active codec list for account %s", accountID.c_str ());
-
std::vector<std::string> v;
Account *acc;
CodecOrder active;
diff --git a/sflphone-common/src/iax/iaxaccount.cpp b/sflphone-common/src/iax/iaxaccount.cpp
index db698ff3909919a839e7cf319e6680f54cf906f2..d70d3c75161dd2e7228dafe3d5586ca5e3e510cf 100644
--- a/sflphone-common/src/iax/iaxaccount.cpp
+++ b/sflphone-common/src/iax/iaxaccount.cpp
@@ -3,6 +3,7 @@
*
* Author: Emmanuel Milou <emmanuel.milou@savoirfairelinux.com>
* Author: Alexandre Bourget <alexandre.bourget@savoirfairelinux.com>
+ * Author: Alexandre Savard <alexandre.savard@savoirfairelinux.com>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -49,7 +50,10 @@ IAXAccount::~IAXAccount()
void IAXAccount::serialize (Conf::YamlEmitter *emitter)
{
- _debug ("IaxAccount: serialize %s", _accountID.c_str());
+ if(emitter == NULL) {
+ _error("IAXAccount: Error: emitter is NULL in serialize");
+ return;
+ }
Conf::MappingNode accountmap (NULL);
@@ -88,7 +92,10 @@ void IAXAccount::unserialize (Conf::MappingNode *map)
{
Conf::ScalarNode *val;
- _debug ("IaxAccount: Unserialize");
+ if(map == NULL) {
+ _error("IAXAccount: Error: Map is NULL in unserialize");
+ return;
+ }
val = (Conf::ScalarNode *) (map->getValue (aliasKey));
@@ -170,8 +177,6 @@ void IAXAccount::setAccountDetails (const std::map<std::string, std::string>& de
std::map<std::string, std::string> map_cpy;
std::map<std::string, std::string>::iterator iter;
- _debug ("IaxAccount: Set account details: %s", _accountID.c_str());
-
// Work on a copy
map_cpy = details;
@@ -215,8 +220,6 @@ std::map<std::string, std::string> IAXAccount::getAccountDetails()
{
std::map<std::string, std::string> a;
- _debug ("IaxAccount: get account details %s", _accountID.c_str());
-
a.insert (std::pair<std::string, std::string> (ACCOUNT_ID, _accountID));
a.insert (std::pair<std::string, std::string> (CONFIG_ACCOUNT_ALIAS, getAlias()));
a.insert (std::pair<std::string, std::string> (CONFIG_ACCOUNT_ENABLE, isEnabled() ? "true" : "false"));
diff --git a/sflphone-common/src/managerimpl.cpp b/sflphone-common/src/managerimpl.cpp
index 95b088076286dc97aad2f8a23c20e5b16ad7c011..70f3420b75906bebe023d185391ab527d8ef8886 100644
--- a/sflphone-common/src/managerimpl.cpp
+++ b/sflphone-common/src/managerimpl.cpp
@@ -1521,8 +1521,6 @@ bool ManagerImpl::saveConfig (void)
continue;
}
- _debug ("Manager: Saving account: %s", iter->first.c_str());
-
iter->second->serialize (emitter);
iter++;
}
@@ -2476,7 +2474,6 @@ std::vector<std::string> ManagerImpl::unserialize (std::string s)
std::string ManagerImpl::serialize (std::vector<std::string> v)
{
-
unsigned int i;
std::string res;
@@ -3455,8 +3452,6 @@ std::map<std::string, std::string> ManagerImpl::getAccountDetails (
const AccountID& accountID)
{
- _debug ("Manager: get account details %s", accountID.c_str());
-
Account * account = _accountMap[accountID];
if (accountID.empty()) {
@@ -3823,8 +3818,10 @@ short ManagerImpl::loadAccountMap()
// Conf::YamlParser *parser;
int nbAccount = 0;
- if (!_setupLoaded)
- return 0;
+ if (!_setupLoaded) {
+ _error("Manager: Error: Configuration file not loaded yet, could not load config");
+ return 0;
+ }
// build preferences
preferences.unserialize ( (Conf::MappingNode *) (parser->getPreferenceSequence()));
@@ -3885,10 +3882,8 @@ short ManagerImpl::loadAccountMap()
// Create a default account for specific type
if (accountType == "SIP" && accountid != "IP2IP") {
- _debug ("Manager: Create SIP account: %s", accountid.c_str());
tmpAccount = AccountCreator::createAccount (AccountCreator::SIP_ACCOUNT, accountid);
} else if (accountType == "IAX" && accountid != "IP2IP") {
- _debug ("Manager: Create IAX account: %s", accountid.c_str());
tmpAccount = AccountCreator::createAccount (AccountCreator::IAX_ACCOUNT, accountid);
}
@@ -3903,7 +3898,6 @@ short ManagerImpl::loadAccountMap()
}
_accountMap[accountid] = tmpAccount;
- _debug ("Manager: Loading account %s (size %d)", accountid.c_str(), _accountMap.size());
tmpAccount->setVoIPLink();
nbAccount++;
@@ -3926,12 +3920,11 @@ short ManagerImpl::loadAccountMap()
void ManagerImpl::unloadAccountMap ()
{
+ _debug ("Manager: Unload account map");
+
AccountMap::iterator iter = _accountMap.begin();
while (iter != _accountMap.end()) {
-
- _debug ("Manager: Unloading account %s", iter->first.c_str());
-
// Avoid removing the IP2IP account twice
if (iter->first != "") {
delete iter->second;
@@ -3941,9 +3934,7 @@ void ManagerImpl::unloadAccountMap ()
iter++;
}
- _debug ("Manager: Clear account map");
_accountMap.clear();
- _debug ("Manager: Unload account map");
}
@@ -3965,7 +3956,6 @@ ManagerImpl::getAccount (const AccountID& accountID)
AccountMap::iterator iter = _accountMap.find (accountID);
if (iter != _accountMap.end()) {
- _debug ("Manager: Found account %s", iter->first.c_str());
return iter->second;
}
@@ -4093,7 +4083,6 @@ std::map<std::string, std::string> ManagerImpl::getHookSettings ()
void ManagerImpl::setHookSettings (const std::map<std::string, std::string>& settings)
{
- _debug ("Manager: Update hook settings");
hookPreference.setIax2Enabled ( (settings.find ("URLHOOK_IAX2_ENABLED")->second == "true") ? true : false);
hookPreference.setNumberAddPrefix (settings.find ("PHONE_NUMBER_HOOK_ADD_PREFIX")->second);
diff --git a/sflphone-common/src/managerimpl_registration.cpp b/sflphone-common/src/managerimpl_registration.cpp
index 8c842c237812839e286b86174c4a210ac3d8d19e..7ae6394817ae88d4ca9dd69181d6ba69efdaecda 100644
--- a/sflphone-common/src/managerimpl_registration.cpp
+++ b/sflphone-common/src/managerimpl_registration.cpp
@@ -257,6 +257,8 @@ ManagerImpl::sendRegister (const std::string& accountID , const int32_t& enable)
acc->loadConfig();
+ Manager::instance().saveConfig();
+
// Test on the freshly updated value
if (acc->isEnabled()) {
// Verify we aren't already registered, then register
diff --git a/sflphone-common/src/preferences.cpp b/sflphone-common/src/preferences.cpp
index dcc1a4fc7979fe1816cea77083f68d1bd7304278..6383157c732e1e46b04f9209b53bf01cb195eff6 100644
--- a/sflphone-common/src/preferences.cpp
+++ b/sflphone-common/src/preferences.cpp
@@ -54,9 +54,12 @@ Preferences::~Preferences() {}
void Preferences::serialize (Conf::YamlEmitter *emiter)
{
- _debug ("Preference: Serialize configuration");
+ if(emiter == NULL) {
+ _error("Preference: Error: emitter is NULL while serializing");
+ return;
+ }
- Conf::MappingNode preferencemap (NULL);
+ Conf::MappingNode preferencemap (NULL);
Conf::ScalarNode order (_accountOrder);
// std::stringstream audiostr;
@@ -97,13 +100,10 @@ void Preferences::serialize (Conf::YamlEmitter *emiter)
void Preferences::unserialize (Conf::MappingNode *map)
{
-
- _debug ("Preference: Unserialize configuration");
-
Conf::ScalarNode *val;
- if (!map) {
- _debug ("Preference: Did not find general preferences");
+ if (map == NULL) {
+ _error ("Preference: Error: Preference map is NULL");
return;
}
@@ -204,7 +204,10 @@ VoipPreference::~VoipPreference() {}
void VoipPreference::serialize (Conf::YamlEmitter *emitter)
{
- _debug ("VoipPreference: Serialize configuration");
+ if(emitter == NULL) {
+ _error("VoipPreference: Error: emitter is NULL while serializing");
+ return;
+ }
Conf::MappingNode preferencemap (NULL);
@@ -228,12 +231,10 @@ void VoipPreference::serialize (Conf::YamlEmitter *emitter)
void VoipPreference::unserialize (Conf::MappingNode *map)
{
- _debug ("VoipPreference: Unserialize configuration");
-
Conf::ScalarNode *val = NULL;
if (!map) {
- _debug ("VoipPreference: Did not find voip preference");
+ _error ("VoipPreference: Error: Preference map is NULL");
return;
}
@@ -291,7 +292,10 @@ AddressbookPreference::~AddressbookPreference() {}
void AddressbookPreference::serialize (Conf::YamlEmitter *emitter)
{
- _debug ("Addressbook: Serialize configuration");
+ if(emitter == NULL) {
+ _error("AddressbookPreference: Error: emitter is NULL while serializing");
+ return;
+ }
Conf::MappingNode preferencemap (NULL);
@@ -319,12 +323,10 @@ void AddressbookPreference::serialize (Conf::YamlEmitter *emitter)
void AddressbookPreference::unserialize (Conf::MappingNode *map)
{
- _debug ("Addressbook: Unserialize configuration");
-
Conf::ScalarNode *val = NULL;
if (!map) {
- _debug ("Addressbook: Did not find addressbook preferences");
+ _error ("Addressbook: Error: Preference map is NULL");
return;
}
@@ -394,7 +396,10 @@ HookPreference::~HookPreference() {}
void HookPreference::serialize (Conf::YamlEmitter *emitter)
{
- _debug ("Hook: Serialize configuration");
+ if(emitter == NULL) {
+ _error("HookPreference: Error: emitter is NULL while serializing");
+ return;
+ }
Conf::MappingNode preferencemap (NULL);
@@ -419,10 +424,8 @@ void HookPreference::unserialize (Conf::MappingNode *map)
{
Conf::ScalarNode *val = NULL;
- _debug ("Hook: Unserialize preference");
-
if (!map) {
- _debug ("Hook: Did not find hook preference");
+ _error ("Hook: Error: Preference map is NULL");
return;
}
@@ -494,7 +497,10 @@ AudioPreference::~AudioPreference() {}
void AudioPreference::serialize (Conf::YamlEmitter *emitter)
{
- _debug ("AudioPreference: Serialize configuration");
+ if(emitter == NULL) {
+ _error("AudioPreference: Error: emitter is NULL while serializing");
+ return;
+ }
Conf::MappingNode preferencemap (NULL);
Conf::MappingNode alsapreferencemap (NULL);
@@ -557,10 +563,8 @@ void AudioPreference::serialize (Conf::YamlEmitter *emitter)
void AudioPreference::unserialize (Conf::MappingNode *map)
{
- _debug ("AudioPreference: Unserialize configuration");
-
- if (!map) {
- _debug ("AudioPreference: Did not find audio preferences");
+ if (map == NULL) {
+ _error ("AudioPreference: Error: Preference map is NULL");
return;
}
@@ -709,12 +713,8 @@ std::map<std::string, std::string> ShortcutPreferences::getShortcuts()
void ShortcutPreferences::setShortcuts (std::map<std::string, std::string> map_cpy)
{
- // std::map<std::string, int> map_cpy = shortcut;
std::map<std::string, std::string>::iterator it;
- _debug ("ShortcutPreferences: Set shortcuts");
-
-
it = map_cpy.find (hangupShortKey);
if (it != map_cpy.end()) {
@@ -759,8 +759,10 @@ void ShortcutPreferences::setShortcuts (std::map<std::string, std::string> map_c
void ShortcutPreferences::serialize (Conf::YamlEmitter *emitter)
{
-
- _debug ("ShortcutPreference: Serialize configuration");
+ if(emitter == NULL) {
+ _error("ShortcutPreferences: Error: emitter is NULL while serializing");
+ return;
+ }
Conf::MappingNode preferencemap (NULL);
@@ -781,10 +783,8 @@ void ShortcutPreferences::serialize (Conf::YamlEmitter *emitter)
void ShortcutPreferences::unserialize (Conf::MappingNode *map)
{
- _debug ("ShortcutPreference: Unserialize shortcut");
-
- if (!map) {
- _debug ("ShortcutPreference: Could not find shortcut preferences");
+ if (map == NULL) {
+ _error ("ShortcutPreference: Error: Preference map is NULL");
return;
}
diff --git a/sflphone-common/src/sip/sdp.cpp b/sflphone-common/src/sip/sdp.cpp
index 6b295b9d21c0a93989bb04136025d0361da4e95f..765794dcf3f7e8d61c07c39dbe9807b078fdde31 100644
--- a/sflphone-common/src/sip/sdp.cpp
+++ b/sflphone-common/src/sip/sdp.cpp
@@ -300,7 +300,7 @@ int Sdp::createLocalSession (CodecOrder selectedCodecs)
memset(buffer, 0, 1000);
pjmedia_sdp_print(getLocalSdpSession(), buffer, 1000);
- _debug("SDP: Local SDP Session: %s\n\n", buffer);
+ _debug("SDP: Local SDP Session:\n%s", buffer);
// Validate the sdp session
return pjmedia_sdp_validate (localSession);
@@ -330,8 +330,6 @@ int Sdp::createOffer (CodecOrder selectedCodecs)
state = pjmedia_sdp_neg_get_state (negociator);
- _debug("SDP: Negociator state %s\n", pjmedia_sdp_neg_state_str(state));
-
PJ_ASSERT_RETURN (status == PJ_SUCCESS, 1);
return PJ_SUCCESS;
@@ -351,7 +349,7 @@ int Sdp::recieveOffer (const pjmedia_sdp_session* remote, CodecOrder selectedCod
memset(buffer, 0, 1000);
pjmedia_sdp_print(remote, buffer, 1000);
- _debug("SDP: Remote SDP Session: %s\n\n", buffer);
+ _debug("SDP: Remote SDP Session:\n%s", buffer);
// If called for the first time
if(localSession == NULL) {
@@ -389,7 +387,6 @@ int Sdp::receivingAnswerAfterInitialOffer(const pjmedia_sdp_session* remote)
if(pjmedia_sdp_neg_get_state(negociator) != PJMEDIA_SDP_NEG_STATE_WAIT_NEGO) {
_warn("SDP: Session not in a valid state after receiving answer");
}
- _debug("SDP: Negotiator state %s\n", pjmedia_sdp_neg_state_str(pjmedia_sdp_neg_get_state(negociator)));
return status;
}
@@ -437,8 +434,6 @@ pj_status_t Sdp::startNegociation()
return status;
}
- _debug("SDP: Negotiator state %s\n", pjmedia_sdp_neg_state_str(pjmedia_sdp_neg_get_state(negociator)));
-
status = pjmedia_sdp_neg_get_active_local(negociator, &active_local);
if(status != PJ_SUCCESS) {
_error("SDP: Could not retrieve local active session");
diff --git a/sflphone-common/src/sip/sipaccount.cpp b/sflphone-common/src/sip/sipaccount.cpp
index 52c7d49cd9cd0b3ace882309eab007659e6bafb1..628913d51b0bc046b80e237209882eb3d297ea90 100644
--- a/sflphone-common/src/sip/sipaccount.cpp
+++ b/sflphone-common/src/sip/sipaccount.cpp
@@ -66,8 +66,6 @@ void Credentials::unserialize (Conf::MappingNode *map)
Conf::ScalarNode *val = NULL;
- _debug ("SipAccount: Unserialize credentials");
-
val = (Conf::ScalarNode *) (map->getValue (credentialCountKey));
if (val) {
@@ -124,20 +122,9 @@ SIPAccount::SIPAccount (const AccountID& accountID)
, _zrtpHelloHash (true)
, _zrtpNotSuppWarning (true)
{
-
- _debug ("Sip account constructor for account %s", accountID.c_str());
-
_stunServerName.ptr = NULL;
_stunServerName.slen = 0;
_stunPort = 0;
-
- // IP2IP settings must be loaded before singleton instanciation, cannot call it here...
-
- // _link = SIPVoIPLink::instance ("");
-
- /* Represents the number of SIP accounts connected the same link */
- // dynamic_cast<SIPVoIPLink*> (_link)->incrementClients();
-
}
SIPAccount::~SIPAccount()
@@ -154,9 +141,10 @@ SIPAccount::~SIPAccount()
void SIPAccount::serialize (Conf::YamlEmitter *emitter)
{
-
- _debug ("SipAccount: serialize %s", _accountID.c_str());
-
+ if(emitter == NULL) {
+ _error("SIPAccount: Error: emitter is NULL in serialize");
+ return;
+ }
Conf::MappingNode accountmap (NULL);
Conf::MappingNode credentialmap (NULL);
@@ -289,7 +277,9 @@ void SIPAccount::unserialize (Conf::MappingNode *map)
Conf::MappingNode *zrtpMap;
Conf::MappingNode *credMap;
- _debug ("SipAccount: Unserialize %s", _accountID.c_str());
+ if(map == NULL) {
+ _error("SIPAccount: Error: map is NULL in SIPAccount");
+ }
val = (Conf::ScalarNode *) (map->getValue (aliasKey));
@@ -634,8 +624,6 @@ void SIPAccount::setAccountDetails (const std::map<std::string, std::string>& de
std::map<std::string, std::string> map_cpy;
std::map<std::string, std::string>::iterator iter;
- _debug ("SipAccount: set account details %s", _accountID.c_str());
-
// Work on a copy
map_cpy = details;
@@ -829,8 +817,6 @@ void SIPAccount::setAccountDetails (const std::map<std::string, std::string>& de
std::map<std::string, std::string> SIPAccount::getAccountDetails()
{
- _debug ("SipAccount: get account details %s", _accountID.c_str());
-
std::map<std::string, std::string> a;
a.insert (std::pair<std::string, std::string> (ACCOUNT_ID, _accountID));
@@ -946,8 +932,6 @@ void SIPAccount::setVoIPLink()
int SIPAccount::initCredential (void)
{
- _debug ("SipAccount: Init credential");
-
bool md5HashingEnabled = false;
int dataType = 0;
md5HashingEnabled = Manager::instance().preferences.getMd5Hash();
@@ -1030,8 +1014,6 @@ int SIPAccount::initCredential (void)
int SIPAccount::registerVoIPLink()
{
- _debug ("SIPAccount: Register account %s", getAccountID().c_str());
-
if (_hostname.length() >= PJ_MAX_HOSTNAME) {
return !SUCCESS;
}
@@ -1071,8 +1053,6 @@ int SIPAccount::registerVoIPLink()
int SIPAccount::unregisterVoIPLink()
{
- _debug ("SIPAccount: Unregister account %s" , getAccountID().c_str());
-
if (_accountID == IP2IP_PROFILE) {
return true;
}
@@ -1117,8 +1097,6 @@ pjsip_ssl_method SIPAccount::sslMethodStringToPjEnum (const std::string& method)
void SIPAccount::initTlsConfiguration (void)
{
- _debug ("SipAccount: Init TLS configuration");
-
/*
* Initialize structure to zero
*/
diff --git a/sflphone-common/src/sip/sipvoiplink.cpp b/sflphone-common/src/sip/sipvoiplink.cpp
index 73d8e7cabf0347af7b4521a9e6f697ac79067281..0630df74e8ab24dce2f39838dc3d0cc4f7ad896a 100644
--- a/sflphone-common/src/sip/sipvoiplink.cpp
+++ b/sflphone-common/src/sip/sipvoiplink.cpp
@@ -3402,11 +3402,11 @@ void sdp_media_update_cb (pjsip_inv_session *inv, pj_status_t status)
// Print SDP session
memset(buffer, 0, 1000);
pjmedia_sdp_print(remote_sdp, buffer, 1000);
- _debug("SDP: Remote active SDP Session: %s\n", buffer);
+ _debug("SDP: Remote active SDP Session:\n%s", buffer);
memset(buffer, 0, 1000);
pjmedia_sdp_print(local_sdp, buffer, 1000);
- _debug("SDP: Local active SDP Session: %s\n", buffer);
+ _debug("SDP: Local active SDP Session:\n%s", buffer);
// Set active SDP sessions
sdpSession->setActiveRemoteSdpSession(remote_sdp);
diff --git a/sflphone-common/src/sip/sipvoiplink.h b/sflphone-common/src/sip/sipvoiplink.h
index 3bad169dbd6c103f50459ee7c07614cdfb945cad..ecb72e6ce82bd95240a081116db40d846026f7ba 100644
--- a/sflphone-common/src/sip/sipvoiplink.h
+++ b/sflphone-common/src/sip/sipvoiplink.h
@@ -59,7 +59,7 @@ class SIPCall;
#define RANDOM_SIP_PORT rand() % 64000 + 1024
// To set the verbosity. From 0 (min) to 6 (max)
-#define PJ_LOG_LEVEL 6
+#define PJ_LOG_LEVEL 0
class SIPVoipLinkException : public std::exception
{
diff --git a/sflphone-common/test/sflphoned-sample.yml b/sflphone-common/test/sflphoned-sample.yml
index 4879fd39eb169bd3581fda8ce5a93e8e388a3e4b..0e252d32c1fc870be14c83ec065699a8907aee2a 100644
--- a/sflphone-common/test/sflphoned-sample.yml
+++ b/sflphone-common/test/sflphoned-sample.yml
@@ -54,7 +54,7 @@ preferences:
historyMaxCalls: 20
md5Hash: false
notifyMails: false
- order: Account:1303247743/Account:1302895321/Account:1302892836/Account:1302891834/Account:1302882519/Account:1302207377/Account:1302207262/Account:1302204136/Account:1302204108/Account:1294850905/Account:1294850775/Account:1294850618/Account:1294849651/Account:1294849602/Account:1294849310/Account:1288964768/Account:1288964603/Account:1288964434/Account:1288964141/Account:1288964134/
+ order: Account:1303487773/Account:1303247743/Account:1302895321/Account:1302892836/Account:1302891834/Account:1302882519/Account:1302207377/Account:1302207262/Account:1302204136/Account:1302204108/Account:1294850905/Account:1294850775/Account:1294850618/Account:1294849651/Account:1294849602/Account:1294849310/Account:1288964768/Account:1288964603/Account:1288964434/Account:1288964141/Account:1288964134/
portNum: 5060
registrationExpire: 180
searchBarDisplay: true