libtransport.git Changeset - 24d25a6f406b

Changeset - 24d25a6f406b

Parent rev.

Child rev.

[Not reviewed]

0 6 0

Jan Kaluza - 14 years ago 2011-08-24 08:31:32
hanzz.k@gmail.com

Finally working disconnect/connect with multiple resources

6 files changed with 52 insertions and 46 deletions:

include/transport/transport.h

include/transport/userregistry.h

spectrum/src/main.cpp

src/transport.cpp

src/usermanager.cpp

src/userregistry.cpp

0 comments (0 inline, 0 general)

include/transport/transport.h

➞

Show inline comments

@@ @@ -66,13 +66,13 @@ namespace Transport { @@
 			/// 	- service.jid
 			/// 	- service.password
 			/// 	- service.server
 			/// 	- service.port
 			/// 	- service.server_mode
 			/// \param factory Transport Abstract factory used to create basic transport structures.
 			Component(Swift::EventLoop *loop, Config *config, Factory *factory, Transport::UserRegistry *userRegistry = NULL);
+			Component(Swift::EventLoop *loop, Swift::BoostNetworkFactories *factories, Config *config, Factory *factory, Transport::UserRegistry *userRegistry = NULL);
 			/// Component destructor.
 			~Component();
 			/// Returns Swift::StanzaChannel associated with this Transport::Component.

include/transport/userregistry.h

➞

Show inline comments

@@ @@ -57,13 +57,13 @@ namespace Transport { @@
 class UserRegistry : public Swift::UserRegistry {
 	public:
 		/// Creates new UserRegistry.
 		/// \param cfg Config file
 		/// 	- service.admin_username - username for admin account
 		/// 	- service.admin_password - password for admin account
 		UserRegistry(Config *cfg);
+		UserRegistry(Config *cfg, Swift::NetworkFactories *factories);
 		/// Destructor.
 		virtual ~UserRegistry();
 		/// Called to detect wheter the password is valid.
 		/// \param user JID of user who is logging in.
@@ @@ -81,12 +81,16 @@ class UserRegistry : public Swift::UserRegistry { @@
 		void onPasswordValid(const Swift::JID &user);
 		/// Informs user that the password is invalid and disconnects him.
 		/// \param user JID.
 		void onPasswordInvalid(const Swift::JID &user);
 		/// Removes session later.
 		/// \param user JID.
 		void removeLater(const Swift::JID &user);
 		/// Returns current password for particular user
 		/// \param barejid JID.
 		const std::string getUserPassword(const std::string &barejid);
 		/// Emitted when user wants to connect legacy network to validate the password.
 		boost::signal<void (const Swift::JID &user)> onConnectUser;
@@ @@ -97,11 +101,15 @@ class UserRegistry : public Swift::UserRegistry { @@
 	private:
 		typedef struct {
 			std::string password;
 			Swift::ServerFromClientSession *session;
 		} Sess;
 		void handleRemoveTimeout(const Swift::JID &user);
 		mutable std::map<std::string, Sess> users;
 		mutable Config *config;
 		Swift::Timer::ref m_removeTimer;
 		bool m_inRemoveLater;
 };
+}

spectrum/src/main.cpp

➞

Show inline comments

@@ @@ -71,16 +71,18 @@ int main(int argc, char **argv) @@
 	if (!config.load(argv[1])) {
 		std::cerr << "Can't load configuration file.\n";
 		return 1;
+	}
 	UserRegistry userRegistry(&config);
 	Swift::SimpleEventLoop eventLoop;
 	Component transport(&eventLoop, &config, NULL, &userRegistry);
 	Swift::BoostNetworkFactories *factories = new Swift::BoostNetworkFactories(&eventLoop);
 	UserRegistry userRegistry(&config, factories);
 	Component transport(&eventLoop, factories, &config, NULL, &userRegistry);
 // 	Logger logger(&transport);
 	StorageBackend *storageBackend = NULL;
 	if (CONFIG_STRING(&config, "database.type") == "sqlite3") {
 		storageBackend = new SQLite3Backend(&config);
@@ @@ -115,7 +117,8 @@ int main(int argc, char **argv) @@
 	eventLoop.run();
 	if (userRegistration) {
 		userRegistration->stop();
 		delete userRegistration;
+	}
 	delete storageBackend;
 	delete factories;
+}

src/transport.cpp

➞

Show inline comments

@@ @@ -48,13 +48,13 @@ using namespace log4cxx; @@
 namespace Transport {
 static LoggerPtr logger = Logger::getLogger("Component");
 static LoggerPtr logger_xml = Logger::getLogger("Component.XML");
 Component::Component(Swift::EventLoop *loop, Config *config, Factory *factory, Transport::UserRegistry *userRegistry) {
+Component::Component(Swift::EventLoop *loop, Swift::BoostNetworkFactories *factories, Config *config, Factory *factory, Transport::UserRegistry *userRegistry) {
 	m_component = NULL;
 	m_userRegistry = NULL;
 	m_server = NULL;
 	m_reconnectCount = 0;
 	m_config = config;
 	m_factory = factory;
 	else {
 		log4cxx::PropertyConfigurator::configure(CONFIG_STRING(m_config, "logging.config"));
+	}
 	m_jid = Swift::JID(CONFIG_STRING(m_config, "service.jid"));
-	m_factories = new BoostNetworkFactories(loop);
+	m_factories = factories;
 	m_reconnectTimer = m_factories->getTimerFactory()->createTimer(3000);
 	m_reconnectTimer->onTick.connect(bind(&Component::start, this));
 	if (CONFIG_BOOL(m_config, "service.server_mode")) {
 		LOG4CXX_INFO(logger, "Creating component in server mode on port " << CONFIG_INT(m_config, "service.port"));
@@ @@ -146,13 +146,12 @@ Component::~Component() { @@
 	if (m_component)
 		delete m_component;
 	if (m_server) {
 		m_server->stop();
 		delete m_server;
+	}
 	delete m_factories;
+}
 Swift::StanzaChannel *Component::getStanzaChannel() {
 	return m_stanzaChannel;
+}

src/usermanager.cpp

➞

Show inline comments

 	User *user = getUser(jid);
 	if (user != u) {
 		return;
+	}
 	if (user) {
 		// Reconnect means that we're disconnecting this User instance from legacy network backend,
 		// but we're going to connect it again in this call. Currently it's used only when
 		// "service.more_resources==false".
 		if (reconnect) {
 			// Send message about reason
 			boost::shared_ptr<Swift::Message> msg(new Swift::Message());
 			msg->setBody("You have signed on from another location.");
 			msg->setTo(user->getJID().toBare());
 			msg->setFrom(m_component->getJID());
 			m_component->getStanzaChannel()->sendMessage(msg);
 			// finishSession generates unavailable presence which ruins the second session which is waiting
 			// to be connected later in this function, so don't handle that unavailable presence by disconnecting
 			// the signal. TODO: < This can be fixed by ServerFromClientSession.cpp rewrite...
 			m_component->onUserPresenceReceived.disconnect(bind(&UserManager::handlePresence, this, _1));
 			// Finish session
  			if (m_component->inServerMode()) {
  				dynamic_cast<Swift::ServerStanzaChannel *>(m_component->getStanzaChannel())->finishSession(user->getJID().toBare(), boost::shared_ptr<Swift::Element>(new Swift::StreamError()));
+ 			}
  			// connect disconnected signal again
  			m_component->onUserPresenceReceived.connect(bind(&UserManager::handlePresence, this, _1));
+		}
 		removeUser(user);
+	}
 	// Connect the user again when we're reconnecting.
 	if (reconnect) {
 		connectUser(jid);
@@ @@ -325,13 +303,18 @@ void UserManager::connectUser(const Swift::JID &user) { @@
 	// to connect legacy network
 	if (m_users.find(user.toBare().toString()) != m_users.end()) {
 		if (!m_component->inServerMode()) {
 			return;
+		}
 		if (m_users[user.toBare().toString()]->isConnected()) {
 		User *u = m_users[user.toBare().toString()];
 		if (u->isConnected()) {
 			if (m_userRegistry->getUserPassword(user.toBare().toString()) != u->getUserInfo().password) {
 				m_userRegistry->removeLater(user);
 				return;
+			}
 			if (CONFIG_BOOL(m_component->getConfig(), "service.more_resources")) {
 				m_userRegistry->onPasswordValid(user);
+			}
 			else {
 				boost::shared_ptr<Swift::Message> msg(new Swift::Message());
 				msg->setBody("You have signed on from another location.");
@@ @@ -341,12 +324,17 @@ void UserManager::connectUser(const Swift::JID &user) { @@
 				m_userRegistry->onPasswordValid(user);
 				m_component->onUserPresenceReceived.disconnect(bind(&UserManager::handlePresence, this, _1));
 				dynamic_cast<Swift::ServerStanzaChannel *>(m_component->getStanzaChannel())->finishSession(user, boost::shared_ptr<Swift::Element>(new Swift::StreamError()), true);
 				m_component->onUserPresenceReceived.connect(bind(&UserManager::handlePresence, this, _1));
+			}
+		}
 		else {
 			m_removeTimer->onTick.disconnect(boost::bind(&UserManager::handleRemoveTimeout, this, user.toBare().toString(), m_users[user.toBare().toString()], false));
 			m_removeTimer->onTick.connect(boost::bind(&UserManager::handleRemoveTimeout, this, user.toBare().toString(), m_users[user.toBare().toString()], true));
 			m_removeTimer->start();
+		}
 // 		}
 // 		else {
 // 			// Reconnect the user if more resources per one legacy network account are not allowed
 // 			m_removeTimer->onTick.connect(boost::bind(&UserManager::handleRemoveTimeout, this, user.toBare().toString(), true));
 // 			m_removeTimer->start();
 // 		}

src/userregistry.cpp

➞

Show inline comments

@@ @@ -28,17 +28,19 @@ @@
 using namespace log4cxx;
 namespace Transport {
 static LoggerPtr logger = Logger::getLogger("UserRegistry");
 UserRegistry::UserRegistry(Config *cfg) {
+UserRegistry::UserRegistry(Config *cfg, Swift::NetworkFactories *factories) {
 	config = cfg;
 	m_removeTimer = factories->getTimerFactory()->createTimer(1);
 	m_inRemoveLater = false;
+}
 UserRegistry::~UserRegistry() { }
+UserRegistry::~UserRegistry() { m_removeTimer->stop(); }
 void UserRegistry::isValidUserPassword(const Swift::JID& user, Swift::ServerFromClientSession *session, const Swift::SafeByteArray& password) {
 	if (!CONFIG_STRING(config, "service.admin_username").empty() && user.getNode() == CONFIG_STRING(config, "service.admin_username")) {
 		if (Swift::safeByteArrayToString(password) == CONFIG_STRING(config, "service.admin_password")) {
 			session->handlePasswordValid();
+		}
+	}
 	std::string key = user.toBare().toString();
 	// Users try to connect twice
 	if (users.find(key) != users.end()) {
 		// Kill the first session if the second password is same
 		if (Swift::safeByteArrayToString(password) == users[key].password) {
 			LOG4CXX_INFO(logger, key << ": Removing previous session and making this one active");
 			Swift::ServerFromClientSession *tmp = users[key].session;
 			users[key].session = session;
 			tmp->handlePasswordInvalid();
+		}
 		else {
 			LOG4CXX_INFO(logger, key << ": Possible break-in attemp (user logged as different one with bad password)");
 			session->handlePasswordInvalid();
 			return;
+		}
 		// Kill the first session
 		LOG4CXX_INFO(logger, key << ": Removing previous session and making this one active");
 		Swift::ServerFromClientSession *tmp = users[key].session;
 		users[key].session = session;
 		tmp->handlePasswordInvalid();
+	}
 	LOG4CXX_INFO(logger, key << ": Connecting this user to find if password is valid");
 	users[key].password = Swift::safeByteArrayToString(password);
 	users[key].session = session;
 			LOG4CXX_WARN(logger, key << ": Stopping login process (user probably disconnected while logging in), but this is not active session");
+		}
+	}
 	else {
 		LOG4CXX_WARN(logger, key << ": Stopping login process (user probably disconnected while logging in) for invalid user");
+	}
 	onDisconnectUser(user);
 	if (!m_inRemoveLater)
 		onDisconnectUser(user);
+}
 void UserRegistry::onPasswordValid(const Swift::JID &user) {
 	std::string key = user.toBare().toString();
 	if (users.find(key) != users.end()) {
 		LOG4CXX_INFO(logger, key << ": Password is valid");
+	}
 	else {
 		LOG4CXX_INFO(logger, key << ": onPasswordInvalid called for invalid user");
+	}
+}
 void UserRegistry::handleRemoveTimeout(const Swift::JID &user) {
 	m_inRemoveLater = true;
 	onPasswordInvalid(user);
 	m_inRemoveLater = false;
+}
 void UserRegistry::removeLater(const Swift::JID &user) {
 	m_removeTimer->onTick.connect(boost::bind(&UserRegistry::handleRemoveTimeout, this, user));
 	m_removeTimer->start();
+}
 const std::string UserRegistry::getUserPassword(const std::string &barejid) {
 	if (users.find(barejid) != users.end())
 		return users[barejid].password;
 	return "";
+}

0 comments (0 inline, 0 general)