libtransport.git Changeset - 0d320a2990d7

Changeset - 0d320a2990d7

Parent rev.

Child rev.

[Not reviewed]

0 6 0

Jan Kaluza - 14 years ago 2011-08-23 08:02:41
hanzz.k@gmail.com

Remove from memory also users which disconnected because of error

6 files changed with 25 insertions and 46 deletions:

backends/libpurple/main.cpp

include/transport/buddy.h

include/transport/rostermanager.h

src/buddy.cpp

src/networkpluginserver.cpp

src/rostermanager.cpp

0 comments (0 inline, 0 general)

backends/libpurple/main.cpp

➞

Show inline comments

@@ @@ -250,13 +250,13 @@ class SpectrumNetworkPlugin : public NetworkPlugin { @@
+		}
 		void handleLogoutRequest(const std::string &user, const std::string &legacyName) {
 			PurpleAccount *account = m_sessions[user];
 			if (account) {
 // 				VALGRIND_DO_LEAK_CHECK;
-				m_sessions[user] = NULL;
+				m_sessions.erase(user);
 				purple_account_set_enabled(account, "spectrum", FALSE);
 				// Remove conversations.
 				// This has to be called before m_account->ui_data = NULL;, because it uses
 				// ui_data to call SpectrumMessageHandler::purpleConversationDestroyed() callback.
 				GList *iter;
@@ @@ -848,12 +848,13 @@ static PurpleConversationUiOps conversation_ui_ops = @@
 	NULL
 };
 static void connection_report_disconnect(PurpleConnection *gc, PurpleConnectionError reason, const char *text){
 	PurpleAccount *account = purple_connection_get_account(gc);
 	np->handleDisconnected(np->m_accounts[account], purple_account_get_username(account), (int) reason, text ? text : "");
 	np->handleLogoutRequest(np->m_accounts[account], purple_account_get_username(account));
+}
 static PurpleConnectionUiOps conn_ui_ops =
+{
 	NULL,
 	NULL,

include/transport/buddy.h

➞

Show inline comments

@@ @@ -29,13 +29,14 @@ @@
 namespace Transport {
 class RosterManager;
 typedef enum { 	BUDDY_NO_FLAG = 0,
 				BUDDY_JID_ESCAPING = 2,
 				BUDDY_IGNORE = 4
 				BUDDY_IGNORE = 4,
 				BUDDY_BLOCKED = 8,
 			} BuddyFlag;
 /// Represents one legacy network Buddy.
 class Buddy {
 	public:
 		/// Constructor.
@@ @@ -75,40 +76,32 @@ class Buddy { @@
 		/// \param features features used in returned stanza
 		/// \param only_new if True, this function returns Presence stanza only if it's different
 		/// than the previously generated one.
 		/// \return Presence stanza or NULL.
 		Swift::Presence::ref generatePresenceStanza(int features, bool only_new = false);
 		/// Marks this buddy as available.
 		void setOnline();
 		/// Marks this buddy as offline.
 		void setOffline();
 		void setBlocked(bool block) {
 			m_blocked = block;
 			if (block)
 				m_flags = (BuddyFlag) (m_flags | BUDDY_BLOCKED);
 			else
 				m_flags = (BuddyFlag) (m_flags & ~BUDDY_BLOCKED);
+		}
 		bool isBlocked() {
-			return m_blocked;
+			return m_flags & BUDDY_BLOCKED;
+		}
 		/// Returns true if this buddy is marked as available/online.
 		/// \return true if this buddy is marked as available/online.
 		bool isOnline();
 		/// Sets current subscription.
 		/// \param subscription "to", "from", "both", "ask"
 		void setSubscription(const std::string &subscription);
 		/// Returns current subscription
 		/// \return subscription "to", "from", "both", "ask"
-		const std::string &getSubscription();
 		const std::string getSubscription();
 		/// Sets this buddy's flags.
 		/// \param flags flags
 		void setFlags(BuddyFlag flags);
@@ @@ -134,15 +127,12 @@ class Buddy { @@
 		/// Handles VCard from legacy network and forwards it to XMPP user.
 		/// \param id ID used in IQ-result.
 		/// \param vcard VCard which will be sent.
 		void handleVCardReceived(const std::string &id, Swift::VCard::ref vcard);
 		/// This signal is emitted when buddyChanged method is called.
 		boost::signal<void ()> onBuddyChanged;
 		/// Returns legacy network username of this buddy. (for example UIN for ICQ, JID for Jabber, ...).
 		/// \return legacy network username
 		virtual std::string getName() = 0;
 		/// Returns alias (nickname) of this buddy.
@@ @@ -174,15 +164,12 @@ class Buddy { @@
 		static std::string JIDToLegacyName(const Swift::JID &jid);
 	private:
 		void generateJID();
 		long m_id;
 		bool m_online;
 		bool m_blocked;
 		std::string m_subscription;
 // 		Swift::Presence::ref m_lastPresence;
 		Swift::JID m_jid;
 		BuddyFlag m_flags;
 		RosterManager *m_rosterManager;
 };

include/transport/rostermanager.h

➞

Show inline comments

@@ @@ -77,12 +77,14 @@ class RosterManager { @@
 		boost::signal<void (Buddy *buddy)> onBuddyUnset;
 		boost::signal<void (Buddy *buddy)> onBuddyAdded;
 		boost::signal<void (Buddy *buddy)> onBuddyRemoved;
 		void handleBuddyChanged(Buddy *buddy);
 		void handleSubscription(Swift::Presence::ref presence);
 		void sendBuddyRosterPush(Buddy *buddy);
 		void sendBuddySubscribePresence(Buddy *buddy);

src/buddy.cpp

➞

Show inline comments

@@ @@ -23,13 +23,13 @@ @@
 #include "transport/user.h"
 #include "transport/transport.h"
 #include "Swiften/Elements/BlockPayload.h"
 namespace Transport {
-Buddy::Buddy(RosterManager *rosterManager, long id) : m_id(id), m_online(false), m_blocked(false), m_subscription("ask"), m_flags(BUDDY_NO_FLAG), m_rosterManager(rosterManager){
 Buddy::Buddy(RosterManager *rosterManager, long id) : m_id(id), m_flags(BUDDY_NO_FLAG), m_rosterManager(rosterManager){
 // 	m_rosterManager->setBuddy(this);
+}
 Buddy::~Buddy() {
 // 	m_rosterManager->unsetBuddy(this);
+}
@@ @@ -61,31 +61,18 @@ const Swift::JID &Buddy::getJID() { @@
 	if (!m_jid.isValid()) {
 		generateJID();
+	}
 	return m_jid;
+}
 void Buddy::setOnline() {
 	m_online = true;
+}
 void Buddy::setOffline() {
 	m_online = false;
 // 	m_lastPresence = Swift::Presence::ref();
+}
 bool Buddy::isOnline() {
 	return m_online;
+}
 void Buddy::setSubscription(const std::string &subscription) {
 	m_subscription = subscription;
+// 	m_subscription = subscription;
+}
 const std::string &Buddy::getSubscription() {
 	return m_subscription;
 const std::string Buddy::getSubscription() {
 	return "ask";
+}
 Swift::Presence::ref Buddy::generatePresenceStanza(int features, bool only_new) {
 	std::string alias = getAlias();
 	std::string name = getSafeName();
 		// caps
 // 		presence->addPayload(boost::shared_ptr<Swift::Payload>(new Swift::CapsInfo (CONFIG().caps)));
 // 		if (features & 0/*TRANSPORT_FEATURE_AVATARS*/) {
 			presence->addPayload(boost::shared_ptr<Swift::Payload>(new Swift::VCardUpdate (getIconHash())));
 // 		}
-		if (m_blocked) {
+		if (isBlocked()) {
 			presence->addPayload(boost::shared_ptr<Swift::Payload>(new Swift::BlockPayload ()));
+		}
+	}
 // 	if (only_new) {
 // 		if (m_lastPresence)
@@ @@ -152,13 +139,13 @@ std::string Buddy::getSafeName() { @@
 void Buddy::handleBuddyChanged() {
 	Swift::Presence::ref presence = generatePresenceStanza(255);
 	if (presence) {
 		m_rosterManager->getUser()->getComponent()->getStanzaChannel()->sendPresence(presence);
+	}
-	onBuddyChanged();
+	m_rosterManager->handleBuddyChanged(this);
+}
 void Buddy::handleVCardReceived(const std::string &id, Swift::VCard::ref vcard) {
 	boost::shared_ptr<Swift::GenericRequest<Swift::VCard> > request(new Swift::GenericRequest<Swift::VCard>(Swift::IQ::Result, m_rosterManager->getUser()->getJID(), vcard, m_rosterManager->getUser()->getComponent()->getIQRouter()));
 	request->send();
+}

src/networkpluginserver.cpp

➞

Show inline comments

 	buddy->setStatus(Swift::StatusShow((Swift::StatusShow::Type) payload.status()), payload.statusmessage());
 	buddy->setIconHash(payload.iconhash());
 	buddy->setBlocked(payload.blocked());
+}
 NetworkPluginServer::NetworkPluginServer(Component *component, Config *config, UserManager *userManager) {
 	std::cout << "BUDDY " << sizeof(Buddy) << "\n";
 	m_userManager = userManager;
 	m_config = config;
 	m_component = component;
 	m_isNextLongRun = false;
 	m_component->m_factory = new NetworkFactory(this);
 	m_userManager->onUserCreated.connect(boost::bind(&NetworkPluginServer::handleUserCreated, this, _1));

src/rostermanager.cpp

➞

Show inline comments

 	response->setFrom(buddy->getJID());
 	response->setType(Swift::Presence::Subscribe);
 // 	TODO: NICKNAME
 	m_component->getStanzaChannel()->sendPresence(response);
+}
 void RosterManager::setBuddyCallback(Buddy *buddy) {
 	m_setBuddyTimer->onTick.disconnect(boost::bind(&RosterManager::setBuddyCallback, this, buddy));
 void RosterManager::handleBuddyChanged(Buddy *buddy) {
 	if (m_rosterStorage) {
-		buddy->onBuddyChanged.connect(boost::bind(&RosterStorage::storeBuddy, m_rosterStorage, buddy));
+		m_rosterStorage->storeBuddy(buddy);
+	}
+}
 void RosterManager::setBuddyCallback(Buddy *buddy) {
 	m_setBuddyTimer->onTick.disconnect(boost::bind(&RosterManager::setBuddyCallback, this, buddy));
 	LOG4CXX_INFO(logger, "Associating buddy " << buddy->getName() << " with " << m_user->getJID().toString());
 	m_buddies[buddy->getName()] = buddy;
 	onBuddySet(buddy);
 	// In server mode the only way is to send jabber:iq:roster push.
 	storageBackend->getBuddies(m_user->getUserInfo().id, roster);
 	for (std::list<BuddyInfo>::const_iterator it = roster.begin(); it != roster.end(); it++) {
 		Buddy *buddy = m_component->getFactory()->createBuddy(this, *it);
 		LOG4CXX_INFO(logger, m_user->getJID().toString() << ": Adding cached buddy " << buddy->getName() << " fom database");
 		m_buddies[buddy->getName()] = buddy;
 		buddy->onBuddyChanged.connect(boost::bind(&RosterStorage::storeBuddy, m_rosterStorage, buddy));
 		onBuddySet(buddy);
+	}
+}
 Swift::RosterPayload::ref RosterManager::generateRosterPayload() {
 	Swift::RosterPayload::ref payload = Swift::RosterPayload::ref(new Swift::RosterPayload());

0 comments (0 inline, 0 general)