Swift
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--Swiften/FileTransfer/SOCKS5BytestreamServerManager.cpp15
1 files changed, 8 insertions, 7 deletions
diff --git a/Swiften/FileTransfer/SOCKS5BytestreamServerManager.cpp b/Swiften/FileTransfer/SOCKS5BytestreamServerManager.cpp
index 3137163..f531856 100644
--- a/Swiften/FileTransfer/SOCKS5BytestreamServerManager.cpp
+++ b/Swiften/FileTransfer/SOCKS5BytestreamServerManager.cpp
@@ -10,25 +10,25 @@
10 * See Documentation/Licenses/BSD-simplified.txt for more information. 10 * See Documentation/Licenses/BSD-simplified.txt for more information.
11 */ 11 */
12 12
13#include <Swiften/FileTransfer/SOCKS5BytestreamServerManager.h> 13#include <Swiften/FileTransfer/SOCKS5BytestreamServerManager.h>
14 14
15#include <boost/smart_ptr/make_shared.hpp>
16#include <boost/bind.hpp> 15#include <boost/bind.hpp>
16#include <boost/smart_ptr/make_shared.hpp>
17 17
18#include <Swiften/FileTransfer/SOCKS5BytestreamServerResourceUser.h>
19#include <Swiften/FileTransfer/SOCKS5BytestreamServerPortForwardingUser.h>
20#include <Swiften/Base/foreach.h>
21#include <Swiften/Base/Log.h> 18#include <Swiften/Base/Log.h>
19#include <Swiften/Base/foreach.h>
22#include <Swiften/FileTransfer/SOCKS5BytestreamServer.h> 20#include <Swiften/FileTransfer/SOCKS5BytestreamServer.h>
21#include <Swiften/FileTransfer/SOCKS5BytestreamServerPortForwardingUser.h>
22#include <Swiften/FileTransfer/SOCKS5BytestreamServerResourceUser.h>
23#include <Swiften/Network/ConnectionServer.h> 23#include <Swiften/Network/ConnectionServer.h>
24#include <Swiften/Network/ConnectionServerFactory.h> 24#include <Swiften/Network/ConnectionServerFactory.h>
25#include <Swiften/Network/NetworkEnvironment.h>
26#include <Swiften/Network/NATTraverser.h>
27#include <Swiften/Network/NATTraversalGetPublicIPRequest.h>
28#include <Swiften/Network/NATTraversalForwardPortRequest.h> 25#include <Swiften/Network/NATTraversalForwardPortRequest.h>
26#include <Swiften/Network/NATTraversalGetPublicIPRequest.h>
29#include <Swiften/Network/NATTraversalRemovePortForwardingRequest.h> 27#include <Swiften/Network/NATTraversalRemovePortForwardingRequest.h>
28#include <Swiften/Network/NATTraverser.h>
29#include <Swiften/Network/NetworkEnvironment.h>
30 30
31using namespace Swift; 31using namespace Swift;
32 32
33static const int LISTEN_PORTS_BEGIN = 10000; 33static const int LISTEN_PORTS_BEGIN = 10000;
34static const int LISTEN_PORTS_END = 11000; 34static const int LISTEN_PORTS_END = 11000;
@@ -192,10 +192,11 @@ void SOCKS5BytestreamServerManager::stop() {
192 forwardPortRequest->stop(); 192 forwardPortRequest->stop();
193 forwardPortRequest.reset(); 193 forwardPortRequest.reset();
194 } 194 }
195 if (server) { 195 if (server) {
196 server->stop(); 196 server->stop();
197 delete server;
197 server = NULL; 198 server = NULL;
198 } 199 }
199 if (connectionServer) { 200 if (connectionServer) {
200 connectionServer->stop(); 201 connectionServer->stop();
201 connectionServer.reset(); 202 connectionServer.reset();