libtransport.git Changeset - 984a07501942

Changeset - 984a07501942

Parent rev.

Child rev.

[Not reviewed]

0 3 0

HanzZ - 13 years ago 2012-12-26 09:59:09
hanzz.k@gmail.com

Send RIE to all resources

3 files changed with 16 insertions and 13 deletions:

include/transport/user.h

src/rostermanager.cpp

src/user.cpp

0 comments (0 inline, 0 general)

include/transport/user.h

➞

Show inline comments

@@ @@ -54,13 +54,13 @@ class User : public Swift::EntityCapsProvider { @@
 		/// \return full JID
 		const Swift::JID &getJID();
 		/// Returns full JID which supports particular feature or invalid JID.
 		/// \param feature disco#info feature.
 		/// \return full JID which supports particular feature or invalid JID.
 		Swift::JID getJIDWithFeature(const std::string &feature);
+		std::vector<Swift::JID> getJIDWithFeature(const std::string &feature);
 		Swift::DiscoInfo::ref getCaps(const Swift::JID &jid) const;
 		/// Returns UserInfo struct with informations needed to connect the legacy network.
 		/// \return UserInfo struct
 		UserInfo &getUserInfo() { return m_userInfo; }

src/rostermanager.cpp

➞

Show inline comments

@@ @@ -229,14 +229,14 @@ void RosterManager::setBuddyCallback(Buddy *buddy) { @@
 		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()) {
 			std::vector<Swift::JID> jidWithRIE = m_user->getJIDWithFeature("http://jabber.org/protocol/rosterx");
 			if (!jidWithRIE.empty()) {
 				m_RIETimer->start();
+			}
 			else {
 				sendBuddySubscribePresence(buddy);
+			}
+		}
@@ @@ -314,28 +314,26 @@ Buddy *RosterManager::getBuddy(const std::string &name) { @@
+}
 void RosterManager::sendRIE() {
 	m_RIETimer->stop();
 	// Check the feature, because proper resource could logout during RIETimer.
 	Swift::JID jidWithRIE = m_user->getJIDWithFeature("http://jabber.org/protocol/rosterx");
+	std::vector<Swift::JID> jidWithRIE = m_user->getJIDWithFeature("http://jabber.org/protocol/rosterx");
 	// fallback to normal subscribe
-	if (!jidWithRIE.isValid()) {
+	if (jidWithRIE.empty()) {
 		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;
+			}
 			sendBuddySubscribePresence(buddy);
+		}
 		return;
+	}
 	LOG4CXX_INFO(logger, "Sending RIE stanza to " << jidWithRIE.toString());
 	Swift::RosterItemExchangePayload::ref payload = Swift::RosterItemExchangePayload::ref(new Swift::RosterItemExchangePayload());
 	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;
+		}
@@ @@ -345,14 +343,17 @@ void RosterManager::sendRIE() { @@
 		item.setAction(Swift::RosterItemExchangePayload::Item::Add);
 		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();
 	BOOST_FOREACH(Swift::JID &jid, jidWithRIE) {
 		LOG4CXX_INFO(logger, "Sending RIE stanza to " << jid.toString());
 		boost::shared_ptr<Swift::GenericRequest<Swift::RosterItemExchangePayload> > request(new Swift::GenericRequest<Swift::RosterItemExchangePayload>(Swift::IQ::Set, jid, payload, m_component->getIQRouter()));
 		request->send();
+	}
+}
 void RosterManager::handleSubscription(Swift::Presence::ref presence) {
 	std::string legacyName = Buddy::JIDToLegacyName(presence->getTo());
 	if (legacyName.empty()) {
 		return;

src/user.cpp

➞

Show inline comments

@@ @@ -80,14 +80,14 @@ User::~User(){ @@
+}
 const Swift::JID &User::getJID() {
 	return m_jid;
+}
 Swift::JID User::getJIDWithFeature(const std::string &feature) {
 	Swift::JID jid;
 std::vector<Swift::JID> User::getJIDWithFeature(const std::string &feature) {
 	std::vector<Swift::JID> jid;
 	std::vector<Swift::Presence::ref> presences = m_presenceOracle->getAllPresence(m_jid);
 	foreach(Swift::Presence::ref presence, presences) {
 		if (presence->getType() == Swift::Presence::Unavailable)
 			continue;
 			continue;
 #endif
+		}
 		if (discoInfo->hasFeature(feature)) {
 			LOG4CXX_INFO(logger, m_jid.toString() << ": Found JID with " << feature << " feature: " << presence->getFrom().toString());
-			return presence->getFrom();
+			jid.push_back(presence->getFrom());
+		}
+	}
 	LOG4CXX_INFO(logger, m_jid.toString() << ": No JID with " << feature << " feature " << m_legacyCaps.size());
 	if (jid.empty()) {
 		LOG4CXX_INFO(logger, m_jid.toString() << ": No JID with " << feature << " feature " << m_legacyCaps.size());
+	}
 	return jid;
+}
 Swift::DiscoInfo::ref User::getCaps(const Swift::JID &jid) const {
 	Swift::DiscoInfo::ref discoInfo = m_entityCapsManager->getCaps(jid);
 #ifdef SUPPORT_LEGACY_CAPS

0 comments (0 inline, 0 general)