1 files changed, 57 insertions, 46 deletions
diff --git a/Swiften/Network/PlatformNATTraversalWorker.h b/Swiften/Network/PlatformNATTraversalWorker.h
index 6148705..368798e 100644
--- a/Swiften/Network/PlatformNATTraversalWorker.h
+++ b/Swiften/Network/PlatformNATTraversalWorker.h
@@ -4,60 +4,71 @@
  * See Documentation/Licenses/BSD-simplified.txt for more information.
  */
 
+/*
+ * Copyright (c) 2016-2018 Isode Limited.
+ * All rights reserved.
+ * See the COPYING file for more information.
+ */
+
 #pragma once
 
+#include <condition_variable>
 #include <deque>
-#include <boost/optional.hpp>
-#include <boost/thread/thread.hpp>
-#include <boost/thread/mutex.hpp>
-#include <boost/thread/condition_variable.hpp>
+#include <mutex>
+#include <thread>
+
 #include <boost/logic/tribool.hpp>
+#include <boost/optional.hpp>
 
 #include <Swiften/Base/API.h>
-#include <Swiften/Network/NATTraverser.h>
+#include <Swiften/Base/Atomic.h>
 #include <Swiften/Network/HostAddressPort.h>
+#include <Swiften/Network/NATTraverser.h>
 #include <Swiften/Network/NullNATTraversalInterface.h>
 
 namespace Swift {
-	class EventLoop;
-	class NATTraversalGetPublicIPRequest;
-	class NATTraversalForwardPortRequest;
-	class NATTraversalRemovePortForwardingRequest;
-	class PlatformNATTraversalRequest;
-	class NATPMPInterface;
-	class MiniUPnPInterface;
-	class NATTraversalInterface;
-	class NATPortMapping;
-
-	class SWIFTEN_API PlatformNATTraversalWorker : public NATTraverser {
-			friend class PlatformNATTraversalRequest;
-
-		public:
-			PlatformNATTraversalWorker(EventLoop* eventLoop);
-			~PlatformNATTraversalWorker();
-
-			boost::shared_ptr<NATTraversalGetPublicIPRequest> createGetPublicIPRequest();
-			boost::shared_ptr<NATTraversalForwardPortRequest> createForwardPortRequest(int localPort, int publicPort);
-			boost::shared_ptr<NATTraversalRemovePortForwardingRequest> createRemovePortForwardingRequest(int localPort, int publicPort);
-
-		private:
-			NATTraversalInterface* getNATTraversalInterface() const;
-			void addRequestToQueue(boost::shared_ptr<PlatformNATTraversalRequest>);
-			void start();
-			void stop();
-
-		private:
-			EventLoop* eventLoop;
-			bool stopRequested;
-			boost::thread* thread;
-			std::deque<boost::shared_ptr<PlatformNATTraversalRequest> > queue;
-			boost::mutex queueMutex;
-			boost::condition_variable queueNonEmpty;
-
-			NullNATTraversalInterface* nullNATTraversalInterface;
-			mutable boost::logic::tribool natPMPSupported;
-			mutable NATPMPInterface* natPMPInterface;
-			mutable boost::logic::tribool miniUPnPSupported;
-			mutable MiniUPnPInterface* miniUPnPInterface;
-	};
+    class EventLoop;
+    class NATTraversalGetPublicIPRequest;
+    class NATTraversalForwardPortRequest;
+    class NATTraversalRemovePortForwardingRequest;
+    class PlatformNATTraversalRequest;
+    class NATPMPInterface;
+    class MiniUPnPInterface;
+    class NATTraversalInterface;
+
+    class SWIFTEN_API PlatformNATTraversalWorker : public NATTraverser {
+            friend class PlatformNATTraversalRequest;
+
+        public:
+            PlatformNATTraversalWorker(EventLoop* eventLoop);
+            virtual ~PlatformNATTraversalWorker();
+
+            std::shared_ptr<NATTraversalGetPublicIPRequest> createGetPublicIPRequest();
+            std::shared_ptr<NATTraversalForwardPortRequest> createForwardPortRequest(unsigned short localPort, unsigned short publicPort);
+            std::shared_ptr<NATTraversalRemovePortForwardingRequest> createRemovePortForwardingRequest(unsigned short localPort, unsigned short publicPort);
+
+        private:
+            NATTraversalInterface* getNATTraversalInterface() const;
+            void addRequestToQueue(std::shared_ptr<PlatformNATTraversalRequest>);
+            void start();
+            void stop();
+
+            EventLoop* getEventLoop() const {
+                return eventLoop;
+            }
+
+        private:
+            EventLoop* eventLoop;
+            Atomic<bool> stopRequested;
+            std::thread* thread;
+            std::deque<std::shared_ptr<PlatformNATTraversalRequest> > queue;
+            std::mutex queueMutex;
+            std::condition_variable queueNonEmpty;
+
+            NullNATTraversalInterface* nullNATTraversalInterface;
+            mutable boost::logic::tribool natPMPSupported;
+            mutable NATPMPInterface* natPMPInterface;
+            mutable boost::logic::tribool miniUPnPSupported;
+            mutable MiniUPnPInterface* miniUPnPInterface;
+    };
 }