libtransport.git Changeset - 1b1d1e05008e

Changeset - 1b1d1e05008e

Parent rev.

Child rev.

[Not reviewed]

Merge

0 12 0

Jan Kaluza - 13 years ago 2012-07-25 15:37:32
hanzz.k@gmail.com

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

11 files changed with 76 insertions and 4 deletions:

backends/libpurple/main.cpp

backends/libyahoo2/main.cpp

include/transport/mysqlbackend.h

include/transport/pqxxbackend.h

include/transport/rosterstorage.h

include/transport/sqlite3backend.h

include/transport/storagebackend.h

src/networkpluginserver.cpp

src/rostermanager.cpp

src/rosterstorage.cpp

src/sqlite3backend.cpp

0 comments (0 inline, 0 general)

backends/libpurple/main.cpp

➞

Show inline comments

@@ @@ -387,14 +387,12 @@ class SpectrumNetworkPlugin : public NetworkPlugin { @@
+				}
 // 				VALGRIND_DO_LEAK_CHECK;
 				m_sessions.erase(user);
 				purple_account_disconnect(account);
 				purple_account_set_enabled(account, "spectrum", FALSE);
 				g_free(account->ui_data);
 				account->ui_data = NULL;
 				m_accounts.erase(account);
 				purple_accounts_delete(account);
 #ifndef WIN32
 				malloc_trim(0);
 #endif

backends/libyahoo2/main.cpp

➞

Show inline comments

@@ @@ -13,12 +13,13 @@ @@
 #include "yahoohandler.h"
 #include "yahoolocalaccount.h"
 #include "httpfetch.h"
 // Swiften
 #include "Swiften/Swiften.h"
 #include "Swiften/Network/TLSConnectionFactory.h"
 #include "Swiften/TLS/OpenSSL/OpenSSLContextFactory.h"
 // for signal handler
 #include "unistd.h"
 #include "signal.h"
 #include "sys/wait.h"

include/transport/mysqlbackend.h

➞

Show inline comments

@@ @@ -86,12 +86,15 @@ class MySQLBackend : public StorageBackend @@
 		long addBuddy(long userId, const BuddyInfo &buddyInfo);
 		void updateBuddy(long userId, const BuddyInfo &buddyInfo);
 		void removeBuddy(long id) {}
 		void getBuddySetting(long userId, long buddyId, const std::string &variable, int &type, std::string &value) {}
 		void updateBuddySetting(long userId, long buddyId, const std::string &variable, int type, const std::string &value) {}
 		void getUserSetting(long userId, const std::string &variable, int &type, std::string &value);
 		void updateUserSetting(long userId, const std::string &variable, const std::string &value);
 		void beginTransaction();
 		void commitTransaction();

include/transport/pqxxbackend.h

➞

Show inline comments

@@ @@ -86,12 +86,15 @@ class PQXXBackend : public StorageBackend @@
 		long addBuddy(long userId, const BuddyInfo &buddyInfo);
 		void updateBuddy(long userId, const BuddyInfo &buddyInfo);
 		void removeBuddy(long id) {}
 		void getBuddySetting(long userId, long buddyId, const std::string &variable, int &type, std::string &value) {}
 		void updateBuddySetting(long userId, long buddyId, const std::string &variable, int type, const std::string &value) {}
 		void getUserSetting(long userId, const std::string &variable, int &type, std::string &value);
 		void updateUserSetting(long userId, const std::string &variable, const std::string &value);
 		void beginTransaction();
 		void commitTransaction();

include/transport/rosterstorage.h

➞

Show inline comments

@@ @@ -37,12 +37,14 @@ class RosterStorage { @@
 		virtual ~RosterStorage();
 		// Add buddy to store queue and store it in future. Nothing
 		// will happen if buddy is already added.
 		void storeBuddy(Buddy *buddy);
 		void removeBuddy(Buddy *buddy);
 		// Store all buddies from queue immediately. Returns true
 		// if some buddies were stored.
 		bool storeBuddies();
 		// Remove buddy from storage queue.
 		void removeBuddyFromQueue(Buddy *buddy);

include/transport/sqlite3backend.h

➞

Show inline comments

@@ @@ -83,13 +83,16 @@ class SQLite3Backend : public StorageBackend @@
 		/// \return true if user has been found in database and roster has been fetched
 		bool getBuddies(long id, std::list<BuddyInfo> &roster);
 		long addBuddy(long userId, const BuddyInfo &buddyInfo);
 		void updateBuddy(long userId, const BuddyInfo &buddyInfo);
 		void removeBuddy(long id) {}
 		void removeBuddy(long id);
 		void getBuddySetting(long userId, long buddyId, const std::string &variable, int &type, std::string &value);
 		void updateBuddySetting(long userId, long buddyId, const std::string &variable, int type, const std::string &value);
 		void getUserSetting(long userId, const std::string &variable, int &type, std::string &value);
 		void updateUserSetting(long userId, const std::string &variable, const std::string &value);
 		void beginTransaction();
 		void commitTransaction();
@@ @@ -108,15 +111,18 @@ class SQLite3Backend : public StorageBackend @@
 		sqlite3_stmt *m_setUserSetting;
 		sqlite3_stmt *m_updateUserSetting;
 		sqlite3_stmt *m_removeUser;
 		sqlite3_stmt *m_removeUserBuddies;
 		sqlite3_stmt *m_removeUserSettings;
 		sqlite3_stmt *m_removeUserBuddiesSettings;
 		sqlite3_stmt *m_removeBuddy;
 		sqlite3_stmt *m_removeBuddySettings;
 		sqlite3_stmt *m_addBuddy;
 		sqlite3_stmt *m_updateBuddy;
 		sqlite3_stmt *m_updateBuddySetting;
 		sqlite3_stmt *m_getBuddySetting;
 		sqlite3_stmt *m_getBuddies;
 		sqlite3_stmt *m_getBuddiesSettings;
 		sqlite3_stmt *m_setUserOnline;
 		sqlite3_stmt *m_getOnlineUsers;
 };

include/transport/storagebackend.h

➞

Show inline comments

@@ @@ -116,12 +116,15 @@ class StorageBackend @@
 		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 getBuddySetting(long userId, long buddyId, const std::string &variable, int &type, std::string &value) = 0;
 		virtual void updateBuddySetting(long userId, long buddyId, const std::string &variable, int type, const std::string &value) = 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;
 		virtual void beginTransaction() = 0;
 		virtual void commitTransaction() = 0;

src/networkpluginserver.cpp

➞

Show inline comments

@@ @@ -202,13 +202,12 @@ static void SigCatcher(int n) { @@
 static void handleBuddyPayload(LocalBuddy *buddy, const pbnetwork::Buddy &payload) {
 	buddy->setName(payload.buddyname());
 	// Set alias only if it's not empty. Backends are allowed to send empty alias if it has
 	// not changed.
 	if (!payload.alias().empty()) {
 		LOG4CXX_INFO(logger, "Setting alias to " << payload.alias() << " " << buddy->getAlias());
 		buddy->setAlias(payload.alias());
+	}
 	// Change groups if it's not empty. The same as above...
 	std::vector<std::string> groups;
 	for (int i = 0; i < payload.group_size(); i++) {

src/rostermanager.cpp

➞

Show inline comments

 		sendBuddyRosterRemove(buddy);
+	}
 	else {
 		sendBuddyUnsubscribePresence(buddy);
+	}
 	if (m_rosterStorage)
 		m_rosterStorage->removeBuddy(buddy);
 	unsetBuddy(buddy);
 	delete buddy;
+}
 void RosterManager::sendBuddyRosterRemove(Buddy *buddy) {
 	Swift::RosterPayload::ref p = Swift::RosterPayload::ref(new Swift::RosterPayload());

src/rosterstorage.cpp

➞

Show inline comments

+}
 RosterStorage::~RosterStorage() {
 	m_storageTimer->stop();
+}
 void RosterStorage::removeBuddy(Buddy *buddy) {
 	if (buddy->getID() != -1) {
 		m_storageBackend->removeBuddy(buddy->getID());
+	}
+}
 void RosterStorage::storeBuddy(Buddy *buddy) {
 	if (!buddy) {
 		return;
+	}
 	if (buddy->getName().empty()) {
 		return;

src/sqlite3backend.cpp

➞

Show inline comments

@@ @@ -85,20 +85,23 @@ SQLite3Backend::~SQLite3Backend(){ @@
 		FINALIZE_STMT(m_setUser);
 		FINALIZE_STMT(m_getUser);
 		FINALIZE_STMT(m_removeUser);
 		FINALIZE_STMT(m_removeUserBuddies);
 		FINALIZE_STMT(m_removeUserSettings);
 		FINALIZE_STMT(m_removeUserBuddiesSettings);
 		FINALIZE_STMT(m_removeBuddy);
 		FINALIZE_STMT(m_removeBuddySettings);
 		FINALIZE_STMT(m_addBuddy);
 		FINALIZE_STMT(m_updateBuddy);
 		FINALIZE_STMT(m_getBuddies);
 		FINALIZE_STMT(m_getBuddiesSettings);
 		FINALIZE_STMT(m_getUserSetting);
 		FINALIZE_STMT(m_setUserSetting);
 		FINALIZE_STMT(m_updateUserSetting);
 		FINALIZE_STMT(m_updateBuddySetting);
 		FINALIZE_STMT(m_getBuddySetting);
 		FINALIZE_STMT(m_setUserOnline);
 		FINALIZE_STMT(m_getOnlineUsers);
 		sqlite3_close(m_db);
+	}
+}
@@ @@ -119,17 +122,21 @@ bool SQLite3Backend::connect() { @@
 	PREP_STMT(m_removeUser, "DELETE FROM " + m_prefix + "users WHERE id=?");
 	PREP_STMT(m_removeUserBuddies, "DELETE FROM " + m_prefix + "buddies WHERE user_id=?");
 	PREP_STMT(m_removeUserSettings, "DELETE FROM " + m_prefix + "users_settings WHERE user_id=?");
 	PREP_STMT(m_removeUserBuddiesSettings, "DELETE FROM " + m_prefix + "buddies_settings WHERE user_id=?");
 	PREP_STMT(m_removeBuddy, "DELETE FROM " + m_prefix + "buddies WHERE id=?");
 	PREP_STMT(m_removeBuddySettings, "DELETE FROM " + m_prefix + "buddies_settings WHERE buddy_id=?");
 	PREP_STMT(m_addBuddy, "INSERT INTO " + m_prefix + "buddies (user_id, uin, subscription, groups, nickname, flags) VALUES (?, ?, ?, ?, ?, ?)");
 	PREP_STMT(m_updateBuddy, "UPDATE " + m_prefix + "buddies SET groups=?, nickname=?, flags=?, subscription=? WHERE user_id=? AND uin=?");
 	PREP_STMT(m_getBuddies, "SELECT id, uin, subscription, nickname, groups, flags FROM " + m_prefix + "buddies WHERE user_id=? ORDER BY id ASC");
 	PREP_STMT(m_getBuddiesSettings, "SELECT buddy_id, type, var, value FROM " + m_prefix + "buddies_settings WHERE user_id=? ORDER BY buddy_id ASC");
 	PREP_STMT(m_updateBuddySetting, "INSERT OR REPLACE INTO " + m_prefix + "buddies_settings (user_id, buddy_id, var, type, value) VALUES (?, ?, ?, ?, ?)");
 	PREP_STMT(m_getBuddySetting, "SELECT type, value FROM " + m_prefix + "buddies_settings WHERE user_id=? AND buddy_id=? AND var=?");
 	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=?");
 		return false;
+	}
 	return true;
+}
 void SQLite3Backend::removeBuddy(long id) {
 	sqlite3_reset(m_removeBuddy);
 	sqlite3_bind_int(m_removeBuddy, 1, id);
 	if(sqlite3_step(m_removeBuddy) != SQLITE_DONE) {
 		LOG4CXX_ERROR(logger, "removeBuddy query"<< (sqlite3_errmsg(m_db) == NULL ? "" : sqlite3_errmsg(m_db)));
 		return;
+	}
 	sqlite3_reset(m_removeBuddySettings);
 	sqlite3_bind_int(m_removeBuddySettings, 1, id);
 	if(sqlite3_step(m_removeBuddySettings) != SQLITE_DONE) {
 		LOG4CXX_ERROR(logger, "removeBuddySettings query"<< (sqlite3_errmsg(m_db) == NULL ? "" : sqlite3_errmsg(m_db)));
 		return;
+	}
+}
 bool SQLite3Backend::removeUser(long id) {
 	sqlite3_reset(m_removeUser);
 	sqlite3_bind_int(m_removeUser, 1, id);
 	if(sqlite3_step(m_removeUser) != SQLITE_DONE) {
 		LOG4CXX_ERROR(logger, "removeUser query"<< (sqlite3_errmsg(m_db) == NULL ? "" : sqlite3_errmsg(m_db)));
 		return false;
 	BIND_STR(m_updateUserSetting, value);
 	BIND_INT(m_updateUserSetting, id);
 	BIND_STR(m_updateUserSetting, variable);
 	EXECUTE_STATEMENT(m_updateUserSetting, "m_updateUserSetting");
+}
 void SQLite3Backend::getBuddySetting(long userId, long buddyId, const std::string &variable, int &type, std::string &value) {
 	BEGIN(m_getBuddySetting);
 	BIND_INT(m_getBuddySetting, userId);
 	BIND_INT(m_getBuddySetting, buddyId);
 	BIND_STR(m_getBuddySetting, variable);
 	if(sqlite3_step(m_getBuddySetting) == SQLITE_ROW) {
 		type = GET_INT(m_getBuddySetting);
 		value = GET_STR(m_getBuddySetting);
+	}
 	int ret;
 	while((ret = sqlite3_step(m_getBuddySetting)) == SQLITE_ROW) {
+	}
+}
 void SQLite3Backend::updateBuddySetting(long userId, long buddyId, const std::string &variable, int type, const std::string &value) {
 	BEGIN(m_updateBuddySetting);
 	BIND_INT(m_updateBuddySetting, userId);
 	BIND_INT(m_updateBuddySetting, buddyId);
 	BIND_STR(m_updateBuddySetting, variable);
 	BIND_INT(m_updateBuddySetting, type);
 	BIND_STR(m_updateBuddySetting, value);
 	EXECUTE_STATEMENT(m_updateBuddySetting, "m_updateBuddySetting");
+}
 void SQLite3Backend::beginTransaction() {
 	exec("BEGIN TRANSACTION;");
+}
 void SQLite3Backend::commitTransaction() {
 	exec("COMMIT TRANSACTION;");

0 comments (0 inline, 0 general)