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/BoostNetworkFactories.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/BoostNetworkFactories.h')
-rw-r--r--Swiften/Network/BoostNetworkFactories.h7
1 files changed, 4 insertions, 3 deletions
diff --git a/Swiften/Network/BoostNetworkFactories.h b/Swiften/Network/BoostNetworkFactories.h
index a1cf9ae..bc7a963 100644
--- a/Swiften/Network/BoostNetworkFactories.h
+++ b/Swiften/Network/BoostNetworkFactories.h
@@ -11,6 +11,7 @@
namespace Swift {
class EventLoop;
+ class NATTraverser;
class BoostNetworkFactories : public NetworkFactories {
public:
@@ -37,8 +38,8 @@ namespace Swift {
return connectionServerFactory;
}
- PlatformNATTraversalWorker* getPlatformNATTraversalWorker() const {
- return platformNATTraversalWorker;
+ NATTraverser* getNATTraverser() const {
+ return natTraverser;
}
private:
@@ -47,6 +48,6 @@ namespace Swift {
ConnectionFactory* connectionFactory;
DomainNameResolver* domainNameResolver;
ConnectionServerFactory* connectionServerFactory;
- PlatformNATTraversalWorker* platformNATTraversalWorker;
+ NATTraverser* natTraverser;
};
}