Swift
summaryrefslogtreecommitdiffstats
path: root/Swift/Controllers
diff options
context:
space:
mode:
authorRemko Tronçon <git@el-tramo.be>2011-09-30 21:22:15 (GMT)
committerRemko Tronçon <git@el-tramo.be>2011-09-30 21:22:15 (GMT)
commit26e34e9888e4c523741a659055d469c828909cc6 (patch)
treeac3e6971b73f6bb50701ffec73b325078b20a296 /Swift/Controllers
parentbbe47f55d18b6f9e530ac2c8d0d3aebb0ec72f8c (diff)
downloadswift-contrib-26e34e9888e4c523741a659055d469c828909cc6.zip
swift-contrib-26e34e9888e4c523741a659055d469c828909cc6.tar.bz2
Moved SOCKS5BytestreamProxyFinder to Swiften.
Diffstat (limited to 'Swift/Controllers')
-rw-r--r--Swift/Controllers/FileTransfer/SOCKS5BytestreamProxyFinder.cpp53
-rw-r--r--Swift/Controllers/FileTransfer/SOCKS5BytestreamProxyFinder.h38
-rw-r--r--Swift/Controllers/MainController.cpp8
-rw-r--r--Swift/Controllers/MainController.h2
-rw-r--r--Swift/Controllers/SConscript1
5 files changed, 0 insertions, 102 deletions
diff --git a/Swift/Controllers/FileTransfer/SOCKS5BytestreamProxyFinder.cpp b/Swift/Controllers/FileTransfer/SOCKS5BytestreamProxyFinder.cpp
deleted file mode 100644
index da0606c..0000000
--- a/Swift/Controllers/FileTransfer/SOCKS5BytestreamProxyFinder.cpp
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
- * Copyright (c) 2011 Tobias Markmann
- * Licensed under the simplified BSD license.
- * See Documentation/Licenses/BSD-simplified.txt for more information.
- */
-
-#include "SOCKS5BytestreamProxyFinder.h"
-
-#include <boost/smart_ptr/make_shared.hpp>
-#include <boost/bind.hpp>
-
-#include <Swiften/Base/Log.h>
-#include <Swiften/Elements/S5BProxyRequest.h>
-#include <Swiften/Queries/GenericRequest.h>
-#include <Swiften/Queries/IQRouter.h>
-
-namespace Swift {
-
-SOCKS5BytestreamProxyFinder::SOCKS5BytestreamProxyFinder(const JID& service, IQRouter *iqRouter) : iqRouter(iqRouter) {
- serviceWalker = boost::make_shared<DiscoServiceWalker>(service, iqRouter);
- serviceWalker->onServiceFound.connect(boost::bind(&SOCKS5BytestreamProxyFinder::handleServiceFound, this, _1, _2));
-}
-
-void SOCKS5BytestreamProxyFinder::start() {
- serviceWalker->beginWalk();
-}
-
-void SOCKS5BytestreamProxyFinder::sendBytestreamQuery(const JID& jid) {
- S5BProxyRequest::ref proxyRequest = boost::make_shared<S5BProxyRequest>();
- boost::shared_ptr<GenericRequest<S5BProxyRequest> > request = boost::make_shared<GenericRequest<S5BProxyRequest> >(IQ::Get, jid, proxyRequest, iqRouter);
- request->onResponse.connect(boost::bind(&SOCKS5BytestreamProxyFinder::handleProxyResponse, this, _1, _2));
- request->send();
-}
-
-void SOCKS5BytestreamProxyFinder::handleServiceFound(const JID& jid, boost::shared_ptr<DiscoInfo> discoInfo) {
- if (discoInfo->hasFeature(DiscoInfo::Bytestream)) {
- sendBytestreamQuery(jid);
- }
-}
-
-void SOCKS5BytestreamProxyFinder::handleProxyResponse(boost::shared_ptr<S5BProxyRequest> request, ErrorPayload::ref error) {
- if (error) {
- SWIFT_LOG(debug) << "ERROR" << std::endl;
- } else {
- if (request) {
- onProxyFound(request);
- } else {
- //assert(false);
- }
- }
-}
-
-}
diff --git a/Swift/Controllers/FileTransfer/SOCKS5BytestreamProxyFinder.h b/Swift/Controllers/FileTransfer/SOCKS5BytestreamProxyFinder.h
deleted file mode 100644
index bffc7a1..0000000
--- a/Swift/Controllers/FileTransfer/SOCKS5BytestreamProxyFinder.h
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- * 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 <Swiften/Disco/DiscoServiceWalker.h>
-#include <Swiften/Network/HostAddressPort.h>
-#include <Swiften/Elements/S5BProxyRequest.h>
-
-namespace Swift {
-
-class JID;
-class IQRouter;
-
-class SOCKS5BytestreamProxyFinder {
-public:
- SOCKS5BytestreamProxyFinder(const JID& service, IQRouter *iqRouter);
- void start();
-
- boost::signal<void(boost::shared_ptr<S5BProxyRequest>)> onProxyFound;
-
-private:
- void sendBytestreamQuery(const JID&);
-
- void handleServiceFound(const JID&, boost::shared_ptr<DiscoInfo>);
- void handleProxyResponse(boost::shared_ptr<S5BProxyRequest>, ErrorPayload::ref);
-private:
- boost::shared_ptr<DiscoServiceWalker> serviceWalker;
- IQRouter* iqRouter;
- std::vector<boost::shared_ptr<GenericRequest<S5BProxyRequest> > > requests;
-};
-
-}
diff --git a/Swift/Controllers/MainController.cpp b/Swift/Controllers/MainController.cpp
index ce5b6ed..364dd57 100644
--- a/Swift/Controllers/MainController.cpp
+++ b/Swift/Controllers/MainController.cpp
@@ -121,7 +121,6 @@ MainController::MainController(
userSearchControllerAdd_ = NULL;
quitRequested_ = false;
clientInitialized_ = false;
- s5bProxyFinder_ = NULL;
timeBeforeNextReconnect_ = -1;
dock_ = dock;
@@ -219,8 +218,6 @@ void MainController::resetClient() {
eventWindowController_ = NULL;
delete chatsManager_;
chatsManager_ = NULL;
- delete s5bProxyFinder_;
- s5bProxyFinder_ = NULL;
delete ftOverview_;
ftOverview_ = NULL;
delete rosterController_;
@@ -285,11 +282,6 @@ void MainController::handleConnected() {
srand(time(NULL));
int randomPort = 10000 + rand() % 10000;
client_->getFileTransferManager()->startListeningOnPort(randomPort);
-#ifdef SWIFT_EXPERIMENTAL_FT
- s5bProxyFinder_ = new SOCKS5BytestreamProxyFinder(client_->getJID().getDomain(), client_->getIQRouter());
- s5bProxyFinder_->onProxyFound.connect(boost::bind(&FileTransferManager::addS5BProxy, client_->getFileTransferManager(), _1));
- s5bProxyFinder_->start();
-#endif
ftOverview_ = new FileTransferOverview(client_->getFileTransferManager());
fileTransferListController_->setFileTransferOverview(ftOverview_);
rosterController_ = new RosterController(jid_, client_->getRoster(), client_->getAvatarManager(), uiFactory_, client_->getNickManager(), client_->getNickResolver(), client_->getPresenceOracle(), client_->getSubscriptionManager(), eventController_, uiEventStream_, client_->getIQRouter(), settings_, client_->getEntityCapsProvider(), ftOverview_);
diff --git a/Swift/Controllers/MainController.h b/Swift/Controllers/MainController.h
index 2aaa542..12028d7 100644
--- a/Swift/Controllers/MainController.h
+++ b/Swift/Controllers/MainController.h
@@ -23,7 +23,6 @@
#include "Swiften/Elements/CapsInfo.h"
#include "Swift/Controllers/XMPPEvents/ErrorEvent.h"
#include "Swift/Controllers/UIEvents/UIEvent.h"
-#include "Swift/Controllers/FileTransfer/SOCKS5BytestreamProxyFinder.h"
#include "Swiften/Client/ClientXMLTracer.h"
namespace Swift {
@@ -168,6 +167,5 @@ namespace Swift {
static const int SecondsToWaitBeforeForceQuitting;
bool eagleMode_;
FileTransferOverview* ftOverview_;
- SOCKS5BytestreamProxyFinder* s5bProxyFinder_;
};
}
diff --git a/Swift/Controllers/SConscript b/Swift/Controllers/SConscript
index 03dc0b7..e48f382 100644
--- a/Swift/Controllers/SConscript
+++ b/Swift/Controllers/SConscript
@@ -33,7 +33,6 @@ if env["SCONS_STAGE"] == "build" :
"FileTransfer/FileTransferController.cpp",
"FileTransfer/FileTransferOverview.cpp",
"FileTransfer/FileTransferProgressInfo.cpp",
- "FileTransfer/SOCKS5BytestreamProxyFinder.cpp",
"Roster/RosterController.cpp",
"Roster/RosterGroupExpandinessPersister.cpp",
"Roster/ContactRosterItem.cpp",