libtransport.git Changeset - bfe84737ee18

Changeset - bfe84737ee18

Parent rev.

Child rev.

[Not reviewed]

0 2 0

HanzZ - 14 years ago 2011-11-07 20:11:49
hanzz.k@gmail.com

Remove remoteRosterRequest in RosterManager destructor

2 files changed with 10 insertions and 3 deletions:

include/transport/rostermanager.h

src/rostermanager.cpp

0 comments (0 inline, 0 general)

include/transport/rostermanager.h

➞

Show inline comments

@@ @@ -104,27 +104,28 @@ class RosterManager { @@
 		void sendBuddySubscribePresence(Buddy *buddy);
 		void sendCurrentPresences(const Swift::JID &to);
 		void sendCurrentPresence(const Swift::JID &from, const Swift::JID &to);
 		void sendUnavailablePresences(const Swift::JID &to);
 	private:
 		void setBuddyCallback(Buddy *buddy);
 		void sendRIE();
 		void handleBuddyRosterPushResponse(Swift::ErrorPayload::ref error, Swift::SetRosterRequest::ref request, const std::string &key);
 		void handleRemoteRosterResponse(boost::shared_ptr<Swift::RosterPayload> roster, Swift::ErrorPayload::ref error);
 		std::map<std::string, Buddy *, std::less<std::string>, boost::pool_allocator< std::pair<std::string, Buddy *> > > m_buddies;
 		Component *m_component;
 		RosterStorage *m_rosterStorage;
 		User *m_user;
 		Swift::Timer::ref m_setBuddyTimer;
 		Swift::Timer::ref m_RIETimer;
 		std::list <Swift::SetRosterRequest::ref> m_requests;
 		bool m_supportRemoteRoster;
 		AddressedRosterRequest::ref m_remoteRosterRequest;
 };
+}

src/rostermanager.cpp

➞

Show inline comments

@@ @@ -31,63 +31,68 @@ @@
 #include "Swiften/Elements/RosterItemExchangePayload.h"
 #include "log4cxx/logger.h"
 #include <boost/foreach.hpp>
 #include <map>
 #include <iterator>
 using namespace log4cxx;
 namespace Transport {
 static LoggerPtr logger = Logger::getLogger("RosterManager");
 RosterManager::RosterManager(User *user, Component *component){
 	m_rosterStorage = NULL;
 	m_user = user;
 	m_component = component;
 	m_setBuddyTimer = m_component->getNetworkFactories()->getTimerFactory()->createTimer(1000);
 	m_RIETimer = m_component->getNetworkFactories()->getTimerFactory()->createTimer(5000);
 	m_RIETimer->onTick.connect(boost::bind(&RosterManager::sendRIE, this));
 	m_supportRemoteRoster = false;
 	if (!m_component->inServerMode()) {
 		AddressedRosterRequest::ref request = AddressedRosterRequest::ref(new AddressedRosterRequest(m_component->getIQRouter(), m_user->getJID().toBare()));
 		request->onResponse.connect(boost::bind(&RosterManager::handleRemoteRosterResponse, this, _1, _2));
 		request->send();
 		m_remoteRosterRequest = AddressedRosterRequest::ref(new AddressedRosterRequest(m_component->getIQRouter(), m_user->getJID().toBare()));
 		m_remoteRosterRequest->onResponse.connect(boost::bind(&RosterManager::handleRemoteRosterResponse, this, _1, _2));
 		m_remoteRosterRequest->send();
+	}
+}
 RosterManager::~RosterManager() {
 	m_setBuddyTimer->stop();
 	m_RIETimer->stop();
 	if (m_rosterStorage) {
 		m_rosterStorage->storeBuddies();
+	}
 	sendUnavailablePresences(m_user->getJID().toBare());
 	if (m_remoteRosterRequest) {
 		m_remoteRosterRequest->onResponse.disconnect_all_slots();
 		m_component->getIQRouter()->removeHandler(m_remoteRosterRequest);
+	}
 	for (std::map<std::string, Buddy *, std::less<std::string>, boost::pool_allocator< std::pair<std::string, Buddy *> > >::iterator it = m_buddies.begin(); it != m_buddies.end(); it++) {
 		Buddy *buddy = (*it).second;
 		if (!buddy) {
 			continue;
+		}
 		delete buddy;
+	}
 	if (m_requests.size() != 0) {
 		LOG4CXX_INFO(logger, m_user->getJID().toString() <<  ": Removing " << m_requests.size() << " unresponded IQs");
 		BOOST_FOREACH(Swift::SetRosterRequest::ref request, m_requests) {
 			request->onResponse.disconnect_all_slots();
 			m_component->getIQRouter()->removeHandler(request);
+		}
 		m_requests.clear();
+	}
 	boost::singleton_pool<boost::pool_allocator_tag, sizeof(unsigned int)>::release_memory();
 	if (m_rosterStorage)
 		delete m_rosterStorage;
+}
 void RosterManager::setBuddy(Buddy *buddy) {
@@ @@ -177,48 +182,49 @@ void RosterManager::unsetBuddy(Buddy *buddy) { @@
 		m_rosterStorage->removeBuddyFromQueue(buddy);
 	onBuddyUnset(buddy);
+}
 void RosterManager::storeBuddy(Buddy *buddy) {
 	if (m_rosterStorage) {
 		m_rosterStorage->storeBuddy(buddy);
+	}
+}
 void RosterManager::handleBuddyRosterPushResponse(Swift::ErrorPayload::ref error, Swift::SetRosterRequest::ref request, const std::string &key) {
 	LOG4CXX_INFO(logger, "handleBuddyRosterPushResponse called for buddy " << key);
 	if (m_buddies[key] != NULL) {
 		m_buddies[key]->handleBuddyChanged();
+	}
 	else {
 		LOG4CXX_WARN(logger, "handleBuddyRosterPushResponse called for unknown buddy " << key);
+	}
 	m_requests.remove(request);
 	request->onResponse.disconnect_all_slots();
+}
 void RosterManager::handleRemoteRosterResponse(boost::shared_ptr<Swift::RosterPayload> payload, Swift::ErrorPayload::ref error) {
 	m_remoteRosterRequest.reset();
 	if (error) {
 		m_supportRemoteRoster = false;
 		LOG4CXX_INFO(logger, m_user->getJID().toString() << ": This server does not support remote roster protoXEP");
 		return;
+	}
 	LOG4CXX_INFO(logger, m_user->getJID().toString() << ": This server supports remote roster protoXEP");
 	m_supportRemoteRoster = true;
 	return;
 	BOOST_FOREACH(const Swift::RosterItemPayload &item, payload->getItems()) {
 		std::string legacyName = Buddy::JIDToLegacyName(item.getJID());
 		if (m_buddies.find(legacyName) != m_buddies.end()) {
 			continue;
+		}
 		std::cout << "LEGACYNAME " << legacyName << "\n";
 		BuddyInfo buddyInfo;
 		buddyInfo.id = -1;
 		buddyInfo.alias = item.getName();
 		buddyInfo.legacyName = legacyName;
 		buddyInfo.subscription = "both";
 		buddyInfo.flags = Buddy::buddFlagsFromJID(item.getJID());

0 comments (0 inline, 0 general)