1 files changed, 5 insertions, 1 deletions
diff --git a/Swiften/FileTransfer/SOCKS5BytestreamServerManager.cpp b/Swiften/FileTransfer/SOCKS5BytestreamServerManager.cpp
index 7b97698..3b1be89 100644
--- a/Swiften/FileTransfer/SOCKS5BytestreamServerManager.cpp
+++ b/Swiften/FileTransfer/SOCKS5BytestreamServerManager.cpp
@@ -1,32 +1,32 @@
 /*
- * Copyright (c) 2012-2015 Isode Limited.
+ * Copyright (c) 2012-2016 Isode Limited.
  * All rights reserved.
  * See the COPYING file for more information.
  */
 
 /*
  * Copyright (c) 2011 Tobias Markmann
  * Licensed under the simplified BSD license.
  * See Documentation/Licenses/BSD-simplified.txt for more information.
  */
 
 #include <Swiften/FileTransfer/SOCKS5BytestreamServerManager.h>
 
 #include <boost/bind.hpp>
 #include <boost/smart_ptr/make_shared.hpp>
 
 #include <Swiften/Base/Log.h>
 #include <Swiften/Base/foreach.h>
 #include <Swiften/FileTransfer/SOCKS5BytestreamServer.h>
 #include <Swiften/FileTransfer/SOCKS5BytestreamServerPortForwardingUser.h>
 #include <Swiften/FileTransfer/SOCKS5BytestreamServerResourceUser.h>
 #include <Swiften/Network/ConnectionServer.h>
 #include <Swiften/Network/ConnectionServerFactory.h>
 #include <Swiften/Network/NATTraversalForwardPortRequest.h>
 #include <Swiften/Network/NATTraversalGetPublicIPRequest.h>
 #include <Swiften/Network/NATTraversalRemovePortForwardingRequest.h>
 #include <Swiften/Network/NATTraverser.h>
 #include <Swiften/Network/NetworkEnvironment.h>
 
 using namespace Swift;
 
@@ -165,60 +165,64 @@ void SOCKS5BytestreamServerManager::setupPortForwarding() {
 
 	// Forward ports
 	int port = server->getAddressPort().getPort();
 	assert(!forwardPortRequest);
 	portMapping = boost::optional<NATPortMapping>();
 	if ((forwardPortRequest = natTraverser->createForwardPortRequest(port, port))) {
 		forwardPortRequest->onResult.connect(
 				boost::bind(&SOCKS5BytestreamServerManager::handleForwardPortResult, this, _1));
 		forwardPortRequest->start();
 	}
 }
 
 void SOCKS5BytestreamServerManager::removePortForwarding() {
 	// remove port forwards
 	if (portMapping) {
 		unforwardPortRequest = natTraverser->createRemovePortForwardingRequest(portMapping.get().getLocalPort(), portMapping.get().getPublicPort());
 		unforwardPortRequest->onResult.connect(boost::bind(&SOCKS5BytestreamServerManager::handleUnforwardPortResult, this, _1));
 		unforwardPortRequest->start();
 	}
 }
 
 void SOCKS5BytestreamServerManager::stop() {
 	if (getPublicIPRequest) {
 		getPublicIPRequest->stop();
 		getPublicIPRequest.reset();
 	}
 	if (forwardPortRequest) {
 		forwardPortRequest->stop();
 		forwardPortRequest.reset();
 	}
+	if (unforwardPortRequest) {
+		unforwardPortRequest->stop();
+		unforwardPortRequest.reset();
+	}
 	if (server) {
 		server->stop();
 		delete server;
 		server = NULL;
 	}
 	if (connectionServer) {
 		connectionServer->stop();
 		connectionServer.reset();
 	}
 
 	state = Start;
 }
 
 void SOCKS5BytestreamServerManager::handleGetPublicIPResult(boost::optional<HostAddress> address) {
 	if (address) {
 		SWIFT_LOG(debug) << "Public IP discovered as " << address.get().toString() << "." << std::endl;
 	} 
 	else {
 		SWIFT_LOG(debug) << "No public IP discoverable." << std::endl;
 	}
 
 	publicAddress = address;
 
 	getPublicIPRequest->stop();
 	getPublicIPRequest.reset();
 }
 
 void SOCKS5BytestreamServerManager::handleForwardPortResult(boost::optional<NATPortMapping> mapping) {
 	if (mapping) {
 		SWIFT_LOG(debug) << "Mapping port was successful." << std::endl;