libtransport.git Changeset - c6224941ceab

Changeset - c6224941ceab

Parent rev.

Child rev.

[Not reviewed]

0 7 0

HanzZ - 14 years ago 2011-07-17 03:56:19
hanzz.k@gmail.com

Fixed removing users

7 files changed with 24 insertions and 4 deletions:

include/Swiften/Server/Server.cpp

include/Swiften/Server/ServerFromClientSession.cpp

include/Swiften/Server/ServerFromClientSession.h

include/Swiften/Server/ServerStanzaChannel.cpp

src/networkpluginserver.cpp

src/user.cpp

src/usermanager.cpp

0 comments (0 inline, 0 general)

include/Swiften/Server/Server.cpp

➞

Show inline comments

@@ @@ -25,12 +25,13 @@ @@
 #include <string>
 #include "Swiften/Network/ConnectionServer.h"
 #include "Swiften/Network/ConnectionFactory.h"
 #include "Swiften/Server/ServerFromClientSession.h"
 #include "Swiften/Server/ServerStanzaChannel.h"
 #include "Swiften/Queries/IQRouter.h"
 #include <iostream>
 namespace Swift {
 Server::Server(
 		EventLoop* eventLoop,
 	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);
+	}

include/Swiften/Server/ServerFromClientSession.cpp

➞

Show inline comments

@@ @@ -21,12 +21,13 @@ @@
 #include <Swiften/Elements/AuthRequest.h>
 #include <Swiften/SASL/PLAINMessage.h>
 #include <Swiften/StreamStack/StreamStack.h>
 #include <Swiften/StreamStack/TLSServerLayer.h>
 #include <Swiften/Elements/StartTLSRequest.h>
 #include <Swiften/Elements/TLSProceed.h>
 #include <iostream>
 namespace Swift {
 ServerFromClientSession::ServerFromClientSession(
 		const std::string& id,
 		boost::shared_ptr<Connection> connection,
+}
 void ServerFromClientSession::handlePasswordInvalid(const std::string &user) {
 	if (user != JID(user_, getLocalJID().getDomain()).toString() || authenticated_)
 		return;
 	if (!isInitialized()) {
 		user_ = "/././";
 		getXMPPLayer()->writeElement(boost::shared_ptr<AuthFailure>(new AuthFailure));
 		finishSession(AuthenticationFailedError);
 		onPasswordInvalid();
+	}
+}
 void ServerFromClientSession::handleElement(boost::shared_ptr<Element> element) {
 	if (isInitialized()) {
 		onElementReceived(element);

include/Swiften/Server/ServerFromClientSession.h

➞

Show inline comments

@@ @@ -39,12 +39,13 @@ namespace Swift { @@
 					PayloadParserFactoryCollection* payloadParserFactories,
 					PayloadSerializerCollection* payloadSerializers,
 					UserRegistry* userRegistry);
 			~ServerFromClientSession();
 			boost::signal<void ()> onSessionStarted;
 			boost::signal<void ()> onPasswordInvalid;
 			void setAllowSASLEXTERNAL();
 			const std::string &getUser() {
 				return user_;
+			}
 			void addTLSEncryption(TLSServerContextFactory* tlsContextFactory, const PKCS12Certificate& cert);

include/Swiften/Server/ServerStanzaChannel.cpp

➞

Show inline comments

 	send(presence);
+}
 void ServerStanzaChannel::finishSession(const JID& to, boost::shared_ptr<Element> element) {
 	std::vector<boost::shared_ptr<ServerFromClientSession> > candidateSessions;
 	for (std::list<boost::shared_ptr<ServerFromClientSession> >::const_iterator i = sessions[to.toBare().toString()].begin(); i != sessions[to.toBare().toString()].end(); ++i) {
 		if ((*i)->getRemoteJID().equals(to, JID::WithoutResource)) {
 			(*i)->sendElement(element);
 			candidateSessions.push_back(*i);
+		}
 		(*i)->sendElement(element);
 		candidateSessions.push_back(*i);
+	}
 	for (std::vector<boost::shared_ptr<ServerFromClientSession> >::const_iterator i = candidateSessions.begin(); i != candidateSessions.end(); ++i) {
 		(*i)->finishSession();
 		sessions[to.toBare().toString()].remove(*i);
+	}

src/networkpluginserver.cpp

➞

Show inline comments

@@ @@ -519,12 +519,13 @@ void NetworkPluginServer::pingTimeout() { @@
+	}
 	m_pingTimer->start();
+}
 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.");
 		return;
+	}
 	user->setData(c);
 	user->getConversationManager()->removeConversation(conv);
 	delete conv;
+}
 void NetworkPluginServer::handleUserDestroyed(User *user) {
 	std::cout << "HANDLE_DESTROYED\n";
 	UserInfo userInfo = user->getUserInfo();
 	pbnetwork::Logout logout;
 	logout.set_user(user->getJID().toBare());
 	logout.set_legacyname(userInfo.uin);

src/user.cpp

➞

Show inline comments

@@ @@ -39,12 +39,13 @@ using namespace boost; @@
 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;
@@ @@ -187,12 +188,13 @@ void User::handleDisconnected(const std::string &error) { @@
 	// In server mode, server finishes the session and pass unavailable session to userManager,
 	// 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()));
 		m_userManager->removeUser(this);
+	}
 	else {
 		m_userManager->removeUser(this);
+	}
+}

src/usermanager.cpp

➞

Show inline comments

 // // // 				if (c != NULL)
 // // // 					if (Transport::instance()->hasClientCapabilities(c->findAttribute("ver")))
 // // // 						user->setResource(stanza.from().resource(), stanza.priority(), Transport::instance()->getCapabilities(c->findAttribute("ver")));
 // // //
 			addUser(user);
+	}
 	// User can be handleDisconnected in addUser callbacks...
 	user = getUser(userkey);
 	if (!user) {
 		m_userRegistry->onPasswordInvalid(presence->getFrom());
 		return;
+	}
 	user->handlePresence(presence);
 	bool isMUC = presence->getPayload<Swift::MUCPayload>() != NULL || *presence->getTo().getNode().c_str() == '#';
 	if (isMUC)
 		return;
 // // 		Log(presence->getFrom().toString().getUTF8String(), "Subscribe presence received, but this user is not logged in");
 // 	}
+}
 void UserManager::connectUser(const Swift::JID &user) {
 	if (m_users.find(user.toBare().toString()) != m_users.end()) {
 		std::cout << "FOUND\n";
 		m_userRegistry->onPasswordValid(user);
+	}
 	else {
 		std::cout << "NOT FOUND - PRESENCe\n";
 		Swift::Presence::ref response = Swift::Presence::create();
 		response->setTo(m_component->getJID());
 		response->setFrom(user);
 		response->setType(Swift::Presence::Available);
 		m_component->onUserPresenceReceived(response);
+	}

0 comments (0 inline, 0 general)