summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTobias Markmann <tm@ayena.de>2017-06-24 19:24:28 (GMT)
committerTobias Markmann <tm@ayena.de>2017-06-26 04:18:34 (GMT)
commitbd0e671455f6b042bbbd385f1551e9a5011badf5 (patch)
tree9a496a300584d2b09220117af6fb52568102e5ee /Swiften/Network/PlatformNATTraversalWorker.h
parent02763529a75970a1d57d9abf3448848f728c4101 (diff)
downloadswift-bd0e671455f6b042bbbd385f1551e9a5011badf5.zip
swift-bd0e671455f6b042bbbd385f1551e9a5011badf5.tar.bz2
Remove unneeded forward declarations from Swiften headers
Found by cppclean. Test-Information: Still builds on macOS 10.12.5 with clang trunk. Change-Id: Ie8a154e12b196587c956c8b333abf529a36f6bb3
Diffstat (limited to 'Swiften/Network/PlatformNATTraversalWorker.h')
-rw-r--r--Swiften/Network/PlatformNATTraversalWorker.h3
1 files changed, 1 insertions, 2 deletions
diff --git a/Swiften/Network/PlatformNATTraversalWorker.h b/Swiften/Network/PlatformNATTraversalWorker.h
index 3607dac..aee1052 100644
--- a/Swiften/Network/PlatformNATTraversalWorker.h
+++ b/Swiften/Network/PlatformNATTraversalWorker.h
@@ -1,68 +1,67 @@
/*
* Copyright (c) 2011 Tobias Markmann
* Licensed under the simplified BSD license.
* See Documentation/Licenses/BSD-simplified.txt for more information.
*/
/*
- * Copyright (c) 2016 Isode Limited.
+ * Copyright (c) 2016-2017 Isode Limited.
* All rights reserved.
* See the COPYING file for more information.
*/
#pragma once
#include <condition_variable>
#include <deque>
#include <mutex>
#include <thread>
#include <boost/logic/tribool.hpp>
#include <boost/optional.hpp>
#include <Swiften/Base/API.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);
virtual ~PlatformNATTraversalWorker();
std::shared_ptr<NATTraversalGetPublicIPRequest> createGetPublicIPRequest();
std::shared_ptr<NATTraversalForwardPortRequest> createForwardPortRequest(int localPort, int publicPort);
std::shared_ptr<NATTraversalRemovePortForwardingRequest> createRemovePortForwardingRequest(int localPort, int 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;