libtransport.git Changeset - f035510e4798

Changeset - f035510e4798

Parent rev.

Child rev.

[Not reviewed]

0 6 2

HanzZ - 14 years ago 2011-12-08 17:55:23
hanzz.k@gmail.com

Fixed PresenceOracle

8 files changed with 204 insertions and 11 deletions:

include/Swiften/FileTransfer/CombinedOutgoingFileTransferManager.cpp

include/Swiften/FileTransfer/CombinedOutgoingFileTransferManager.h

include/transport/presenceoracle.h

include/transport/transport.h

include/transport/user.h

src/presenceoracle.cpp

134

src/transport.cpp

src/user.cpp

0 comments (0 inline, 0 general)

include/Swiften/FileTransfer/CombinedOutgoingFileTransferManager.cpp

➞

Show inline comments

@@ @@ -9,31 +9,30 @@ @@
 #include <boost/smart_ptr/make_shared.hpp>
 #include <Swiften/JID/JID.h>
 #include "Swiften/Disco/EntityCapsProvider.h"
 #include <Swiften/Jingle/JingleSessionManager.h>
 #include <Swiften/Jingle/JingleSessionImpl.h>
 #include <Swiften/Jingle/JingleContentID.h>
 #include <Swiften/FileTransfer/OutgoingJingleFileTransfer.h>
 #include <Swiften/FileTransfer/MyOutgoingSIFileTransfer.h>
 #include <Swiften/FileTransfer/SOCKS5BytestreamServer.h>
 #include <Swiften/Base/IDGenerator.h>
 #include <Swiften/Elements/Presence.h>
 #include <Swiften/Presence/PresenceOracle.h>
 #include <Swiften/Base/foreach.h>
 namespace Swift {
 CombinedOutgoingFileTransferManager::CombinedOutgoingFileTransferManager(JingleSessionManager* jingleSessionManager, IQRouter* router, EntityCapsProvider* capsProvider, RemoteJingleTransportCandidateSelectorFactory* remoteFactory, LocalJingleTransportCandidateGeneratorFactory* localFactory, SOCKS5BytestreamRegistry* bytestreamRegistry, SOCKS5BytestreamProxy* bytestreamProxy, PresenceOracle *presOracle, SOCKS5BytestreamServer *bytestreamServer) : jsManager(jingleSessionManager), iqRouter(router), capsProvider(capsProvider), remoteFactory(remoteFactory), localFactory(localFactory), bytestreamRegistry(bytestreamRegistry), bytestreamProxy(bytestreamProxy), presenceOracle(presOracle), bytestreamServer(bytestreamServer) {
+CombinedOutgoingFileTransferManager::CombinedOutgoingFileTransferManager(JingleSessionManager* jingleSessionManager, IQRouter* router, EntityCapsProvider* capsProvider, RemoteJingleTransportCandidateSelectorFactory* remoteFactory, LocalJingleTransportCandidateGeneratorFactory* localFactory, SOCKS5BytestreamRegistry* bytestreamRegistry, SOCKS5BytestreamProxy* bytestreamProxy, Transport::PresenceOracle *presOracle, SOCKS5BytestreamServer *bytestreamServer) : jsManager(jingleSessionManager), iqRouter(router), capsProvider(capsProvider), remoteFactory(remoteFactory), localFactory(localFactory), bytestreamRegistry(bytestreamRegistry), bytestreamProxy(bytestreamProxy), presenceOracle(presOracle), bytestreamServer(bytestreamServer) {
 	idGenerator = new IDGenerator();
+}
 CombinedOutgoingFileTransferManager::~CombinedOutgoingFileTransferManager() {
 	delete idGenerator;
+}
 boost::shared_ptr<OutgoingFileTransfer> CombinedOutgoingFileTransferManager::createOutgoingFileTransfer(const JID& from, const JID& receipient, boost::shared_ptr<ReadBytestream> readBytestream, const StreamInitiationFileInfo& fileInfo) {
 	// check if receipient support Jingle FT
 	boost::optional<JID> fullJID = highestPriorityJIDSupportingJingle(receipient);
 	if (!fullJID.is_initialized()) {
 		fullJID = highestPriorityJIDSupportingSI(receipient);

include/Swiften/FileTransfer/CombinedOutgoingFileTransferManager.h

➞

Show inline comments

@@ @@ -2,52 +2,54 @@ @@
  * Copyright (c) 2011 Tobias Markmann
  * Licensed under the simplified BSD license.
  * See Documentation/Licenses/BSD-simplified.txt for more information.
  */
 #pragma once
 #include <boost/shared_ptr.hpp>
 #include <boost/optional.hpp>
 #include <Swiften/JID/JID.h>
 #include "transport/presenceoracle.h"
 namespace Swift {
 class JingleSessionManager;
 class IQRouter;
 class EntityCapsProvider;
 class RemoteJingleTransportCandidateSelectorFactory;
 class LocalJingleTransportCandidateGeneratorFactory;
 class OutgoingFileTransfer;
 class JID;
 class IDGenerator;
 class ReadBytestream;
 class StreamInitiationFileInfo;
 class SOCKS5BytestreamRegistry;
 class SOCKS5BytestreamProxy;
 class SOCKS5BytestreamServer;
 class PresenceOracle;
 class CombinedOutgoingFileTransferManager {
 public:
 	CombinedOutgoingFileTransferManager(JingleSessionManager* jingleSessionManager, IQRouter* router, EntityCapsProvider* capsProvider, RemoteJingleTransportCandidateSelectorFactory* remoteFactory, LocalJingleTransportCandidateGeneratorFactory* localFactory, SOCKS5BytestreamRegistry* bytestreamRegistry, SOCKS5BytestreamProxy* bytestreamProxy, PresenceOracle* presOracle, SOCKS5BytestreamServer *server);
+	CombinedOutgoingFileTransferManager(JingleSessionManager* jingleSessionManager, IQRouter* router, EntityCapsProvider* capsProvider, RemoteJingleTransportCandidateSelectorFactory* remoteFactory, LocalJingleTransportCandidateGeneratorFactory* localFactory, SOCKS5BytestreamRegistry* bytestreamRegistry, SOCKS5BytestreamProxy* bytestreamProxy, Transport::PresenceOracle* presOracle, SOCKS5BytestreamServer *server);
 	~CombinedOutgoingFileTransferManager();
 	boost::shared_ptr<OutgoingFileTransfer> createOutgoingFileTransfer(const JID& from, const JID& to, boost::shared_ptr<ReadBytestream>, const StreamInitiationFileInfo&);
 private:
 	boost::optional<JID> highestPriorityJIDSupportingJingle(const JID& bareJID);
 	boost::optional<JID> highestPriorityJIDSupportingSI(const JID& bareJID);
 	JingleSessionManager* jsManager;
 	IQRouter* iqRouter;
 	EntityCapsProvider* capsProvider;
 	RemoteJingleTransportCandidateSelectorFactory* remoteFactory;
 	LocalJingleTransportCandidateGeneratorFactory* localFactory;
 	IDGenerator *idGenerator;
 	SOCKS5BytestreamRegistry* bytestreamRegistry;
 	SOCKS5BytestreamProxy* bytestreamProxy;
 	PresenceOracle* presenceOracle;
+	Transport::PresenceOracle* presenceOracle;
 	SOCKS5BytestreamServer *bytestreamServer;
 };
+}

include/transport/presenceoracle.h

➞

Show inline comments

@@ new file 100644 @@
 /**
  * XMPP - libpurple transport
+ *
  * Copyright (C) 2009, Jan Kaluza <hanzz@soc.pidgin.im>
+ *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
  * (at your option) any later version.
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
 #pragma once
 #include <map>
 #include <string>
 #include <Swiften/Elements/Presence.h>
 #include <Swiften/Client/StanzaChannel.h>
 #include <Swiften/Base/boost_bsignals.h>
 namespace Transport {
 class PresenceOracle {
 	public:
 		PresenceOracle(Swift::StanzaChannel* stanzaChannel);
 		~PresenceOracle();
 		Swift::Presence::ref getLastPresence(const Swift::JID&) const;
 		Swift::Presence::ref getHighestPriorityPresence(const Swift::JID& bareJID) const;
 		std::vector<Swift::Presence::ref> getAllPresence(const Swift::JID& bareJID) const;
 	public:
 		boost::signal<void (Swift::Presence::ref)> onPresenceChange;
 	private:
 		void handleIncomingPresence(Swift::Presence::ref presence);
 		void handleStanzaChannelAvailableChanged(bool);
 	private:
 		typedef std::map<Swift::JID, Swift::Presence::ref> PresenceMap;
 		typedef std::map<Swift::JID, PresenceMap> PresencesMap;
 		PresencesMap entries_;
 		Swift::StanzaChannel* stanzaChannel_;
 };
+}

include/transport/transport.h

➞

Show inline comments

@@ @@ -18,34 +18,34 @@ @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
 #pragma once
 #include <vector>
 #include "Swiften/Swiften.h"
 #include "Swiften/Server/Server.h"
 #include "Swiften/Disco/GetDiscoInfoRequest.h"
 #include "Swiften/Disco/EntityCapsManager.h"
 #include "Swiften/Disco/CapsManager.h"
 #include "Swiften/Disco/CapsMemoryStorage.h"
 #include "Swiften/Presence/PresenceOracle.h"
 #include "Swiften/Network/BoostTimerFactory.h"
 #include "Swiften/Network/BoostIOServiceThread.h"
 #include "Swiften/Server/UserRegistry.h"
 #include "Swiften/Base/SafeByteArray.h"
 #include "Swiften/Jingle/JingleSessionManager.h"
 #include <boost/bind.hpp>
 #include "transport/config.h"
 #include "transport/factory.h"
 #include "transport/presenceoracle.h"
 namespace Transport {
 	// typedef enum { 	CLIENT_FEATURE_ROSTERX = 2,
 	// 				CLIENT_FEATURE_XHTML_IM = 4,
 	// 				CLIENT_FEATURE_FILETRANSFER = 8,
 	// 				CLIENT_FEATURE_CHATSTATES = 16
 	// 				} SpectrumImportantFeatures;
 	//
 	class StorageBackend;
 	class DiscoInfoResponder;
 	class DiscoItemsResponder;
 	class Factory;
@@ @@ -83,25 +83,25 @@ namespace Transport { @@
 			Swift::CapsInfo &getBuddyCapsInfo();
 			/// Returns Swift::IQRouter associated with this Component.
 			/// \return Swift::IQRouter associated with this Component.
 			Swift::IQRouter *getIQRouter() { return m_iqRouter; }
 			/// Returns Swift::PresenceOracle associated with this Transport::Component.
 			/// You can use it to check current resource connected for particular user.
 			/// \return Swift::PresenceOracle associated with this Transport::Component.
-			Swift::PresenceOracle *getPresenceOracle();
 			PresenceOracle *getPresenceOracle();
 			/// Returns True if the component is in server mode.
 			/// \return True if the component is in server mode.
 			bool inServerMode() { return m_server != NULL; }
 			/// Connects the Jabber server.
 			void start();
 			void stop();
 			/// Sets disco#info features which are sent as answer to disco#info IQ-get.
@@ @@ -170,25 +170,25 @@ namespace Transport { @@
 			void handleDataWritten(const Swift::SafeByteArray &data);
 			void handleDiscoInfoResponse(boost::shared_ptr<Swift::DiscoInfo> info, Swift::ErrorPayload::ref error, const Swift::JID& jid);
 			void handleCapsChanged(const Swift::JID& jid);
 			Swift::NetworkFactories *m_factories;
 			Swift::Component *m_component;
 			Swift::Server *m_server;
 			Swift::Timer::ref m_reconnectTimer;
 			Swift::EntityCapsManager *m_entityCapsManager;
 			Swift::CapsManager *m_capsManager;
 			Swift::CapsMemoryStorage *m_capsMemoryStorage;
-			Swift::PresenceOracle *m_presenceOracle;
 			PresenceOracle *m_presenceOracle;
 			Swift::StanzaChannel *m_stanzaChannel;
 			Swift::IQRouter *m_iqRouter;
 			Transport::UserRegistry *m_userRegistry;
 			StorageBackend *m_storageBackend;
  			DiscoInfoResponder *m_discoInfoResponder;
 			DiscoItemsResponder *m_discoItemsResponder;
 			int m_reconnectCount;
 			Config* m_config;
 			std::string m_protocol;
 			Swift::JID m_jid;
 			Factory *m_factory;

include/transport/user.h

➞

Show inline comments

@@ @@ -13,37 +13,37 @@ @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
 #pragma once
 #include <time.h>
 #include "Swiften/Swiften.h"
 #include "Swiften/Presence/PresenceOracle.h"
 #include "Swiften/Disco/EntityCapsManager.h"
 #include "Swiften/Disco/EntityCapsProvider.h"
 #include "storagebackend.h"
 #include <Swiften/FileTransfer/OutgoingFileTransfer.h>
 #include "Swiften/Elements/SpectrumErrorPayload.h"
 namespace Transport {
 class Component;
 class RosterManager;
 class ConversationManager;
 class UserManager;
 class PresenceOracle;
 struct UserInfo;
 /// Represents online XMPP user.
 class User : public Swift::EntityCapsProvider {
 	public:
 		/// Creates new User class.
 		/// \param jid XMPP JID associated with this user
 		/// \param userInfo UserInfo struct with informations needed to connect
 		/// this user to legacy network
 		/// \param component Component associated with this user
 		User(const Swift::JID &jid, UserInfo &userInfo, Component * component, UserManager *userManager);
@@ @@ -116,25 +116,25 @@ class User : public Swift::EntityCapsProvider { @@
 		boost::signal<void (const std::string &room)> onRoomLeft;
 		boost::signal<void ()> onDisconnected;
 	private:
 		void onConnectingTimeout();
 		Swift::JID m_jid;
 		Component *m_component;
 		RosterManager *m_rosterManager;
 		UserManager *m_userManager;
 		ConversationManager *m_conversationManager;
 		Swift::EntityCapsManager *m_entityCapsManager;
-		Swift::PresenceOracle *m_presenceOracle;
 		PresenceOracle *m_presenceOracle;
 		UserInfo m_userInfo;
 		void *m_data;
 		bool m_connected;
 		bool m_readyForConnect;
 		bool m_ignoreDisconnect;
 		Swift::Timer::ref m_reconnectTimer;
 		boost::shared_ptr<Swift::Connection> connection;
 		time_t m_lastActivity;
 		std::map<Swift::JID, Swift::DiscoInfo::ref> m_legacyCaps;
 		std::vector<boost::shared_ptr<Swift::OutgoingFileTransfer> > m_filetransfers;
 		int m_resources;
 		int m_reconnectCounter;

src/presenceoracle.cpp

➞

Show inline comments

@@ new file 100644 @@
 /**
  * XMPP - libpurple transport
+ *
  * Copyright (C) 2009, Jan Kaluza <hanzz@soc.pidgin.im>
+ *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
  * (at your option) any later version.
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
 #include "transport/presenceoracle.h"
 #include <boost/bind.hpp>
 using namespace Swift;
 namespace Transport {
 PresenceOracle::PresenceOracle(StanzaChannel* stanzaChannel) {
 	stanzaChannel_ = stanzaChannel;
 	stanzaChannel_->onPresenceReceived.connect(boost::bind(&PresenceOracle::handleIncomingPresence, this, _1));
 	stanzaChannel_->onAvailableChanged.connect(boost::bind(&PresenceOracle::handleStanzaChannelAvailableChanged, this, _1));
+}
 PresenceOracle::~PresenceOracle() {
 	stanzaChannel_->onPresenceReceived.disconnect(boost::bind(&PresenceOracle::handleIncomingPresence, this, _1));
 	stanzaChannel_->onAvailableChanged.disconnect(boost::bind(&PresenceOracle::handleStanzaChannelAvailableChanged, this, _1));
+}
 void PresenceOracle::handleStanzaChannelAvailableChanged(bool available) {
 	if (available) {
 		entries_.clear();
+	}
+}
 void PresenceOracle::handleIncomingPresence(Presence::ref presence) {
 	// ignore presences for some contact, we're checking only presences for the transport itself here.
 	if (!presence->getTo().getNode().empty()) {
 		return;
+	}
 	JID bareJID(presence->getFrom().toBare());
 	if (presence->getType() == Presence::Subscribe) {
+	}
 	else {
 		Presence::ref passedPresence = presence;
 		if (presence->getType() == Presence::Unsubscribe) {
 			/* 3921bis says that we don't follow up with an unavailable, so simulate this ourselves */
 			passedPresence = Presence::ref(new Presence());
 			passedPresence->setType(Presence::Unavailable);
 			passedPresence->setFrom(bareJID);
 			passedPresence->setStatus(presence->getStatus());
+		}
 		std::map<JID, boost::shared_ptr<Presence> > jidMap = entries_[bareJID];
 		if (passedPresence->getFrom().isBare() && presence->getType() == Presence::Unavailable) {
 			/* Have a bare-JID only presence of offline */
 			jidMap.clear();
 		} else if (passedPresence->getType() == Presence::Available) {
 			/* Don't have a bare-JID only offline presence once there are available presences */
 			jidMap.erase(bareJID);
+		}
 		if (passedPresence->getType() == Presence::Unavailable && jidMap.size() > 1) {
 			jidMap.erase(passedPresence->getFrom());
 		} else {
 			jidMap[passedPresence->getFrom()] = passedPresence;
+		}
 		entries_[bareJID] = jidMap;
 		onPresenceChange(passedPresence);
+	}
+}
 Presence::ref PresenceOracle::getLastPresence(const JID& jid) const {
 	PresencesMap::const_iterator i = entries_.find(jid.toBare());
 	if (i == entries_.end()) {
 		return Presence::ref();
+	}
 	PresenceMap presenceMap = i->second;
 	PresenceMap::const_iterator j = presenceMap.find(jid);
 	if (j != presenceMap.end()) {
 		return j->second;
+	}
 	else {
 		return Presence::ref();
+	}
+}
 std::vector<Presence::ref> PresenceOracle::getAllPresence(const JID& bareJID) const {
 	std::vector<Presence::ref> results;
 	PresencesMap::const_iterator i = entries_.find(bareJID);
 	if (i == entries_.end()) {
 		return results;
+	}
 	PresenceMap presenceMap = i->second;
 	PresenceMap::const_iterator j = presenceMap.begin();
 	for (; j != presenceMap.end(); ++j) {
 		Presence::ref current = j->second;
 		results.push_back(current);
+	}
 	return results;
+}
 Presence::ref PresenceOracle::getHighestPriorityPresence(const JID& bareJID) const {
 	PresencesMap::const_iterator i = entries_.find(bareJID);
 	if (i == entries_.end()) {
 		return Presence::ref();
+	}
 	PresenceMap presenceMap = i->second;
 	PresenceMap::const_iterator j = presenceMap.begin();
 	Presence::ref highest;
 	for (; j != presenceMap.end(); ++j) {
 		Presence::ref current = j->second;
 		if (!highest
 				|| current->getPriority() > highest->getPriority()
 				|| (current->getPriority() == highest->getPriority()
 						&& StatusShow::typeToAvailabilityOrdering(current->getShow()) > StatusShow::typeToAvailabilityOrdering(highest->getShow()))) {
 			highest = current;
+		}
+	}
 	return highest;
+}
+}

src/transport.cpp

➞

Show inline comments

 		m_component->addPayloadSerializer(new Swift::StatsSerializer());
 		m_component->addPayloadSerializer(new Swift::SpectrumErrorSerializer());
 		m_stanzaChannel = m_component->getStanzaChannel();
 		m_iqRouter = m_component->getIQRouter();
+	}
 	m_capsMemoryStorage = new CapsMemoryStorage();
 	m_capsManager = new CapsManager(m_capsMemoryStorage, m_stanzaChannel, m_iqRouter);
 	m_entityCapsManager = new EntityCapsManager(m_capsManager, m_stanzaChannel);
  	m_entityCapsManager->onCapsChanged.connect(boost::bind(&Component::handleCapsChanged, this, _1));
 	m_presenceOracle = new PresenceOracle(m_stanzaChannel);
+	m_presenceOracle = new Transport::PresenceOracle(m_stanzaChannel);
 	m_presenceOracle->onPresenceChange.connect(bind(&Component::handlePresence, this, _1));
 	m_discoInfoResponder = new DiscoInfoResponder(m_iqRouter, m_config);
 	m_discoInfoResponder->start();
 	m_discoItemsResponder = new DiscoItemsResponder(m_iqRouter);
 	m_discoItemsResponder->start();
 //
 // 	m_registerHandler = new SpectrumRegisterHandler(m_component);
 // 	m_registerHandler->start();
+}
@@ @@ -161,25 +161,25 @@ Component::~Component() { @@
 	if (m_component)
 		delete m_component;
 	if (m_server) {
 		m_server->stop();
 		delete m_server;
+	}
+}
 Swift::StanzaChannel *Component::getStanzaChannel() {
 	return m_stanzaChannel;
+}
-Swift::PresenceOracle *Component::getPresenceOracle() {
+Transport::PresenceOracle *Component::getPresenceOracle() {
 	return m_presenceOracle;
+}
 void Component::setTransportFeatures(std::list<std::string> &features) {
 	m_discoInfoResponder->setTransportFeatures(features);
+}
 Swift::CapsInfo &Component::getBuddyCapsInfo() {
 		return m_discoInfoResponder->getBuddyCapsInfo();
+}
 void Component::setBuddyFeatures(std::list<std::string> &features) {

src/user.cpp

➞

Show inline comments

@@ @@ -15,24 +15,25 @@ @@
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
 #include "transport/user.h"
 #include "transport/transport.h"
 #include "transport/storagebackend.h"
 #include "transport/rostermanager.h"
 #include "transport/usermanager.h"
 #include "transport/conversationmanager.h"
 #include "transport/presenceoracle.h"
 #include "Swiften/Swiften.h"
 #include "Swiften/Server/ServerStanzaChannel.h"
 #include "Swiften/Elements/StreamError.h"
 #include "Swiften/Elements/MUCPayload.h"
 #include "Swiften/Elements/SpectrumErrorPayload.h"
 #include "log4cxx/logger.h"
 #include <boost/foreach.hpp>
 #include <stdio.h>
 #include <stdlib.h>
 using namespace log4cxx;
 using namespace boost;

0 comments (0 inline, 0 general)