libtransport.git Changeset - c4cbaf3311d0

Changeset - c4cbaf3311d0

Parent rev.

Child rev.

[Not reviewed]

0 4 0

HanzZ - 14 years ago 2011-09-08 12:38:45
hanzz.k@gmail.com

support for remote-roster

4 files changed with 67 insertions and 6 deletions:

include/transport/rostermanager.h

src/localbuddy.cpp

src/mysqlbackend.cpp

src/rostermanager.cpp

0 comments (0 inline, 0 general)

include/transport/rostermanager.h

➞

Show inline comments

@@ @@ -67,12 +67,16 @@ class RosterManager { @@
 		Swift::RosterPayload::ref generateRosterPayload();
 		/// Returns user associated with this roster.
 		/// \return User
 		User *getUser() { return m_user; }
 		bool isRemoteRosterSupported() {
 			return m_supportRemoteRoster;
+		}
 		/// Called when new Buddy is added to this roster.
 		/// \param buddy newly added Buddy
 		boost::signal<void (Buddy *buddy)> onBuddySet;
 		/// Called when Buddy has been removed from this roster.
 		/// \param buddy removed Buddy
@@ @@ -98,17 +102,19 @@ class RosterManager { @@
 	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;
 };
+}

src/localbuddy.cpp

➞

Show inline comments

@@ @@ -32,12 +32,14 @@ LocalBuddy::~LocalBuddy() { @@
 void LocalBuddy::setAlias(const std::string &alias) {
 	bool changed = m_alias != alias;
 	m_alias = alias;
 	if (changed) {
 		if (getRosterManager()->getUser()->getComponent()->inServerMode() || getRosterManager()->isRemoteRosterSupported()) {
 			getRosterManager()->sendBuddyRosterPush(this);
+		}
 		getRosterManager()->storeBuddy(this);
+	}
+}
+}

src/mysqlbackend.cpp

➞

Show inline comments

@@ @@ -206,21 +206,21 @@ template <typename T> @@
 MySQLBackend::Statement& MySQLBackend::Statement::operator << (const T& t) {
 	if (m_offset >= m_params.size())
 		return *this;
 	int *data = (int *) m_params[m_offset].buffer;
 	*data = (int) t;
 	LOG4CXX_INFO(logger, "adding " << m_offset << ":" << (int) t);
+// 	LOG4CXX_INFO(logger, "adding " << m_offset << ":" << (int) t);
 	m_offset++;
 	return *this;
+}
 MySQLBackend::Statement& MySQLBackend::Statement::operator << (const std::string& str) {
 	if (m_offset >= m_params.size())
 		return *this;
 	LOG4CXX_INFO(logger, "adding " << m_offset << ":" << str << "(" << str.size() << ")");
+// 	LOG4CXX_INFO(logger, "adding " << m_offset << ":" << str << "(" << str.size() << ")");
 	strncpy((char*) m_params[m_offset].buffer, str.c_str(), 4096);
 	*m_params[m_offset].length = str.size();
 	m_offset++;
 	return *this;
+}
 	if (m_resultOffset > m_results.size())
 		return *this;
 	if (!m_results[m_resultOffset].is_null) {
 		T *data = (T *) m_results[m_resultOffset].buffer;
 		t = *data;
 		std::cout << "getting " << m_resultOffset << " " << (int) t << "\n";
+// 		std::cout << "getting " << m_resultOffset << " " << (int) t << "\n";
+	}
 	if (++m_resultOffset == m_results.size())
 		m_resultOffset = 0;
 	return *this;
+}
 MySQLBackend::Statement& MySQLBackend::Statement::operator >> (std::string& t) {
 	std::cout << "getting " << m_resultOffset << "\n";
+// 	std::cout << "getting " << m_resultOffset << "\n";
 	if (m_resultOffset > m_results.size())
 		return *this;
 	if (!m_results[m_resultOffset].is_null) {
 		t = (char *) m_results[m_resultOffset].buffer;
+	}

src/rostermanager.cpp

➞

Show inline comments

@@ @@ -38,19 +38,37 @@ @@
 using namespace log4cxx;
 namespace Transport {
 static LoggerPtr logger = Logger::getLogger("RosterManager");
 // TODO: Once Swiften GetRosterRequest will support setting to="", this can be removed
 class AddressedRosterRequest : public Swift::GenericRequest<Swift::RosterPayload> {
 	public:
 		typedef boost::shared_ptr<AddressedRosterRequest> ref;
 		AddressedRosterRequest(Swift::IQRouter* router, Swift::JID to) :
 				Swift::GenericRequest<Swift::RosterPayload>(Swift::IQ::Get, to, boost::shared_ptr<Swift::Payload>(new Swift::RosterPayload()), router) {
+		}
 };
 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();
+	}
+}
 RosterManager::~RosterManager() {
 	m_setBuddyTimer->stop();
 	m_RIETimer->stop();
 	if (m_rosterStorage) {
@@ @@ -86,13 +104,15 @@ void RosterManager::setBuddy(Buddy *buddy) { @@
 // 	m_setBuddyTimer->onTick.connect(boost::bind(&RosterManager::setBuddyCallback, this, buddy));
 // 	m_setBuddyTimer->start();
 	setBuddyCallback(buddy);
+}
 void RosterManager::sendBuddyRosterPush(Buddy *buddy) {
 	if (!m_user->isConnected())
 	// user can't receive anything in server mode if he's not logged in.
 	// He will ask for roster later (handled in rosterreponsder.cpp)
 	if (m_component->inServerMode() && !m_user->isConnected())
 		return;
 	Swift::RosterPayload::ref payload = Swift::RosterPayload::ref(new Swift::RosterPayload());
 	Swift::RosterItemPayload item;
 	item.setJID(buddy->getJID().toBare());
 	item.setName(buddy->getAlias());
@@ @@ -135,22 +155,27 @@ void RosterManager::setBuddyCallback(Buddy *buddy) { @@
 		sendBuddyRosterPush(buddy);
+	}
 	else {
 		if (m_setBuddyTimer->onTick.empty()) {
 			m_setBuddyTimer->stop();
 			if (m_supportRemoteRoster) {
 				sendBuddyRosterPush(buddy);
+			}
 			else {
 				// Send RIE only if there's resource which supports it.
 				Swift::JID jidWithRIE = m_user->getJIDWithFeature("http://jabber.org/protocol/rosterx");
 				if (jidWithRIE.isValid()) {
 					m_RIETimer->start();
+				}
 				else {
 					sendBuddySubscribePresence(buddy);
+				}
+			}
+		}
+	}
 	if (m_rosterStorage)
 		m_rosterStorage->storeBuddy(buddy);
+}
 void RosterManager::unsetBuddy(Buddy *buddy) {
+	}
 	m_requests.remove(request);
 	request->onResponse.disconnect_all_slots();
+}
 void RosterManager::handleRemoteRosterResponse(boost::shared_ptr<Swift::RosterPayload> payload, Swift::ErrorPayload::ref error) {
 	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;
 	BOOST_FOREACH(const Swift::RosterItemPayload &item, payload->getItems()) {
 		std::string legacyName = Buddy::JIDToLegacyName(item.getJID());
 		if (m_buddies.find(legacyName) == m_buddies.end()) {
 			continue;
+		}
 		BuddyInfo buddyInfo;
 		buddyInfo.id = -1;
 		buddyInfo.alias = item.getName();
 		buddyInfo.legacyName = legacyName;
 		buddyInfo.subscription = "both";
 		buddyInfo.flags = 0;
 		Buddy *buddy = m_component->getFactory()->createBuddy(this, buddyInfo);
 		setBuddy(buddy);
+	}
+}
 Buddy *RosterManager::getBuddy(const std::string &name) {
 	return m_buddies[name];
+}
 void RosterManager::sendRIE() {
 	m_RIETimer->stop();
@@ @@ -206,13 +259,13 @@ void RosterManager::sendRIE() { @@
 			continue;
+		}
 		Swift::RosterItemExchangePayload::Item item;
 		item.setJID(buddy->getJID().toBare());
 		item.setName(buddy->getAlias());
 		item.setAction(Swift::RosterItemExchangePayload::Item::Add);
-// 		item.setGroups(buddy->getGroups());
 		item.setGroups(buddy->getGroups());
 		payload->addItem(item);
+	}
 	boost::shared_ptr<Swift::GenericRequest<Swift::RosterItemExchangePayload> > request(new Swift::GenericRequest<Swift::RosterItemExchangePayload>(Swift::IQ::Set, jidWithRIE, payload, m_component->getIQRouter()));
 	request->send();

0 comments (0 inline, 0 general)