From e1392ddee44004476b9ecc29dad1acbc2c047f09 Mon Sep 17 00:00:00 2001 From: Tristan Matthews <tristan.matthews@savoirfairelinux.com> Date: Mon, 29 Aug 2011 16:28:00 -0400 Subject: [PATCH] * #6554: make some methods of sipvoiplink static --- daemon/src/dbus/configurationmanager.cpp | 6 +++--- daemon/src/sip/sipvoiplink.cpp | 10 +++++----- daemon/src/sip/sipvoiplink.h | 6 +++--- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/daemon/src/dbus/configurationmanager.cpp b/daemon/src/dbus/configurationmanager.cpp index 495e63dea6..2cbefa3660 100644 --- a/daemon/src/dbus/configurationmanager.cpp +++ b/daemon/src/dbus/configurationmanager.cpp @@ -425,17 +425,17 @@ void ConfigurationManager::setHistory (const std::vector<std::string>& entries) std::string ConfigurationManager::getAddrFromInterfaceName ( const std::string& interface) { - return SIPVoIPLink::instance()->getInterfaceAddrFromName (interface); + return SIPVoIPLink::getInterfaceAddrFromName (interface); } std::vector<std::string> ConfigurationManager::getAllIpInterface (void) { - return SIPVoIPLink::instance()->getAllIpInterface(); + return SIPVoIPLink::getAllIpInterface(); } std::vector<std::string> ConfigurationManager::getAllIpInterfaceByName (void) { - return SIPVoIPLink::instance()->getAllIpInterfaceByName(); + return SIPVoIPLink::getAllIpInterfaceByName(); } std::map<std::string, std::string> ConfigurationManager::getShortcuts() diff --git a/daemon/src/sip/sipvoiplink.cpp b/daemon/src/sip/sipvoiplink.cpp index 0ec14b474c..63e7f2f264 100644 --- a/daemon/src/sip/sipvoiplink.cpp +++ b/daemon/src/sip/sipvoiplink.cpp @@ -3398,7 +3398,7 @@ static int get_iface_list (struct ifconf *ifconf) } } // end anonymous namespace -std::vector<std::string> SIPVoIPLink::getAllIpInterfaceByName (void) const +std::vector<std::string> SIPVoIPLink::getAllIpInterfaceByName (void) { static ifreq ifreqs[20]; ifconf ifconf; @@ -3426,7 +3426,7 @@ std::vector<std::string> SIPVoIPLink::getAllIpInterfaceByName (void) const return ifaceList; } -std::string SIPVoIPLink::getInterfaceAddrFromName (const std::string &ifaceName) const +std::string SIPVoIPLink::getInterfaceAddrFromName (const std::string &ifaceName) { int fd = socket (AF_INET, SOCK_DGRAM,0); if (fd < 0) { @@ -3435,8 +3435,8 @@ std::string SIPVoIPLink::getInterfaceAddrFromName (const std::string &ifaceName) } ifreq ifr; - memset (&ifr, 0, sizeof(ifreq)); - strcpy (ifr.ifr_name, ifaceName.c_str()); + memset(&ifr, 0, sizeof(ifreq)); + strcpy(ifr.ifr_name, ifaceName.c_str()); ifr.ifr_addr.sa_family = AF_INET; if (ioctl (fd, SIOCGIFADDR, &ifr) < 0) @@ -3450,7 +3450,7 @@ std::string SIPVoIPLink::getInterfaceAddrFromName (const std::string &ifaceName) return addr; } -std::vector<std::string> SIPVoIPLink::getAllIpInterface (void) const +std::vector<std::string> SIPVoIPLink::getAllIpInterface (void) { pj_sockaddr addrList[16]; unsigned int addrCnt = PJ_ARRAY_SIZE (addrList); diff --git a/daemon/src/sip/sipvoiplink.h b/daemon/src/sip/sipvoiplink.h index 1640f33d82..c695eb8531 100644 --- a/daemon/src/sip/sipvoiplink.h +++ b/daemon/src/sip/sipvoiplink.h @@ -254,7 +254,7 @@ class SIPVoIPLink : public VoIPLink * of IPV4 address available on all of the interfaces on * the system. */ - std::vector<std::string> getAllIpInterface (void) const; + static std::vector<std::string> getAllIpInterface (void); /** * List all the interfaces on the system and return @@ -264,7 +264,7 @@ class SIPVoIPLink : public VoIPLink * of interface name available on all of the interfaces on * the system. */ - std::vector<std::string> getAllIpInterfaceByName (void) const; + static std::vector<std::string> getAllIpInterfaceByName (void); /** * List all the interfaces on the system and return @@ -274,7 +274,7 @@ class SIPVoIPLink : public VoIPLink * of interface name available on all of the interfaces on * the system. */ - std::string getInterfaceAddrFromName (const std::string &ifaceName) const; + static std::string getInterfaceAddrFromName (const std::string &ifaceName); /** * Initialize the transport selector -- GitLab