libtransport.git Changeset - 79d0e907bb27

Changeset - 79d0e907bb27

Parent rev.

Child rev.

[Not reviewed]

0 2 0

HanzZ - 14 years ago 2011-12-07 18:41:16
hanzz.k@gmail.com

Allow only 3 reconnections in a row, then disconnect user

2 files changed with 7 insertions and 1 deletions:

include/transport/user.h

src/user.cpp

0 comments (0 inline, 0 general)

include/transport/user.h

➞

Show inline comments

@@ @@ -134,9 +134,10 @@ class User : public Swift::EntityCapsProvider { @@
 		Swift::Timer::ref m_reconnectTimer;
 		boost::shared_ptr<Swift::Connection> connection;
 		time_t m_lastActivity;
 		std::map<Swift::JID, Swift::DiscoInfo::ref> m_legacyCaps;
 		std::vector<boost::shared_ptr<Swift::OutgoingFileTransfer> > m_filetransfers;
 		int m_resources;
 		int m_reconnectCounter;
 };
+}

src/user.cpp

➞

Show inline comments

 	m_userManager = userManager;
 	m_userInfo = userInfo;
 	m_connected = false;
 	m_readyForConnect = false;
 	m_ignoreDisconnect = false;
 	m_resources = 0;
 	m_reconnectCounter = 0;
 	m_reconnectTimer = m_component->getNetworkFactories()->getTimerFactory()->createTimer(10000);
 	m_reconnectTimer->onTick.connect(boost::bind(&User::onConnectingTimeout, this));
 	m_rosterManager = new RosterManager(this, m_component);
 	m_conversationManager = new ConversationManager(this, m_component);
@@ @@ -167,12 +168,13 @@ void User::sendCurrentPresence() { @@
+		}
+	}
+}
 void User::setConnected(bool connected) {
 	m_connected = connected;
 	m_reconnectCounter = 0;
 	setIgnoreDisconnect(false);
 	updateLastActivity();
 	sendCurrentPresence();
+}
 	if (m_ignoreDisconnect) {
 		LOG4CXX_INFO(logger, m_jid.toString() << ": Disconnecting from legacy network ignored (probably moving between backends)");
 		return;
+	}
 	if (e == Swift::SpectrumErrorPayload::CONNECTION_ERROR_OTHER_ERROR || e == Swift::SpectrumErrorPayload::CONNECTION_ERROR_NETWORK_ERROR) {
 		LOG4CXX_INFO(logger, m_jid.toString() << ": Disconnecting from legacy network, trying to reconnect automatically.");
 		if (m_reconnectCounter < 3) {
 			m_reconnectCounter++;
 			LOG4CXX_INFO(logger, m_jid.toString() << ": Disconnecting from legacy network for, trying to reconnect automatically.");
 			// Simulate destruction/resurrection :)
 			// TODO: If this stops working, create onReconnect signal
 			m_userManager->onUserDestroyed(this);
 			m_userManager->onUserCreated(this);
 			return;
+		}
+	}
 	if (error.empty()) {
 		LOG4CXX_INFO(logger, m_jid.toString() << ": Disconnected from legacy network");
+	}
 	else {
 		LOG4CXX_INFO(logger, m_jid.toString() << ": Disconnected from legacy network with error " << error);

0 comments (0 inline, 0 general)