libtransport.git Changeset - d44b8e486be6

Changeset - d44b8e486be6

Parent rev.

Child rev.

[Not reviewed]

Merge

0 10 3

HanzZ - 14 years ago 2011-12-07 17:38:59
hanzz.k@gmail.com

Merge branch 'master' of github.com:hanzz/libtransport

12 files changed with 212 insertions and 9 deletions:

ChangeLog

include/transport/mysqlbackend.h

include/transport/sqlite3backend.h

include/transport/storagebackend.h

include/transport/usermanager.h

include/transport/usersreconnecter.h

spectrum/src/main.cpp

src/mysqlbackend.cpp

src/sqlite3backend.cpp

src/transport.cpp

src/usermanager.cpp

src/usersreconnecter.cpp

0 comments (0 inline, 0 general)

ChangeLog

➞

Show inline comments

@@ new file 100644 @@
 version 2.0.0 alpha (2011-12-06):
 	General:
 	* First Spectrum 2.0.0 alpha release, check more on
 	  http://spectrum.im/projects/spectrum/wiki/Spectrum_200_alpha

include/transport/mysqlbackend.h

➞

Show inline comments

@@ @@ -79,12 +79,14 @@ class MySQLBackend : public StorageBackend @@
 		/// Returns JIDs of all buddies in user's roster.
 		/// \param id id of user - UserInfo.id
 		/// \param roster string list used to store user's roster
 		/// \return true if user has been found in database and roster has been fetched
 		bool getBuddies(long id, std::list<BuddyInfo> &roster);
 		bool getOnlineUsers(std::vector<std::string> &users);
 		long addBuddy(long userId, const BuddyInfo &buddyInfo);
 		void updateBuddy(long userId, const BuddyInfo &buddyInfo);
 		void removeBuddy(long id) {}
 		void getUserSetting(long userId, const std::string &variable, int &type, std::string &value);
@@ @@ -145,11 +147,12 @@ class MySQLBackend : public StorageBackend @@
 		Statement *m_addBuddy;
 		Statement *m_updateBuddy;
 		Statement *m_updateBuddySetting;
 		Statement *m_getBuddies;
 		Statement *m_getBuddiesSettings;
 		Statement *m_setUserOnline;
 		Statement *m_getOnlineUsers;
 };
+}
 #endif

include/transport/sqlite3backend.h

➞

Show inline comments

@@ @@ -67,12 +67,14 @@ class SQLite3Backend : public StorageBackend @@
 		/// Changes users online state variable in database.
 		/// \param id id of user - UserInfo.id
 		/// \param online online state
 		void setUserOnline(long id, bool online);
 		bool getOnlineUsers(std::vector<std::string> &users);
 		/// Removes user and all connected data from database.
 		/// \param id id of user - UserInfo.id
 		/// \return true if user has been found in database and removed
 		bool removeUser(long id);
 		/// Returns JIDs of all buddies in user's roster.
@@ @@ -112,11 +114,12 @@ class SQLite3Backend : public StorageBackend @@
 		sqlite3_stmt *m_addBuddy;
 		sqlite3_stmt *m_updateBuddy;
 		sqlite3_stmt *m_updateBuddySetting;
 		sqlite3_stmt *m_getBuddies;
 		sqlite3_stmt *m_getBuddiesSettings;
 		sqlite3_stmt *m_setUserOnline;
 		sqlite3_stmt *m_getOnlineUsers;
 };
+}
 #endif

include/transport/storagebackend.h

➞

Show inline comments

@@ @@ -105,12 +105,15 @@ class StorageBackend @@
 		/// removeUser
 		virtual bool removeUser(long id) = 0;
 		/// getBuddies
 		virtual bool getBuddies(long id, std::list<BuddyInfo> &roster) = 0;
 		/// getOnlineUsers
 		virtual bool getOnlineUsers(std::vector<std::string> &users) = 0;
 		virtual long addBuddy(long userId, const BuddyInfo &buddyInfo) = 0;
 		virtual void updateBuddy(long userId, const BuddyInfo &buddyInfo) = 0;
 		virtual void removeBuddy(long id) = 0;
 		virtual void getUserSetting(long userId, const std::string &variable, int &type, std::string &value) = 0;
 		virtual void updateUserSetting(long userId, const std::string &variable, const std::string &value) = 0;

include/transport/usermanager.h

➞

Show inline comments

@@ @@ -75,15 +75,15 @@ class UserManager : public Swift::EntityCapsProvider { @@
 		/// \return number of online users
 		int getUserCount();
 		/// Removes user. This function disconnects user and safely removes
 		/// User class. This does *not* remove user from StorageBackend.
 		/// \param user User class to remove
 		void removeUser(User *user);
+		void removeUser(User *user, bool onUserBehalf = true);
 		void removeAllUsers();
+		void removeAllUsers(bool onUserBehalf = true);
 		Swift::DiscoInfo::ref getCaps(const Swift::JID&) const;
 		/// Called when new User class is created.
 		/// \param user newly created User class
 		boost::signal<void (User *user)> onUserCreated;

include/transport/usersreconnecter.h

➞

Show inline comments

@@ new file 100644 @@
 /**
  * XMPP - libpurple transport
+ *
  * Copyright (C) 2009, Jan Kaluza <hanzz@soc.pidgin.im>
+ *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
  * (at your option) any later version.
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
 #pragma once
 #include <string>
 #include <algorithm>
 #include <vector>
 #include "Swiften/Swiften.h"
 namespace Transport {
 class StorageBackend;
 class Component;
 /// Tries to reconnect users who have been online before crash/restart.
 class UsersReconnecter {
 	public:
 		/// Creates new UsersReconnecter.
 		/// \param component Transport instance associated with this roster.
 		/// \param storageBackend StorageBackend from which the users will be fetched.
 		UsersReconnecter(Component *component, StorageBackend *storageBackend);
 		/// Destructor.
 		virtual ~UsersReconnecter();
 		void reconnectNextUser();
 	private:
 		void handleConnected();
 		Component *m_component;
 		StorageBackend *m_storageBackend;
 		bool m_started;
 		std::vector<std::string> m_users;
 		Swift::Timer::ref m_nextUserTimer;
 };
+}

spectrum/src/main.cpp

➞

Show inline comments

@@ @@ -6,12 +6,13 @@ @@
 #include "transport/sqlite3backend.h"
 #include "transport/mysqlbackend.h"
 #include "transport/userregistration.h"
 #include "transport/networkpluginserver.h"
 #include "transport/admininterface.h"
 #include "transport/statsresponder.h"
 #include "transport/usersreconnecter.h"
 #include "transport/util.h"
 #include "Swiften/EventLoop/SimpleEventLoop.h"
 #include <boost/filesystem.hpp>
 #include <boost/algorithm/string.hpp>
 #ifndef WIN32
 #include "sys/signal.h"
 Swift::SimpleEventLoop *eventLoop_ = NULL;
 Component *component_ = NULL;
 UserManager *userManager_ = NULL;
 static void stop_spectrum() {
 	userManager_->removeAllUsers();
+	userManager_->removeAllUsers(false);
 	component_->stop();
 	eventLoop_->stop();
+}
 static void spectrum_sigint_handler(int sig) {
 	eventLoop_->postEvent(&stop_spectrum);
@@ @@ -366,19 +367,21 @@ int main(int argc, char **argv) @@
+		}
+	}
 #endif
 	UserManager userManager(&transport, &userRegistry, storageBackend);
 	userManager_ = &userManager;
 	UserRegistration *userRegistration = NULL;
 	UsersReconnecter *usersReconnecter = NULL;
 	if (storageBackend) {
 		userRegistration = new UserRegistration(&transport, &userManager, storageBackend);
 		userRegistration->start();
 // 		logger.setUserRegistration(&userRegistration);
 		usersReconnecter = new UsersReconnecter(&transport, storageBackend);
+	}
 // 	logger.setUserManager(&userManager);
 	FileTransferManager ftManager(&transport, &userManager);
 	NetworkPluginServer plugin(&transport, &config, &userManager, &ftManager);
 	AdminInterface adminInterface(&transport, &userManager, &plugin, storageBackend);
@@ @@ -390,9 +393,14 @@ int main(int argc, char **argv) @@
 	eventLoop.run();
 	if (userRegistration) {
 		userRegistration->stop();
 		delete userRegistration;
+	}
 	if (usersReconnecter) {
 		delete usersReconnecter;
+	}
 	delete storageBackend;
 	delete factories;
+}

src/mysqlbackend.cpp

➞

Show inline comments

@@ @@ -297,12 +297,13 @@ void MySQLBackend::disconnect() { @@
 	delete m_getBuddiesSettings;
 	delete m_getUserSetting;
 	delete m_setUserSetting;
 	delete m_updateUserSetting;
 	delete m_updateBuddySetting;
 	delete m_setUserOnline;
 	delete m_getOnlineUsers;
 	mysql_close(&m_conn);
+}
 bool MySQLBackend::connect() {
 	LOG4CXX_INFO(logger, "Connecting MySQL server " << CONFIG_STRING(m_config, "database.server") << ", user " <<
 		CONFIG_STRING(m_config, "database.user") << ", database " << CONFIG_STRING(m_config, "database.database") <<
@@ @@ -336,12 +337,13 @@ bool MySQLBackend::connect() { @@
 	m_getUserSetting = new Statement(&m_conn, "is|is", "SELECT type, value FROM " + m_prefix + "users_settings WHERE user_id=? AND var=?");
 	m_setUserSetting = new Statement(&m_conn, "isis", "INSERT INTO " + m_prefix + "users_settings (user_id, var, type, value) VALUES (?,?,?,?)");
 	m_updateUserSetting = new Statement(&m_conn, "sis", "UPDATE " + m_prefix + "users_settings SET value=? WHERE user_id=? AND var=?");
 	m_setUserOnline = new Statement(&m_conn, "bi", "UPDATE " + m_prefix + "users SET online=?, last_login=NOW()  WHERE id=?");
 	m_getOnlineUsers = new Statement(&m_conn, "|s", "SELECT jid FROM " + m_prefix + "users WHERE online=1");
 	return true;
+}
 bool MySQLBackend::createDatabase() {
 	int not_exist = exec("CREATE TABLE IF NOT EXISTS `" + m_prefix + "buddies` ("
 void MySQLBackend::setUserOnline(long id, bool online) {
 	*m_setUserOnline << online << id;
 	EXEC(m_setUserOnline, setUserOnline(id, online));
+}
 bool MySQLBackend::getOnlineUsers(std::vector<std::string> &users) {
 	EXEC(m_getOnlineUsers, getOnlineUsers(users));
 	if (!exec_ok)
 		return false;
 	std::string jid;
 	while (m_getOnlineUsers->fetch() == 0) {
 		*m_getOnlineUsers >> jid;
 		users.push_back(jid);
+	}
 	return true;
+}
 long MySQLBackend::addBuddy(long userId, const BuddyInfo &buddyInfo) {
 // 	"INSERT INTO " + m_prefix + "buddies (user_id, uin, subscription, groups, nickname, flags) VALUES (?, ?, ?, ?, ?, ?)"
 	std::string groups = Util::serializeGroups(buddyInfo.groups);
 	*m_addBuddy << userId << buddyInfo.legacyName << buddyInfo.subscription;
 	*m_addBuddy << groups;
 	*m_addBuddy << buddyInfo.alias << buddyInfo.flags;

src/sqlite3backend.cpp

➞

Show inline comments

@@ @@ -96,12 +96,13 @@ SQLite3Backend::~SQLite3Backend(){ @@
 		FINALIZE_STMT(m_getBuddiesSettings);
 		FINALIZE_STMT(m_getUserSetting);
 		FINALIZE_STMT(m_setUserSetting);
 		FINALIZE_STMT(m_updateUserSetting);
 		FINALIZE_STMT(m_updateBuddySetting);
 		FINALIZE_STMT(m_setUserOnline);
 		FINALIZE_STMT(m_getOnlineUsers);
 		sqlite3_close(m_db);
+	}
+}
 bool SQLite3Backend::connect() {
 	LOG4CXX_INFO(logger, "Opening database " << CONFIG_STRING(m_config, "database.database"));
@@ @@ -129,12 +130,13 @@ bool SQLite3Backend::connect() { @@
 	PREP_STMT(m_getUserSetting, "SELECT type, value FROM " + m_prefix + "users_settings WHERE user_id=? AND var=?");
 	PREP_STMT(m_setUserSetting, "INSERT INTO " + m_prefix + "users_settings (user_id, var, type, value) VALUES (?,?,?,?)");
 	PREP_STMT(m_updateUserSetting, "UPDATE " + m_prefix + "users_settings SET value=? WHERE user_id=? AND var=?");
 	PREP_STMT(m_setUserOnline, "UPDATE " + m_prefix + "users SET online=?, last_login=DATETIME('NOW') WHERE id=?");
 	PREP_STMT(m_getOnlineUsers, "SELECT jid FROM " + m_prefix + "users WHERE online=1");
 	return true;
+}
 bool SQLite3Backend::createDatabase() {
 	int not_exist = exec("CREATE TABLE " + m_prefix + "buddies ("
 	BEGIN(m_setUserOnline);
 	BIND_INT(m_setUserOnline, (int)online);
 	BIND_INT(m_setUserOnline, id);
 	EXECUTE_STATEMENT(m_setUserOnline, "setUserOnline query");
+}
 bool SQLite3Backend::getOnlineUsers(std::vector<std::string> &users) {
 	sqlite3_reset(m_getOnlineUsers);
 	int ret;
 	while((ret = sqlite3_step(m_getOnlineUsers)) == SQLITE_ROW) {
 		std::string jid = (const char *) sqlite3_column_text(m_getOnlineUsers, 0);
 		users.push_back(jid);
+	}
 	if (ret != SQLITE_DONE) {
 		LOG4CXX_ERROR(logger, "getOnlineUsers query"<< (sqlite3_errmsg(m_db) == NULL ? "" : sqlite3_errmsg(m_db)));
 		return false;
+	}
 	return true;
+}
 long SQLite3Backend::addBuddy(long userId, const BuddyInfo &buddyInfo) {
 // 	"INSERT INTO " + m_prefix + "buddies (user_id, uin, subscription, groups, nickname, flags) VALUES (?, ?, ?, ?, ?, ?)"
 	BEGIN(m_addBuddy);
 	BIND_INT(m_addBuddy, userId);
 	BIND_STR(m_addBuddy, buddyInfo.legacyName);
 	BIND_STR(m_addBuddy, buddyInfo.subscription);

src/transport.cpp

➞

Show inline comments

@@ @@ -194,12 +194,14 @@ void Component::start() { @@
 		m_component->connect(CONFIG_STRING(m_config, "service.server"), CONFIG_INT(m_config, "service.port"));
 		m_reconnectTimer->stop();
+	}
 	else if (m_server) {
 		LOG4CXX_INFO(logger, "Starting component in server mode on port " << CONFIG_INT(m_config, "service.port"));
 		m_server->start();
 		// We're connected right here, because we're in server mode...
 		handleConnected();
+	}
+}
 void Component::stop() {
 	if (m_component) {
 		m_reconnectCount = 0;

src/usermanager.cpp

➞

Show inline comments

+	}
 	User *user = it->second;
 	return user->getCaps(jid);
+}
 void UserManager::removeUser(User *user) {
+void UserManager::removeUser(User *user, bool onUserBehalf) {
 	m_users.erase(user->getJID().toBare().toString());
 	if (m_cachedUser == user)
 		m_cachedUser = NULL;
 	if (m_component->inServerMode()) {
 		disconnectUser(user->getJID());
+	}
 	if (m_storageBackend) {
+	if (m_storageBackend && onUserBehalf) {
 		m_storageBackend->setUserOnline(user->getUserInfo().id, false);
+	}
 	onUserDestroyed(user);
 	delete user;
 #ifndef WIN32
 	malloc_trim(0);
 #endif
 // 	VALGRIND_DO_LEAK_CHECK;
+}
 void UserManager::removeAllUsers() {
+void UserManager::removeAllUsers(bool onUserBehalf) {
 	while(m_users.begin() != m_users.end()) {
 		removeUser((*m_users.begin()).second);
+		removeUser((*m_users.begin()).second, onUserBehalf);
+	}
+}
 int UserManager::getUserCount() {
 	return m_users.size();
+}

src/usersreconnecter.cpp

➞

Show inline comments

@@ new file 100644 @@
 /**
  * XMPP - libpurple transport
+ *
  * Copyright (C) 2009, Jan Kaluza <hanzz@soc.pidgin.im>
+ *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
  * (at your option) any later version.
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
 #include "transport/usersreconnecter.h"
 #include <iostream>
 #include <boost/bind.hpp>
 #include "Swiften/Queries/IQRouter.h"
 #include "Swiften/Swiften.h"
 #include "transport/storagebackend.h"
 #include "transport/transport.h"
 #include "log4cxx/logger.h"
 using namespace log4cxx;
 using namespace Swift;
 using namespace boost;
 namespace Transport {
 static LoggerPtr logger = Logger::getLogger("UserReconnecter");
 UsersReconnecter::UsersReconnecter(Component *component, StorageBackend *storageBackend) {
 	m_component = component;
 	m_storageBackend = storageBackend;
 	m_started = false;
 	m_nextUserTimer = m_component->getNetworkFactories()->getTimerFactory()->createTimer(1000);
 	m_nextUserTimer->onTick.connect(boost::bind(&UsersReconnecter::reconnectNextUser, this));
 	m_component->onConnected.connect(bind(&UsersReconnecter::handleConnected, this));
+}
 UsersReconnecter::~UsersReconnecter() {
 	m_component->onConnected.disconnect(bind(&UsersReconnecter::handleConnected, this));
 	m_nextUserTimer->stop();
 	m_nextUserTimer->onTick.disconnect(boost::bind(&UsersReconnecter::reconnectNextUser, this));
+}
 void UsersReconnecter::reconnectNextUser() {
 	if (m_users.empty()) {
 		LOG4CXX_INFO(logger, "All users reconnected, stopping UserReconnecter.");
 		return;
+	}
 	std::string user = m_users.back();
 	m_users.pop_back();
 	LOG4CXX_INFO(logger, "Sending probe presence to " << user);
 	Swift::Presence::ref response = Swift::Presence::create();
 	response->setTo(user);
 	response->setFrom(m_component->getJID());
 	response->setType(Swift::Presence::Probe);
 	m_component->getStanzaChannel()->sendPresence(response);
 	m_nextUserTimer->start();
+}
 void UsersReconnecter::handleConnected() {
 	if (m_started)
 		return;
 	LOG4CXX_INFO(logger, "Starting UserReconnecter.");
 	m_started = true;
 	m_storageBackend->getOnlineUsers(m_users);
 	reconnectNextUser();
+}
+}

0 comments (0 inline, 0 general)