libtransport.git Changeset - 1342c511cdb1

Changeset - 1342c511cdb1

Parent rev.

Child rev.

[Not reviewed]

0 1 0

HanzZ - 14 years ago 2011-09-11 14:37:53
hanzz.k@gmail.com

remove unused print_trace

1 file changed with 0 insertions and 25 deletions:

src/user.cpp

0 comments (0 inline, 0 general)

src/user.cpp

➞

Show inline comments

@@ @@ -9,51 +9,48 @@ @@
  * (at your option) any later version.
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
 #include "transport/user.h"
 #include "transport/transport.h"
 #include "transport/storagebackend.h"
 #include "transport/rostermanager.h"
 #include "transport/usermanager.h"
 #include "transport/conversationmanager.h"
 #include "Swiften/Swiften.h"
 #include "Swiften/Server/ServerStanzaChannel.h"
 #include "Swiften/Elements/StreamError.h"
 #include "Swiften/Elements/MUCPayload.h"
 #include "log4cxx/logger.h"
 #include <boost/foreach.hpp>
 #ifndef WIN32
 #include <execinfo.h>
 #endif
 #include <stdio.h>
 #include <stdlib.h>
 using namespace log4cxx;
 using namespace boost;
 #define foreach         BOOST_FOREACH
 namespace Transport {
 static LoggerPtr logger = Logger::getLogger("User");
 User::User(const Swift::JID &jid, UserInfo &userInfo, Component *component, UserManager *userManager) {
 	m_jid = jid;
 	m_data = NULL;
 	m_component = component;
 	m_presenceOracle = component->m_presenceOracle;
 	m_entityCapsManager = component->m_entityCapsManager;
 	m_userManager = userManager;
 	m_userInfo = userInfo;
 	m_connected = false;
 	m_readyForConnect = false;
 	m_ignoreDisconnect = false;
@@ @@ -83,72 +80,50 @@ const Swift::JID &User::getJID() { @@
+}
 Swift::JID User::getJIDWithFeature(const std::string &feature) {
 	Swift::JID jid;
 	std::vector<Swift::Presence::ref> presences = m_presenceOracle->getAllPresence(m_jid);
 	foreach(Swift::Presence::ref presence, presences) {
 		if (presence->getType() == Swift::Presence::Unavailable)
 			continue;
 		Swift::DiscoInfo::ref discoInfo = m_entityCapsManager->getCaps(presence->getFrom());
 		if (!discoInfo)
 			continue;
 		if (discoInfo->hasFeature(feature)) {
 			LOG4CXX_INFO(logger, m_jid.toString() << ": Found JID with " << feature << " feature: " << presence->getFrom().toString());
 			return presence->getFrom();
+		}
+	}
 	LOG4CXX_INFO(logger, m_jid.toString() << ": No JID with " << feature << " feature");
 	return jid;
+}
 static void
 print_trace (void)
+{
 #ifndef WIN32
 void *array[80];
 size_t size;
 char **strings;
 size_t i;
 size = backtrace (array, 80);
 strings = backtrace_symbols (array, size);
 printf ("Obtained %zd stack frames.\n", size);
 for (i = 0; i < size; i++)
 	printf ("%s\n", strings[i]);
 free (strings);
 #endif
+}
 void User::handlePresence(Swift::Presence::ref presence) {
 	std::cout << "PRESENCE " << presence->getFrom().toString() << "\n";
 // 	print_trace();
 	if (!m_connected) {
 		// we are not connected to legacy network, so we should do it when disco#info arrive :)
 		if (m_readyForConnect == false) {
 			// Forward status message to legacy network, but only if it's sent from active resource
 // 					if (m_activeResource == presence->getFrom().getResource().getUTF8String()) {
 // 						forwardStatus(presenceShow, stanzaStatus);
 // 					}
 			boost::shared_ptr<Swift::CapsInfo> capsInfo = presence->getPayload<Swift::CapsInfo>();
 			if (capsInfo && capsInfo->getHash() == "sha-1") {
 				if (m_entityCapsManager->getCaps(presence->getFrom()) != Swift::DiscoInfo::ref()) {
 					LOG4CXX_INFO(logger, m_jid.toString() << ": Ready to be connected to legacy network");
 					m_readyForConnect = true;
 					onReadyToConnect();
+				}
+			}
 			else if (m_component->inServerMode()) {
 				LOG4CXX_INFO(logger, m_jid.toString() << ": Ready to be connected to legacy network");
 				m_readyForConnect = true;
 				onReadyToConnect();
+			}
 			else {
 				m_reconnectTimer->start();
+			}

0 comments (0 inline, 0 general)