libtransport.git Changeset - 02b2f22f3e96

Changeset - 02b2f22f3e96

Parent rev.

Child rev.

[Not reviewed]

0 7 2

HanzZ - 14 years ago 2011-09-28 10:58:48
hanzz.k@gmail.com

First part of filetransfer

9 files changed with 145 insertions and 3 deletions:

backends/libpurple/main.cpp

include/transport/filetransfer.h

include/transport/transport.h

include/transport/user.h

include/transport/usermanager.h

src/filetransfer.cpp

src/transport.cpp

src/user.cpp

src/usermanager.cpp

0 comments (0 inline, 0 general)

backends/libpurple/main.cpp

➞

Show inline comments

@@ @@ -635,13 +635,13 @@ class SpectrumNetworkPlugin : public NetworkPlugin { @@
 						break;
+					}
 					case Swift::StatusShow::None: {
 						st = PURPLE_STATUS_OFFLINE;
 						break;
+					}
-					case 255:
+					case 6:
 						st = PURPLE_STATUS_INVISIBLE;
 						break;
 					default:
 						st = PURPLE_STATUS_AVAILABLE;
 						break;
+				}

include/transport/filetransfer.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 <string>
 #include <algorithm>
 #include <map>
 #include <boost/pool/pool_alloc.hpp>
 #include <boost/pool/object_pool.hpp>
 #include "Swiften/Swiften.h"
 // #include "rosterstorage.h"
 namespace Transport {
 class Component;
 class User;
 class FileTransfer {
 	public:
 		FileTransfer(User *user, Component *component, const Swift::JID &from);
 		/// Destructor.
 		virtual ~FileTransfer();
 	private:
 		Swift::FileTransferManager* m_ftManager;
 		Component *m_component;
 		User *m_user;
 };
+}

include/transport/transport.h

➞

Show inline comments

@@ @@ -29,12 +29,13 @@ @@
 #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"
 namespace Transport {
@@ @@ -90,12 +91,14 @@ namespace Transport { @@
 			/// 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();
 			Swift::JingleSessionManager *getJingleSessionManager() { return m_jingleSessionManager; }
 			/// 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.
@@ @@ -178,12 +181,13 @@ namespace Transport { @@
 			Swift::EntityCapsManager *m_entityCapsManager;
 			Swift::CapsManager *m_capsManager;
 			Swift::CapsMemoryStorage *m_capsMemoryStorage;
 			Swift::PresenceOracle *m_presenceOracle;
 			Swift::StanzaChannel *m_stanzaChannel;
 			Swift::IQRouter *m_iqRouter;
 			Swift::JingleSessionManager *m_jingleSessionManager;
 			Transport::UserRegistry *m_userRegistry;
 			StorageBackend *m_storageBackend;
  			DiscoInfoResponder *m_discoInfoResponder;
 			DiscoItemsResponder *m_discoItemsResponder;
 			int m_reconnectCount;
 			Config* m_config;

include/transport/user.h

➞

Show inline comments

@@ @@ -21,24 +21,25 @@ @@
 #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"
 namespace Transport {
 class Component;
 class RosterManager;
 class ConversationManager;
 class UserManager;
 struct UserInfo;
 /// Represents online XMPP user.
 class 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
@@ @@ -53,12 +54,14 @@ class User { @@
 		/// 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);
 		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; }
 		RosterManager *getRosterManager() { return m_rosterManager; }

include/transport/usermanager.h

➞

Show inline comments

@@ @@ -47,13 +47,13 @@ class RosterResponder; @@
 	UserManager->StorageBackend [label="getUser(...)", URL="\ref StorageBackend::getUser()"];
 	UserManager->User [label="User::User(...)", URL="\ref User"];
 	UserManager->Slot [label="onUserCreated(...)", URL="\ref UserManager::onUserCreated()"];
 	UserManager->User [label="handlePresence(...)", URL="\ref User::handlePresence()"];
 	\endmsc
 */
 class UserManager {
+class UserManager : public Swift::EntityCapsProvider {
 	public:
 		/// Creates new UserManager.
 		/// \param component Component which's presence will be handled
 		/// \param storageBackend Storage backend used to fetch UserInfos
 		UserManager(Component *component, UserRegistry *userRegistry, StorageBackend *storageBackend = NULL);
@@ @@ -79,12 +79,14 @@ class UserManager { @@
 		/// User class. This does *not* remove user from StorageBackend.
 		/// \param user User class to remove
 		void removeUser(User *user);
 		void removeAllUsers();
 		Swift::DiscoInfo::ref getCaps(const Swift::JID&) const;
 		/// Called when new User class is created.
 		/// \param user newly created User class
 		boost::signal<void (User *user)> onUserCreated;
 		/// Called when User class is going to be removed
 		/// \param user removed User class

src/filetransfer.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/filetransfer.h"
 #include "transport/usermanager.h"
 #include "transport/transport.h"
 #include "transport/user.h"
 #include "Swiften/Roster/SetRosterRequest.h"
 #include "Swiften/Elements/RosterPayload.h"
 #include "Swiften/Elements/RosterItemPayload.h"
 #include "Swiften/Elements/RosterItemExchangePayload.h"
 #include "Swiften/FileTransfer/FileTransferManagerImpl.h"
 #include "log4cxx/logger.h"
 #include <boost/foreach.hpp>
 #include <map>
 #include <iterator>
 using namespace log4cxx;
 namespace Transport {
 static LoggerPtr logger = Logger::getLogger("FileTransfer");
 FileTransfer::FileTransfer(User *user, Component *component, const Swift::JID &from) {
 	m_user = user;
 	m_component = component;
 	m_ftManager = new Swift::FileTransferManagerImpl(from, m_component->getJingleSessionManager(), m_component->getIQRouter(),
 											  user, m_component->getPresenceOracle(),
 											  m_component->getNetworkFactories()->getConnectionFactory(),
 											  m_component->getNetworkFactories()->getConnectionServerFactory(),
 											  m_component->getNetworkFactories()->getTimerFactory(),
 											  m_component->getNetworkFactories()->getNATTraverser());
 	LOG4CXX_INFO(logger, "FileTransfer " << this << " from '" << from.toString() << "' to '" << user->getJID().toString() << "' created");
+}
 FileTransfer::~FileTransfer() {
 	LOG4CXX_INFO(logger, "FileTransfer " << this << " destroyed");
 	delete m_ftManager;
+}
+}

src/transport.cpp

➞

Show inline comments

 	m_discoInfoResponder = new DiscoInfoResponder(m_iqRouter, m_config);
 	m_discoInfoResponder->start();
 	m_discoItemsResponder = new DiscoItemsResponder(m_iqRouter);
 	m_discoItemsResponder->start();
 	m_jingleSessionManager = new Swift::JingleSessionManager(m_iqRouter);
 //
 // 	m_registerHandler = new SpectrumRegisterHandler(m_component);
 // 	m_registerHandler->start();
+}
 Component::~Component() {

src/user.cpp

➞

Show inline comments

+	}
 	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
 	if (!discoInfo) {
 		std::map<Swift::JID, Swift::DiscoInfo::ref>::const_iterator it = m_legacyCaps.find(jid);
 		if (it != m_legacyCaps.end()) {
 			discoInfo = it->second;
+		}
+	}
 #endif
 	return discoInfo;
+}
 void User::sendCurrentPresence() {
 	if (m_component->inServerMode()) {
 		return;
+	}
 	if (m_connected) {

src/usermanager.cpp

➞

Show inline comments

@@ @@ -88,12 +88,22 @@ User *UserManager::getUser(const std::string &barejid){ @@
 		m_cachedUser = user;
 		return user;
+	}
 	return NULL;
+}
 Swift::DiscoInfo::ref UserManager::getCaps(const Swift::JID &jid) const {
 	std::map<std::string, User *>::const_iterator it = m_users.find(jid.toBare().toString());
 	if (it == m_users.end()) {
 		return Swift::DiscoInfo::ref();
+	}
 	User *user = it->second;
 	return user->getCaps(jid);
+}
 void UserManager::removeUser(User *user) {
 	m_users.erase(user->getJID().toBare().toString());
 	if (m_cachedUser == user)
 		m_cachedUser = NULL;
 	if (m_component->inServerMode()) {

0 comments (0 inline, 0 general)