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/UPnPNATTraversalGetPublicIPRequest.h
parent4f62e5ec4b42929fe3c1a68667e63cb1b7a35509 (diff)
downloadswift-94f87ffc9769f2782b2267db813854b0fe752678.zip
swift-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/UPnPNATTraversalGetPublicIPRequest.h')
-rw-r--r--Swiften/Network/UPnPNATTraversalGetPublicIPRequest.h9
1 files changed, 7 insertions, 2 deletions
diff --git a/Swiften/Network/UPnPNATTraversalGetPublicIPRequest.h b/Swiften/Network/UPnPNATTraversalGetPublicIPRequest.h
index 9d50001..884f1de 100644
--- a/Swiften/Network/UPnPNATTraversalGetPublicIPRequest.h
+++ b/Swiften/Network/UPnPNATTraversalGetPublicIPRequest.h
@@ -6,16 +6,21 @@
#pragma once
-#include <Swiften/Network/PlatformNATTraversalGetPublicIPRequest.h>
+#include <Swiften/Network/NATTraversalGetPublicIPRequest.h>
+#include <Swiften/Network/PlatformNATTraversalRequest.h>
namespace Swift {
-class UPnPNATTraversalGetPublicIPRequest : public PlatformNATTraversalGetPublicIPRequest {
+class UPnPNATTraversalGetPublicIPRequest : public NATTraversalGetPublicIPRequest, public PlatformNATTraversalRequest {
public:
UPnPNATTraversalGetPublicIPRequest(PlatformNATTraversalWorker*);
virtual ~UPnPNATTraversalGetPublicIPRequest();
virtual void runBlocking();
+
+ virtual void run() {
+ doRun();
+ }
};
}