From 1d83aab4e18b181df92e36bfba353b7497307d79 Mon Sep 17 00:00:00 2001
From: Tristan Matthews <tristan.matthews@savoirfairelinux.com>
Date: Fri, 27 Jan 2012 17:24:51 -0500
Subject: [PATCH] * #8450: fixed confusion between expire and enable values
---
daemon/src/account.h | 2 +-
.../dbus/configurationmanager-introspec.xml | 8 ++---
daemon/src/dbus/configurationmanager.cpp | 4 +--
daemon/src/dbus/configurationmanager.h | 2 +-
daemon/src/managerimpl.h | 6 ++--
daemon/src/managerimpl_registration.cpp | 2 +-
daemon/src/sip/sipaccount.cpp | 31 ++++++++++---------
daemon/src/sip/sipaccount.h | 3 +-
daemon/test/configurationtest.cpp | 2 +-
gnome/src/config/accountlistconfigdialog.c | 6 ++--
.../dbus/configurationmanager-introspec.xml | 8 ++---
gnome/src/dbus/dbus.c | 2 +-
gnome/src/dbus/dbus.h | 2 +-
.../dbus/configurationmanager-introspec.xml | 8 ++---
14 files changed, 43 insertions(+), 43 deletions(-)
diff --git a/daemon/src/account.h b/daemon/src/account.h
index 97af525490..7d3216ee32 100644
--- a/daemon/src/account.h
+++ b/daemon/src/account.h
@@ -71,7 +71,7 @@ static const char *const CONFIG_ACCOUNT_TYPE = "Account.type";
static const char *const CONFIG_ACCOUNT_ALIAS = "Account.alias";
static const char *const CONFIG_ACCOUNT_MAILBOX = "Account.mailbox";
static const char *const CONFIG_ACCOUNT_ENABLE = "Account.enable";
-static const char *const CONFIG_ACCOUNT_REGISTRATION_EXPIRE = "Account.expire";
+static const char *const CONFIG_ACCOUNT_REGISTRATION_EXPIRE = "Account.registrationExpire";
static const char *const CONFIG_CREDENTIAL_NUMBER = "Credential.count";
static const char *const ACCOUNT_DTMF_TYPE = "Account.dtmfType";
static const char *const CONFIG_RINGTONE_PATH = "Account.ringtonePath";
diff --git a/daemon/src/dbus/configurationmanager-introspec.xml b/daemon/src/dbus/configurationmanager-introspec.xml
index 6b7aa5f8f5..926ff774de 100644
--- a/daemon/src/dbus/configurationmanager-introspec.xml
+++ b/daemon/src/dbus/configurationmanager-introspec.xml
@@ -190,7 +190,7 @@
<tp:docstring>
Send account registration (REGISTER) to the registrar.
</tp:docstring>
- the account if expire=1, unregister if expire=0.
+ Register the account if enable=true, unregister if enable=false.
@param[in] input accountID
-->
@@ -199,10 +199,10 @@
The account ID
</tp:docstring>
</arg>
- <arg type="i" name="expire" direction="in">
+ <arg type="b" name="enable" direction="in">
<tp:docstring>
- <p>To register, expire must be 1.</p>
- <p>To un-register, expire must be 0.</p>
+ <p>To register, enable must be true.</p>
+ <p>To un-register, enable must be false.</p>
</tp:docstring>
</arg>
</method>
diff --git a/daemon/src/dbus/configurationmanager.cpp b/daemon/src/dbus/configurationmanager.cpp
index 09be098ff3..08e0c6ebda 100644
--- a/daemon/src/dbus/configurationmanager.cpp
+++ b/daemon/src/dbus/configurationmanager.cpp
@@ -131,9 +131,9 @@ void ConfigurationManager::setAccountDetails(const std::string& accountID, const
Manager::instance().setAccountDetails(accountID, details);
}
-void ConfigurationManager::sendRegister(const std::string& accountID, const int32_t& expire)
+void ConfigurationManager::sendRegister(const std::string& accountID, const bool& enable)
{
- Manager::instance().sendRegister(accountID, expire);
+ Manager::instance().sendRegister(accountID, enable);
}
std::string ConfigurationManager::addAccount(const std::map<std::string, std::string>& details)
diff --git a/daemon/src/dbus/configurationmanager.h b/daemon/src/dbus/configurationmanager.h
index 486421d43b..e340095cb8 100644
--- a/daemon/src/dbus/configurationmanager.h
+++ b/daemon/src/dbus/configurationmanager.h
@@ -68,7 +68,7 @@ class ConfigurationManager :
void removeAccount(const std::string& accoundID);
void deleteAllCredential(const std::string& accountID);
std::vector< std::string > getAccountList();
- void sendRegister(const std::string& accoundID, const int32_t& expire);
+ void sendRegister(const std::string& accoundID, const bool& enable);
std::map< std::string, std::string > getTlsSettingsDefault();
diff --git a/daemon/src/managerimpl.h b/daemon/src/managerimpl.h
index 5d93b26765..a4004250b7 100644
--- a/daemon/src/managerimpl.h
+++ b/daemon/src/managerimpl.h
@@ -410,10 +410,10 @@ class ManagerImpl {
* ConfigurationManager - Send registration request
* @param accountId The account to register/unregister
* @param enable The flag for the type of registration
- * 0 for unregistration request
- * 1 for registration request
+ * false for unregistration request
+ * true for registration request
*/
- void sendRegister(const std::string& accountId , const int32_t& enable);
+ void sendRegister(const std::string& accountId, bool enable);
/**
* Get account list
diff --git a/daemon/src/managerimpl_registration.cpp b/daemon/src/managerimpl_registration.cpp
index dbccb44eb6..8dbf517fd8 100644
--- a/daemon/src/managerimpl_registration.cpp
+++ b/daemon/src/managerimpl_registration.cpp
@@ -73,7 +73,7 @@ VoIPLink* ManagerImpl::getAccountLink(const std::string& accountID)
void
-ManagerImpl::sendRegister(const std::string& accountID , const int32_t& enable)
+ManagerImpl::sendRegister(const std::string& accountID, bool enable)
{
Account* acc = getAccount(accountID);
diff --git a/daemon/src/sip/sipaccount.cpp b/daemon/src/sip/sipaccount.cpp
index fa252a5221..d99c55edf8 100644
--- a/daemon/src/sip/sipaccount.cpp
+++ b/daemon/src/sip/sipaccount.cpp
@@ -41,13 +41,17 @@
const char * const SIPAccount::OVERRTP_STR = "overrtp";
const char * const SIPAccount::SIPINFO_STR = "sipinfo";
+namespace {
+ const int MIN_REGISTRATION_TIME = 600;
+}
+
SIPAccount::SIPAccount(const std::string& accountID)
: Account(accountID, "SIP")
, transport_(NULL)
, credentials_()
, regc_(NULL)
, bRegister_(false)
- , registrationExpire_(600)
+ , registrationExpire_(MIN_REGISTRATION_TIME)
, interface_("default")
, publishedSameasLocal_(true)
, publishedIpAddress_()
@@ -92,7 +96,7 @@ SIPAccount::SIPAccount(const std::string& accountID)
SIPAccount::~SIPAccount()
{
- delete[] cred_;
+ delete [] cred_;
}
void SIPAccount::serialize(Conf::YamlEmitter *emitter)
@@ -109,9 +113,9 @@ void SIPAccount::serialize(Conf::YamlEmitter *emitter)
ScalarNode hostname(Account::hostname_);
ScalarNode enable(enabled_);
ScalarNode type(Account::type_);
- std::stringstream expirevalstr;
- expirevalstr << registrationExpire_;
- ScalarNode expire(expirevalstr);
+ std::stringstream registrationExpireStr;
+ registrationExpireStr << registrationExpire_;
+ ScalarNode expire(registrationExpireStr);
ScalarNode interface(interface_);
std::stringstream portstr;
portstr << localPort_;
@@ -168,7 +172,7 @@ void SIPAccount::serialize(Conf::YamlEmitter *emitter)
accountmap.setKeyValue(hostnameKey, &hostname);
accountmap.setKeyValue(accountEnableKey, &enable);
accountmap.setKeyValue(mailboxKey, &mailbox);
- accountmap.setKeyValue(expireKey, &expire);
+ accountmap.setKeyValue(registrationExpireKey, &expire);
accountmap.setKeyValue(interfaceKey, &interface);
accountmap.setKeyValue(portKey, &port);
accountmap.setKeyValue(stunServerKey, &stunServer);
@@ -264,7 +268,7 @@ void SIPAccount::unserialize(Conf::MappingNode *map)
map->getValue(ringtonePathKey, &ringtonePath_);
map->getValue(ringtoneEnabledKey, &ringtoneEnabled_);
- map->getValue(expireKey, ®istrationExpire_);
+ map->getValue(registrationExpireKey, ®istrationExpire_);
map->getValue(interfaceKey, &interface_);
int port;
map->getValue(portKey, &port);
@@ -398,7 +402,6 @@ void SIPAccount::setAccountDetails(std::map<std::string, std::string> details)
stunServer_ = details[STUN_SERVER];
stunEnabled_ = details[STUN_ENABLE] == "true";
dtmfType_ = details[ACCOUNT_DTMF_TYPE];
-
registrationExpire_ = atoi(details[CONFIG_ACCOUNT_REGISTRATION_EXPIRE].c_str());
userAgent_ = details[USERAGENT];
@@ -482,9 +485,9 @@ std::map<std::string, std::string> SIPAccount::getAccountDetails() const
a[ROUTESET] = serviceRoute_;
a[USERAGENT] = userAgent_;
- std::stringstream expireval;
- expireval << registrationExpire_;
- a[CONFIG_ACCOUNT_REGISTRATION_EXPIRE] = expireval.str();
+ std::stringstream registrationExpireStr;
+ registrationExpireStr << registrationExpire_;
+ a[CONFIG_ACCOUNT_REGISTRATION_EXPIRE] = registrationExpireStr.str();
a[LOCAL_INTERFACE] = interface_;
a[PUBLISHED_SAMEAS_LOCAL] = publishedSameasLocal_ ? "true" : "false";
a[PUBLISHED_ADDRESS] = publishedIpAddress_;
@@ -582,8 +585,8 @@ void SIPAccount::startKeepAliveTimer() {
keepAliveTimer_.cb = &SIPAccount::keepAliveRegistrationCb;
keepAliveTimer_.user_data = this;
- // expiration may no be determined when during the first registration request
- if(registrationExpire_ == 0)
+ // expiration may be undetermined during the first registration request
+ if (registrationExpire_ == 0)
keepAliveDelay_.sec = 60;
else
keepAliveDelay_.sec = registrationExpire_;
@@ -662,7 +665,7 @@ void SIPAccount::initStunConfiguration()
void SIPAccount::loadConfig()
{
if (registrationExpire_ == 0)
- registrationExpire_ = 600; /** Default expire value for registration */
+ registrationExpire_ = MIN_REGISTRATION_TIME; /** Default expire value for registration */
if (tlsEnable_ == "true") {
initTlsConfiguration();
diff --git a/daemon/src/sip/sipaccount.h b/daemon/src/sip/sipaccount.h
index fcfc3fbbc5..1728b21f1e 100644
--- a/daemon/src/sip/sipaccount.h
+++ b/daemon/src/sip/sipaccount.h
@@ -47,7 +47,6 @@ namespace Conf {
class YamlEmitter;
class MappingNode;
// SIP specific configuration keys
- const char *const expireKey = "expire";
const char *const interfaceKey = "interface";
const char *const portKey = "port";
const char *const publishAddrKey = "publishAddr";
@@ -223,7 +222,7 @@ class SIPAccount : public Account {
* the "Expire" sip header or the CONTACT's "expire" param.
*/
void setRegistrationExpire(int expire) {
- if(expire > 0)
+ if (expire > 0)
registrationExpire_ = expire;
}
diff --git a/daemon/test/configurationtest.cpp b/daemon/test/configurationtest.cpp
index 09651e6c29..cb447c9d8b 100644
--- a/daemon/test/configurationtest.cpp
+++ b/daemon/test/configurationtest.cpp
@@ -166,7 +166,7 @@ void ConfigurationTest::testYamlEmitter()
accountmap.setKeyValue(hostnameKey, &hostname);
accountmap.setKeyValue(accountEnableKey, &enable);
accountmap.setKeyValue(mailboxKey, &mailbox);
- accountmap.setKeyValue(expireKey, &expire);
+ accountmap.setKeyValue(registrationExpireKey, &expire);
accountmap.setKeyValue(interfaceKey, &interface);
accountmap.setKeyValue(portKey, &port);
accountmap.setKeyValue(publishAddrKey, &publishAddr);
diff --git a/gnome/src/config/accountlistconfigdialog.c b/gnome/src/config/accountlistconfigdialog.c
index a765c37f90..aa8db7a8db 100644
--- a/gnome/src/config/accountlistconfigdialog.c
+++ b/gnome/src/config/accountlistconfigdialog.c
@@ -260,17 +260,15 @@ static void enable_account_cb(GtkCellRendererToggle *rend UNUSED, gchar* path,
// Modify account state
gchar * registrationState;
- if (enable == TRUE) {
+ if (enable == TRUE)
registrationState = g_strdup("true");
- } else {
+ else
registrationState = g_strdup("false");
- }
DEBUG("Replacing with %s", registrationState);
g_hash_table_replace(acc->properties , g_strdup(ACCOUNT_ENABLED), registrationState);
dbus_send_register(acc->accountID, enable);
-
}
/**
diff --git a/gnome/src/dbus/configurationmanager-introspec.xml b/gnome/src/dbus/configurationmanager-introspec.xml
index 6b7aa5f8f5..926ff774de 100644
--- a/gnome/src/dbus/configurationmanager-introspec.xml
+++ b/gnome/src/dbus/configurationmanager-introspec.xml
@@ -190,7 +190,7 @@
<tp:docstring>
Send account registration (REGISTER) to the registrar.
</tp:docstring>
- the account if expire=1, unregister if expire=0.
+ Register the account if enable=true, unregister if enable=false.
@param[in] input accountID
-->
@@ -199,10 +199,10 @@
The account ID
</tp:docstring>
</arg>
- <arg type="i" name="expire" direction="in">
+ <arg type="b" name="enable" direction="in">
<tp:docstring>
- <p>To register, expire must be 1.</p>
- <p>To un-register, expire must be 0.</p>
+ <p>To register, enable must be true.</p>
+ <p>To un-register, enable must be false.</p>
</tp:docstring>
</arg>
</method>
diff --git a/gnome/src/dbus/dbus.c b/gnome/src/dbus/dbus.c
index 452957d3bc..ff9fd6797e 100644
--- a/gnome/src/dbus/dbus.c
+++ b/gnome/src/dbus/dbus.c
@@ -1030,7 +1030,7 @@ dbus_get_ip2_ip_details(void)
}
void
-dbus_send_register(gchar* accountID, const guint enable)
+dbus_send_register(gchar* accountID, gboolean enable)
{
GError *error = NULL;
org_sflphone_SFLphone_ConfigurationManager_send_register(
diff --git a/gnome/src/dbus/dbus.h b/gnome/src/dbus/dbus.h
index 7a2574a120..bd4fef7daa 100644
--- a/gnome/src/dbus/dbus.h
+++ b/gnome/src/dbus/dbus.h
@@ -155,7 +155,7 @@ GHashTable * dbus_get_ip2_ip_details (void);
* 0 for unregistration request
* 1 for registration request
*/
-void dbus_send_register (gchar* accountID , const guint enable);
+void dbus_send_register (gchar* accountID, gboolean enable);
/**
* ConfigurationManager - Add an account to the list
diff --git a/kde/src/dbus/configurationmanager-introspec.xml b/kde/src/dbus/configurationmanager-introspec.xml
index 6b7aa5f8f5..926ff774de 100755
--- a/kde/src/dbus/configurationmanager-introspec.xml
+++ b/kde/src/dbus/configurationmanager-introspec.xml
@@ -190,7 +190,7 @@
<tp:docstring>
Send account registration (REGISTER) to the registrar.
</tp:docstring>
- the account if expire=1, unregister if expire=0.
+ Register the account if enable=true, unregister if enable=false.
@param[in] input accountID
-->
@@ -199,10 +199,10 @@
The account ID
</tp:docstring>
</arg>
- <arg type="i" name="expire" direction="in">
+ <arg type="b" name="enable" direction="in">
<tp:docstring>
- <p>To register, expire must be 1.</p>
- <p>To un-register, expire must be 0.</p>
+ <p>To register, enable must be true.</p>
+ <p>To un-register, enable must be false.</p>
</tp:docstring>
</arg>
</method>
--
GitLab