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 12 insertions and 6 deletions:

include/transport/user.h

src/user.cpp

0 comments (0 inline, 0 general)

include/transport/user.h

➞

Show inline comments

@@ @@ -137,6 +137,7 @@ class User : public Swift::EntityCapsProvider { @@
 		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_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));
@@ @@ -170,6 +171,7 @@ void User::sendCurrentPresence() { @@
 void User::setConnected(bool connected) {
 	m_connected = connected;
 	m_reconnectCounter = 0;
 	setIgnoreDisconnect(false);
 	updateLastActivity();
+	}
 	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.");
 		// Simulate destruction/resurrection :)
 		// TODO: If this stops working, create onReconnect signal
 		m_userManager->onUserDestroyed(this);
 		m_userManager->onUserCreated(this);
 		return;
 		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()) {

0 comments (0 inline, 0 general)