libtransport.git Changeset - 808a9067c5f5

Changeset - 808a9067c5f5

Parent rev.

Child rev.

[Not reviewed]

0 10 0

HanzZ - 14 years ago 2011-07-17 23:05:54
hanzz.k@gmail.com

Improved backends creation, fixed race-condition during connection process

10 files changed with 102 insertions and 11 deletions:

include/Swiften/Server/Server.cpp

include/Swiften/Server/ServerFromClientSession.cpp

include/Swiften/Server/ServerFromClientSession.h

include/Swiften/Server/UserRegistry.h

include/transport/networkpluginserver.h

include/transport/user.h

spectrum/src/sample.cfg

spectrum/src/sample2.cfg

src/networkpluginserver.cpp

src/user.cpp

0 comments (0 inline, 0 general)

include/Swiften/Server/Server.cpp

➞

Show inline comments

 	serverFromClientSession->onSessionStarted.connect(
 			boost::bind(&Server::handleSessionStarted, this, serverFromClientSession));
 	serverFromClientSession->onSessionFinished.connect(
 			boost::bind(&Server::handleSessionFinished, this,
 			serverFromClientSession));
 	serverFromClientSession->onPasswordInvalid.connect(
 			boost::bind(&Server::handleSessionFinished, this,
 			serverFromClientSession));
 	serverFromClientSession->onDataRead.connect(boost::bind(&Server::handleDataRead, this, _1));
 	serverFromClientSession->onDataWritten.connect(boost::bind(&Server::handleDataWritten, this, _1));
 	if (tlsFactory) {
 		serverFromClientSession->addTLSEncryption(tlsFactory, cert);
+	}
 void Server::handleSessionStarted(boost::shared_ptr<ServerFromClientSession> session) {
 	dynamic_cast<ServerStanzaChannel *>(stanzaChannel_)->addSession(session);
+}
 void Server::handleSessionFinished(boost::shared_ptr<ServerFromClientSession> session) {
 	if (!session->getRemoteJID().isValid()) {
 		Swift::Presence::ref presence = Swift::Presence::create();
 		presence->setFrom(session->getBareJID());
 		presence->setType(Swift::Presence::Unavailable);
 		dynamic_cast<ServerStanzaChannel *>(stanzaChannel_)->onPresenceReceived(presence);
+	}
 	serverFromClientSessions.erase(std::remove(serverFromClientSessions.begin(), serverFromClientSessions.end(), session), serverFromClientSessions.end());
 	session->onSessionStarted.disconnect(
 			boost::bind(&Server::handleSessionStarted, this, session));
 	session->onSessionFinished.disconnect(
 			boost::bind(&Server::handleSessionFinished, this, session));
+}
 void Server::addTLSEncryption(TLSServerContextFactory* tlsContextFactory, const PKCS12Certificate& cert) {
 	tlsFactory = tlsContextFactory;
 	this->cert = cert;
+}

include/Swiften/Server/ServerFromClientSession.cpp

➞

Show inline comments

@@ @@ -44,32 +44,36 @@ ServerFromClientSession::ServerFromClientSession( @@
 			tlsConnected(false) {
 	userRegistry->onPasswordValid.connect(boost::bind(&ServerFromClientSession::handlePasswordValid, this, _1));
 	userRegistry->onPasswordInvalid.connect(boost::bind(&ServerFromClientSession::handlePasswordInvalid, this, _1));
+}
 ServerFromClientSession::~ServerFromClientSession() {
 	std::cout << "DESTRUCTOR;\n";
 	if (tlsLayer) {
 		delete tlsLayer;
+	}
+}
 void ServerFromClientSession::handlePasswordValid(const std::string &user) {
 	if (user != JID(user_, getLocalJID().getDomain()).toString())
 		return;
 	if (!isInitialized()) {
 		userRegistry_->onPasswordValid.disconnect(boost::bind(&ServerFromClientSession::handlePasswordValid, this, _1));
 		userRegistry_->onPasswordInvalid.disconnect(boost::bind(&ServerFromClientSession::handlePasswordInvalid, this, _1));
 		getXMPPLayer()->writeElement(boost::shared_ptr<AuthSuccess>(new AuthSuccess()));
 		authenticated_ = true;
 		getXMPPLayer()->resetParser();
+	}
+}
 void ServerFromClientSession::handlePasswordInvalid(const std::string &user) {
 	if (user != JID(user_, getLocalJID().getDomain()).toString() || authenticated_)
 		return;
 	if (!isInitialized()) {
 		user_ = "/././";
 		userRegistry_->onPasswordValid.disconnect(boost::bind(&ServerFromClientSession::handlePasswordValid, this, _1));
 		userRegistry_->onPasswordInvalid.disconnect(boost::bind(&ServerFromClientSession::handlePasswordInvalid, this, _1));
 		getXMPPLayer()->writeElement(boost::shared_ptr<AuthFailure>(new AuthFailure));
 		finishSession(AuthenticationFailedError);
 		onPasswordInvalid();
+	}
+}

include/Swiften/Server/ServerFromClientSession.h

➞

Show inline comments

@@ @@ -47,12 +47,16 @@ namespace Swift { @@
 			const std::string &getUser() {
 				return user_;
+			}
 			void addTLSEncryption(TLSServerContextFactory* tlsContextFactory, const PKCS12Certificate& cert);
 			Swift::JID getBareJID() {
 				return Swift::JID(user_, getLocalJID().getDomain());
+			}
 		private:
 			void handleElement(boost::shared_ptr<Element>);
 			void handleStreamStart(const ProtocolHeader& header);
 			void handlePasswordValid(const std::string &user);
 			void handlePasswordInvalid(const std::string &user);

include/Swiften/Server/UserRegistry.h

➞

Show inline comments

@@ @@ -16,11 +16,13 @@ namespace Swift { @@
 	class UserRegistry {
 		public:
 			virtual ~UserRegistry();
 			virtual bool isValidUserPassword(const JID& user, const SafeByteArray& password) = 0;
 			virtual void stopLogin(const JID &/*user*/) {};
 			boost::signal<void (const std::string &user)> onPasswordValid;
 			boost::signal<void (const std::string &user)> onPasswordInvalid;
 	};
+}

include/transport/networkpluginserver.h

➞

Show inline comments

@@ @@ -104,9 +104,10 @@ class NetworkPluginServer { @@
 		RosterResponder *m_rosterResponder;
 		Config *m_config;
 		boost::shared_ptr<Swift::BoostConnectionServer> m_server;
 		std::list<Backend *>  m_clients;
 		Swift::Timer::ref m_pingTimer;
 		Component *m_component;
 		std::list<User *> m_waitingUsers;
 };
+}

include/transport/user.h

➞

Show inline comments

@@ @@ -78,12 +78,24 @@ class User { @@
 		/// Returns language.
 		/// \return language
 		const char *getLang() { return "en"; }
 		void handleDisconnected(const std::string &error);
 		bool isReadyToConnect() {
 			return m_readyForConnect;
+		}
 		void setConnected(bool connected) {
 			m_connected = connected;
+		}
 		bool isConnected() {
 			return m_connected;
+		}
 		boost::signal<void ()> onReadyToConnect;
 		boost::signal<void (Swift::Presence::ref presence)> onPresenceChanged;
 		boost::signal<void (const std::string &room, const std::string &nickname, const std::string &password)> onRoomJoined;
 		boost::signal<void (const std::string &room)> onRoomLeft;
 		boost::signal<void ()> onDisconnected;

spectrum/src/sample.cfg

➞

Show inline comments

@@ @@ -7,13 +7,13 @@ server_mode = 1 @@
 backend_host=localhost # < this option doesn't work yet
 backend_port=10001
 admin_username=admin
 admin_password=test
 #cert= #patch to PKCS#12 certificate
 #cert_password= #password to that certificate if any
-users_per_backend=2
+users_per_backend=1
 backend=../../backends/libpurple/spectrum_libpurple_backend
 #backend=../../backends/libircclient-qt/spectrum_libircclient-qt_backend
 #protocol=prpl-jabber
 protocol=prpl-msn
 #protocol=prpl-icq

spectrum/src/sample2.cfg

➞

Show inline comments

@@ @@ -5,13 +5,13 @@ server = 127.0.0.1 @@
 port = 5222
 server_mode = 1
 backend_host=localhost # < this option doesn't work yet
 backend_port=10001
 #cert= #patch to PKCS#12 certificate
 #cert_password= #password to that certificate if any
-users_per_backend=2
+users_per_backend=1
 backend=spectrum_libpurple_backend
 #backend=spectrum_libircclient-qt_backend
 protocol=prpl-jabber
 #protocol=prpl-msn
 #protocol=prpl-icq

src/networkpluginserver.cpp

➞

Show inline comments

 	m_clients.push_back(client);
 	c->onDisconnected.connect(boost::bind(&NetworkPluginServer::handleSessionFinished, this, client));
 	c->onDataRead.connect(boost::bind(&NetworkPluginServer::handleDataRead, this, client, _1));
 	sendPing(client);
 	// some users are in queue waiting for this backend
 	while(!m_waitingUsers.empty()) {
 		// There's no new backend, so stop associating users and wait for new backend,
 		// which has been already spawned in getFreeClient() call.
 		if (getFreeClient() == NULL)
 			break;
 		User *u = m_waitingUsers.front();
 		m_waitingUsers.pop_front();
 		LOG4CXX_INFO(logger, "Associating " << u->getJID().toString() << " with this backend");
 		// associate backend with user
 		handleUserCreated(u);
 		// connect user if it's ready
 		if (u->isReadyToConnect()) {
 			handleUserReadyToConnect(u);
+		}
+	}
+}
 void NetworkPluginServer::handleSessionFinished(Backend *c) {
 	LOG4CXX_INFO(logger, "Backend " << c << " disconnected. Current backend count=" << (m_clients.size() - 1));
 	for (std::list<User *>::const_iterator it = c->users.begin(); it != c->users.end(); it++) {
 		LOG4CXX_ERROR(logger, "Backend " << c << " disconnected (probably crashed) with active user " << (*it)->getJID().toString());
 void NetworkPluginServer::handleConnectedPayload(const std::string &data) {
 	pbnetwork::Connected payload;
 	if (payload.ParseFromString(data) == false) {
 		// TODO: ERROR
 		return;
+	}
 	User *user = m_userManager->getUser(payload.user());
 	if (!user) {
 		return;
+	}
 	user->setConnected(true);
 	m_component->m_userRegistry->onPasswordValid(payload.user());
+}
 void NetworkPluginServer::handleDisconnectedPayload(const std::string &data) {
 	pbnetwork::Disconnected payload;
 	if (payload.ParseFromString(data) == false) {
@@ @@ -521,14 +550,14 @@ void NetworkPluginServer::pingTimeout() { @@
+}
 void NetworkPluginServer::handleUserCreated(User *user) {
 	Backend *c = getFreeClient();
 	if (!c) {
 		LOG4CXX_ERROR(logger, "There is no backend to handle user " << user->getJID().toString());
 		user->handleDisconnected("Internal Server Error (no free backend to handle your session), please reconnect.");
 		LOG4CXX_INFO(logger, "There is no backend to handle user " << user->getJID().toString() << ". Adding him to queue.");
 		m_waitingUsers.push_back(user);
 		return;
+	}
 	user->setData(c);
 	c->users.push_back(user);
 // 	UserInfo userInfo = user->getUserInfo();
 	std::string message;
 	login.SerializeToString(&message);
 	WRAP(message, pbnetwork::WrapperMessage_Type_TYPE_LOGIN);
 	Backend *c = (Backend *) user->getData();
 	if (!c) {
 		return;
+	}
 	send(c->connection, message);
+}
 void NetworkPluginServer::handleUserPresenceChanged(User *user, Swift::Presence::ref presence) {
 	if (presence->getShow() == Swift::StatusShow::None)
 		return;
 	std::string message;
 	status.SerializeToString(&message);
 	WRAP(message, pbnetwork::WrapperMessage_Type_TYPE_STATUS_CHANGED);
 	Backend *c = (Backend *) user->getData();
 	if (!c) {
 		return;
+	}
 	send(c->connection, message);
+}
 void NetworkPluginServer::handleRoomJoined(User *user, const std::string &r, const std::string &nickname, const std::string &password) {
 	UserInfo userInfo = user->getUserInfo();
 	std::string message;
 	room.SerializeToString(&message);
 	WRAP(message, pbnetwork::WrapperMessage_Type_TYPE_JOIN_ROOM);
 	Backend *c = (Backend *) user->getData();
 	if (!c) {
 		return;
+	}
 	send(c->connection, message);
 	NetworkConversation *conv = new NetworkConversation(user->getConversationManager(), r, true);
 	conv->onMessageToSend.connect(boost::bind(&NetworkPluginServer::handleMessageReceived, this, _1, _2));
 	conv->setNickname(nickname);
+}
 	std::string message;
 	room.SerializeToString(&message);
 	WRAP(message, pbnetwork::WrapperMessage_Type_TYPE_LEAVE_ROOM);
 	Backend *c = (Backend *) user->getData();
 	if (!c) {
 		return;
+	}
 	send(c->connection, message);
 	NetworkConversation *conv = (NetworkConversation *) user->getConversationManager()->getConversation(r);
 	if (!conv) {
 		return;
+	}
 	delete conv;
+}
 void NetworkPluginServer::handleUserDestroyed(User *user) {
 	std::cout << "HANDLE_DESTROYED\n";
 	m_waitingUsers.remove(user);
 	UserInfo userInfo = user->getUserInfo();
 	pbnetwork::Logout logout;
 	logout.set_user(user->getJID().toBare());
 	logout.set_legacyname(userInfo.uin);
 			std::string message;
 			buddy.SerializeToString(&message);
 			WRAP(message, type);
 			Backend *c = (Backend *) conv->getConversationManager()->getUser()->getData();
 			if (!c) {
 				return;
+			}
 			send(c->connection, message);
+		}
+	}
 	boost::shared_ptr<Swift::AttentionPayload> attentionPayload = msg->getPayload<Swift::AttentionPayload>();
 	if (attentionPayload) {
 		std::string message;
 		m.SerializeToString(&message);
 		WRAP(message, pbnetwork::WrapperMessage_Type_TYPE_CONV_MESSAGE);
 		Backend *c = (Backend *) conv->getConversationManager()->getUser()->getData();
 		if (!c) {
 			return;
+		}
 		send(c->connection, message);
+	}
+}
 void NetworkPluginServer::handleBuddyRemoved(Buddy *b) {
 	User *user = b->getRosterManager()->getUser();
@@ @@ -739,12 +787,15 @@ void NetworkPluginServer::handleBuddyRemoved(Buddy *b) { @@
 	std::string message;
 	buddy.SerializeToString(&message);
 	WRAP(message, pbnetwork::WrapperMessage_Type_TYPE_BUDDY_REMOVED);
 	Backend *c = (Backend *) user->getData();
 	if (!c) {
 		return;
+	}
 	send(c->connection, message);
+}
 void NetworkPluginServer::handleBuddyUpdated(Buddy *b, const Swift::RosterItemPayload &item) {
 	User *user = b->getRosterManager()->getUser();
 	std::string message;
 	buddy.SerializeToString(&message);
 	WRAP(message, pbnetwork::WrapperMessage_Type_TYPE_BUDDY_CHANGED);
 	Backend *c = (Backend *) user->getData();
 	if (!c) {
 		return;
+	}
 	send(c->connection, message);
+}
 void NetworkPluginServer::handleBuddyAdded(Buddy *buddy, const Swift::RosterItemPayload &item) {
 	handleBuddyUpdated(buddy, item);
+}
 	std::string message;
 	vcard.SerializeToString(&message);
 	WRAP(message, pbnetwork::WrapperMessage_Type_TYPE_VCARD);
 	Backend *c = (Backend *) user->getData();
 	if (!c) {
 		return;
+	}
 	send(c->connection, message);
+}
 void NetworkPluginServer::handleVCardRequired(User *user, const std::string &name, unsigned int id) {
 	pbnetwork::VCard vcard;
 	vcard.set_username(user->getJID().toBare());
 	std::string message;
 	vcard.SerializeToString(&message);
 	WRAP(message, pbnetwork::WrapperMessage_Type_TYPE_VCARD);
 	Backend *c = (Backend *) user->getData();
 	if (!c) {
 		return;
+	}
 	send(c->connection, message);
+}
 void NetworkPluginServer::sendPing(Backend *c) {
 	std::string message;
 					break;
+				}
+			}
+		}
+	}
 	if (spawnNew) {
+	if (spawnNew || c == NULL) {
 		exec_(CONFIG_STRING(m_config, "service.backend").c_str(), CONFIG_STRING(m_config, "service.backend_host").c_str(), CONFIG_STRING(m_config, "service.backend_port").c_str(), m_config->getConfigFile().c_str());
+	}
 	return c;
+}

src/user.cpp

➞

Show inline comments

@@ @@ -169,12 +169,13 @@ void User::onConnectingTimeout() { @@
 	m_reconnectTimer->stop();
 	m_readyForConnect = true;
 	onReadyToConnect();
+}
 void User::handleDisconnected(const std::string &error) {
 	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);
+	}
@@ @@ -183,18 +184,18 @@ void User::handleDisconnected(const std::string &error) { @@
 	boost::shared_ptr<Swift::Message> msg(new Swift::Message());
 	msg->setBody(error);
 	msg->setTo(m_jid.toBare());
 	msg->setFrom(m_component->getJID());
 	m_component->getStanzaChannel()->sendMessage(msg);
 	// In server mode, server finishes the session and pass unavailable session to userManager,
+	// In server mode, server finishes the session and pass unavailable session to userManager if we're connected to legacy network,
 	// so we can't removeUser() in server mode, because it would be removed twice.
 	// Once in finishSession and once in m_userManager->removeUser.
 	if (m_component->inServerMode()) {
 		dynamic_cast<Swift::ServerStanzaChannel *>(m_component->getStanzaChannel())->finishSession(m_jid, boost::shared_ptr<Swift::Element>(new Swift::StreamError()));
-		if (!m_readyForConnect) {
+		if (!m_connected) {
 			m_userManager->removeUser(this);
+		}
+	}
 	else {
 		m_userManager->removeUser(this);
+	}

0 comments (0 inline, 0 general)