diff --git a/src/filetransfermanager.cpp b/src/filetransfermanager.cpp index dd893fb12c222eaae36806e898c90cfff0500986..04b7b67b7db83757622d9cad18adcf5c20e5ab70 100644 --- a/src/filetransfermanager.cpp +++ b/src/filetransfermanager.cpp @@ -1,89 +1,102 @@ -/** - * libtransport -- C++ library for easy XMPP Transports development - * - * Copyright (C) 2011, Jan Kaluza - * - * 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/filetransfermanager.h" -#include "transport/transport.h" -#include "transport/usermanager.h" -#include "transport/user.h" -#include "transport/buddy.h" -#include "transport/logging.h" -#include "Swiften/Network/ConnectionServerFactory.h" - -namespace Transport { - -DEFINE_LOGGER(logger, "FileTransferManager"); - -FileTransferManager::FileTransferManager(Component *component, UserManager *userManager) { - m_component = component; - m_userManager = userManager; - - m_jingleSessionManager = new Swift::JingleSessionManager(m_component->getIQRouter()); - m_connectivityManager = new Swift::ConnectivityManager(m_component->getNetworkFactories()->getNATTraverser()); - m_bytestreamRegistry = new Swift::SOCKS5BytestreamRegistry(); - m_bytestreamProxy = new Swift::SOCKS5BytestreamProxy(m_component->getNetworkFactories()->getConnectionFactory(), m_component->getNetworkFactories()->getTimerFactory()); - - m_localCandidateGeneratorFactory = new Swift::DefaultLocalJingleTransportCandidateGeneratorFactory(m_connectivityManager, m_bytestreamRegistry, m_bytestreamProxy, "thishouldnotbeused"); - m_remoteCandidateSelectorFactory = new Swift::DefaultRemoteJingleTransportCandidateSelectorFactory(m_component->getNetworkFactories()->getConnectionFactory(), m_component->getNetworkFactories()->getTimerFactory()); - - boost::shared_ptr server = m_component->getNetworkFactories()->getConnectionServerFactory()->createConnectionServer(19645); - server->start(); - m_bytestreamServer = new Swift::SOCKS5BytestreamServer(server, m_bytestreamRegistry); - m_bytestreamServer->start(); - - m_outgoingFTManager = new Swift::CombinedOutgoingFileTransferManager(m_jingleSessionManager, m_component->getIQRouter(), - m_userManager, m_remoteCandidateSelectorFactory, - m_localCandidateGeneratorFactory, m_bytestreamRegistry, - m_bytestreamProxy, m_component->getPresenceOracle(), - m_bytestreamServer); - -// WARNING: Swiften crashes when this is uncommented... But we probably need it for working Jingle FT -// m_connectivityManager->addListeningPort(19645); -} - -FileTransferManager::~FileTransferManager() { - m_bytestreamServer->stop(); - delete m_outgoingFTManager; - delete m_remoteCandidateSelectorFactory; - delete m_localCandidateGeneratorFactory; - delete m_jingleSessionManager; - delete m_bytestreamRegistry; - delete m_bytestreamServer; - delete m_bytestreamProxy; - delete m_connectivityManager; -} - -FileTransferManager::Transfer FileTransferManager::sendFile(User *user, Buddy *buddy, boost::shared_ptr byteStream, const Swift::StreamInitiationFileInfo &info) { - FileTransferManager::Transfer transfer; - transfer.from = buddy->getJID(); - transfer.to = user->getJID(); - transfer.readByteStream = byteStream; - - LOG4CXX_INFO(logger, "Starting FT from '" << transfer.from << "' to '" << transfer.to << "'") - - transfer.ft = m_outgoingFTManager->createOutgoingFileTransfer(transfer.from, transfer.to, transfer.readByteStream, info); -// if (transfer.ft) { -// m_filetransfers.push_back(ft); -// ft->onStateChange.connect(boost::bind(&User::handleFTStateChanged, this, _1, Buddy::JIDToLegacyName(from), info.getName(), info.getSize(), id)); -// transfer.ft->start(); -// } - return transfer; -} - -} +/** + * libtransport -- C++ library for easy XMPP Transports development + * + * Copyright (C) 2011, Jan Kaluza + * + * 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/filetransfermanager.h" +#include "transport/transport.h" +#include "transport/usermanager.h" +#include "transport/user.h" +#include "transport/buddy.h" +#include "transport/logging.h" +#include "Swiften/Network/ConnectionServerFactory.h" + +namespace Transport { + +DEFINE_LOGGER(logger, "FileTransferManager"); + +FileTransferManager::FileTransferManager(Component *component, UserManager *userManager) { + m_component = component; + m_userManager = userManager; + + m_jingleSessionManager = new Swift::JingleSessionManager(m_component->getIQRouter()); +#if !HAVE_SWIFTEN_3 + m_connectivityManager = new Swift::ConnectivityManager(m_component->getNetworkFactories()->getNATTraverser()); +#endif + m_bytestreamRegistry = new Swift::SOCKS5BytestreamRegistry(); +#if !HAVE_SWIFTEN_3 + m_bytestreamProxy = new Swift::SOCKS5BytestreamProxy(m_component->getNetworkFactories()->getConnectionFactory(), m_component->getNetworkFactories()->getTimerFactory()); + m_localCandidateGeneratorFactory = new Swift::DefaultLocalJingleTransportCandidateGeneratorFactory(m_connectivityManager, m_bytestreamRegistry, m_bytestreamProxy, "thishouldnotbeused"); + m_remoteCandidateSelectorFactory = new Swift::DefaultRemoteJingleTransportCandidateSelectorFactory(m_component->getNetworkFactories()->getConnectionFactory(), m_component->getNetworkFactories()->getTimerFactory()); +#else + m_proxyManager = new Swift::SOCKS5BytestreamProxiesManager(m_component->getNetworkFactories()->getConnectionFactory(), m_component->getNetworkFactories()->getTimerFactory(), m_component->getNetworkFactories()->getDomainNameResolver(), m_component->getIQRouter(), "bar.com"); +#endif + boost::shared_ptr server = m_component->getNetworkFactories()->getConnectionServerFactory()->createConnectionServer(19645); + server->start(); +#if HAVE_SWIFTEN_3 + m_proxyServerManager = new Swift::SOCKS5BytestreamServerManager(m_bytestreamRegistry, m_component->getNetworkFactories()->getConnectionServerFactory(), m_component->getNetworkFactories()->getNetworkEnvironment(), m_component->getNetworkFactories()->getNATTraverser()); +#else + m_bytestreamServer = new Swift::SOCKS5BytestreamServer(server, m_bytestreamRegistry); + m_bytestreamServer->start(); + m_outgoingFTManager = new Swift::CombinedOutgoingFileTransferManager(m_jingleSessionManager, m_component->getIQRouter(), + m_userManager, m_remoteCandidateSelectorFactory, + m_localCandidateGeneratorFactory, m_bytestreamRegistry, + m_bytestreamProxy, m_component->getPresenceOracle(), + m_bytestreamServer); +#endif + + + +// WARNING: Swiften crashes when this is uncommented... But we probably need it for working Jingle FT +// m_connectivityManager->addListeningPort(19645); +} + +FileTransferManager::~FileTransferManager() { +#if !HAVE_SWIFTEN_3 + m_bytestreamServer->stop(); + delete m_remoteCandidateSelectorFactory; + delete m_localCandidateGeneratorFactory; +#endif + delete m_outgoingFTManager; + delete m_jingleSessionManager; + delete m_bytestreamRegistry; +#if !HAVE_SWIFTEN_3 + delete m_bytestreamServer; + delete m_bytestreamProxy; + delete m_connectivityManager; +#endif +} + +FileTransferManager::Transfer FileTransferManager::sendFile(User *user, Buddy *buddy, boost::shared_ptr byteStream, const Swift::StreamInitiationFileInfo &info) { + FileTransferManager::Transfer transfer; + transfer.from = buddy->getJID(); + transfer.to = user->getJID(); + transfer.readByteStream = byteStream; + + LOG4CXX_INFO(logger, "Starting FT from '" << transfer.from << "' to '" << transfer.to << "'") + + transfer.ft = m_outgoingFTManager->createOutgoingFileTransfer(transfer.from, transfer.to, transfer.readByteStream, info); +// if (transfer.ft) { +// m_filetransfers.push_back(ft); +// ft->onStateChange.connect(boost::bind(&User::handleFTStateChanged, this, _1, Buddy::JIDToLegacyName(from), info.getName(), info.getSize(), id)); +// transfer.ft->start(); +// } + return transfer; +} + +}