summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemko Tronçon <git@el-tramo.be>2011-09-24 18:18:28 (GMT)
committerRemko Tronçon <git@el-tramo.be>2011-09-25 17:42:32 (GMT)
commit94f87ffc9769f2782b2267db813854b0fe752678 (patch)
tree56244712ade2be0d4a0a093d7721d18050e74f87 /Swiften/Network/PlatformNATTraversalWorker.h
parent4f62e5ec4b42929fe3c1a68667e63cb1b7a35509 (diff)
downloadswift-contrib-94f87ffc9769f2782b2267db813854b0fe752678.zip
swift-contrib-94f87ffc9769f2782b2267db813854b0fe752678.tar.bz2
File transfer changes.
- Introduce 'experimental' flag to conditionally compile FT. - Use LibMiniUPNPC and NATPMP CPPDEFINES only locally in the classes that need them. - Extract abstract interface from NAT traversal classes - Avoid unit test warnings
Diffstat (limited to 'Swiften/Network/PlatformNATTraversalWorker.h')
-rw-r--r--Swiften/Network/PlatformNATTraversalWorker.h15
1 files changed, 8 insertions, 7 deletions
diff --git a/Swiften/Network/PlatformNATTraversalWorker.h b/Swiften/Network/PlatformNATTraversalWorker.h
index 7c249cc..9de1258 100644
--- a/Swiften/Network/PlatformNATTraversalWorker.h
+++ b/Swiften/Network/PlatformNATTraversalWorker.h
@@ -12,17 +12,18 @@
#include <boost/thread/mutex.hpp>
#include <boost/thread/condition_variable.hpp>
+#include <Swiften/Network/NATTraverser.h>
#include <Swiften/Network/HostAddressPort.h>
#include <Swiften/Network/PlatformNATTraversalRequest.h>
namespace Swift {
class EventLoop;
-class PlatformNATTraversalGetPublicIPRequest;
-class PlatformNATTraversalForwardPortRequest;
-class PlatformNATTraversalRemovePortForwardingRequest;
+class NATTraversalGetPublicIPRequest;
+class NATTraversalForwardPortRequest;
+class NATTraversalRemovePortForwardingRequest;
-class PlatformNATTraversalWorker {
+class PlatformNATTraversalWorker : public NATTraverser {
private:
enum BackendType {
NotYetDecided,
@@ -35,9 +36,9 @@ public:
PlatformNATTraversalWorker(EventLoop* eventLoop);
~PlatformNATTraversalWorker();
- boost::shared_ptr<PlatformNATTraversalGetPublicIPRequest> createGetPublicIPRequest();
- boost::shared_ptr<PlatformNATTraversalForwardPortRequest> createForwardPortRequest(unsigned int localPort, unsigned int publicPort);
- boost::shared_ptr<PlatformNATTraversalRemovePortForwardingRequest> createRemovePortForwardingRequest(unsigned int localPort, unsigned int publicPort);
+ boost::shared_ptr<NATTraversalGetPublicIPRequest> createGetPublicIPRequest();
+ boost::shared_ptr<NATTraversalForwardPortRequest> createForwardPortRequest(unsigned int localPort, unsigned int publicPort);
+ boost::shared_ptr<NATTraversalRemovePortForwardingRequest> createRemovePortForwardingRequest(unsigned int localPort, unsigned int publicPort);
void run();
void addRequestToQueue(PlatformNATTraversalRequest::ref);