1 files changed, 17 insertions, 7 deletions
diff --git a/Swiften/Network/PlatformNATTraversalWorker.cpp b/Swiften/Network/PlatformNATTraversalWorker.cpp
index 5e2bc0c..ef1876c 100644
--- a/Swiften/Network/PlatformNATTraversalWorker.cpp
+++ b/Swiften/Network/PlatformNATTraversalWorker.cpp
@@ -9,25 +9,26 @@
 #include <boost/smart_ptr/make_shared.hpp>
 #include <boost/enable_shared_from_this.hpp>
 #include <boost/numeric/conversion/cast.hpp>
 
 #include <Swiften/Base/Log.h>
 #include <Swiften/EventLoop/EventLoop.h>
+#include <Swiften/EventLoop/EventOwner.h>
 #include <Swiften/Network/NATTraversalGetPublicIPRequest.h>
 #include <Swiften/Network/NATTraversalForwardPortRequest.h>
 #include <Swiften/Network/NATTraversalRemovePortForwardingRequest.h>
 #ifdef HAVE_LIBNATPMP
 #include <Swiften/Network/NATPMPInterface.h>
 #endif
 #ifdef HAVE_LIBMINIUPNPC
 #include <Swiften/Network/MiniUPnPInterface.h>
 #endif
 
 namespace Swift {
 
-class PlatformNATTraversalRequest : public boost::enable_shared_from_this<PlatformNATTraversalRequest> {
+class PlatformNATTraversalRequest : public boost::enable_shared_from_this<PlatformNATTraversalRequest>, public EventOwner {
 	public:
 		typedef boost::shared_ptr<PlatformNATTraversalRequest> ref;
 
 	public:
 		PlatformNATTraversalRequest(PlatformNATTraversalWorker* worker) : worker(worker) {
 		}
@@ -56,62 +57,71 @@ class PlatformNATTraversalRequest : public boost::enable_shared_from_this<Platfo
 
 class PlatformNATTraversalGetPublicIPRequest : public NATTraversalGetPublicIPRequest, public PlatformNATTraversalRequest {
 	public:
 		PlatformNATTraversalGetPublicIPRequest(PlatformNATTraversalWorker* worker) : PlatformNATTraversalRequest(worker) {
 		}
 
+		virtual ~PlatformNATTraversalGetPublicIPRequest() {
+		}
+
 		virtual void start() {
 			doRun();
 		}
 
 		virtual void stop() {
-			// TODO
+			onResult.disconnect_all_slots();
 		}
 
 		virtual void runBlocking() {
-			getEventLoop()->postEvent(boost::bind(boost::ref(onResult), getNATTraversalInterface()->getPublicIP()));
+			getEventLoop()->postEvent(boost::bind(boost::ref(onResult), getNATTraversalInterface()->getPublicIP()), shared_from_this());
 		}
 };
 
 class PlatformNATTraversalForwardPortRequest : public NATTraversalForwardPortRequest, public PlatformNATTraversalRequest {
 	public:
 		PlatformNATTraversalForwardPortRequest(PlatformNATTraversalWorker* worker, unsigned int localIP, unsigned int publicIP) : PlatformNATTraversalRequest(worker), localIP(localIP), publicIP(publicIP) {
 		}
 
+		virtual ~PlatformNATTraversalForwardPortRequest() {
+		}
+
 		virtual void start() {
 			doRun();
 		}
 
 		virtual void stop() {
-			// TODO
+			onResult.disconnect_all_slots();
 		}
 
 		virtual void runBlocking() {
-			getEventLoop()->postEvent(boost::bind(boost::ref(onResult), getNATTraversalInterface()->addPortForward(boost::numeric_cast<int>(localIP), boost::numeric_cast<int>(publicIP))));
+			getEventLoop()->postEvent(boost::bind(boost::ref(onResult), getNATTraversalInterface()->addPortForward(boost::numeric_cast<int>(localIP), boost::numeric_cast<int>(publicIP))), shared_from_this());
 		}
 
 	private:
 		unsigned int localIP;
 		unsigned int publicIP;
 };
 
 class PlatformNATTraversalRemovePortForwardingRequest : public NATTraversalRemovePortForwardingRequest, public PlatformNATTraversalRequest {
 	public:
 		PlatformNATTraversalRemovePortForwardingRequest(PlatformNATTraversalWorker* worker, const NATPortMapping& mapping) : PlatformNATTraversalRequest(worker), mapping(mapping) {
 		}
 
+		virtual ~PlatformNATTraversalRemovePortForwardingRequest() {
+		}
+
 		virtual void start() {
 			doRun();
 		}
 
 		virtual void stop() {
-			// TODO
+			onResult.disconnect_all_slots();
 		}
 
 		virtual void runBlocking() {
-			getEventLoop()->postEvent(boost::bind(boost::ref(onResult), getNATTraversalInterface()->removePortForward(mapping)));
+			getEventLoop()->postEvent(boost::bind(boost::ref(onResult), getNATTraversalInterface()->removePortForward(mapping)), shared_from_this());
 		}
 
 	private:
 		NATPortMapping mapping;
 };