diff options
author | Tobias Markmann <tm@ayena.de> | 2014-12-19 13:49:02 (GMT) |
---|---|---|
committer | Swift Review <review@swift.im> | 2015-02-03 10:36:20 (GMT) |
commit | 33639a52730936a442070f6454920213f3350602 (patch) | |
tree | 496500c5e0f98d633fd6d648fae5451110e40d5d /Swiften/Network/PlatformNATTraversalWorker.cpp | |
parent | e85159cf04a0fd12631fd6937b653e03ac0a6399 (diff) | |
download | swift-33639a52730936a442070f6454920213f3350602.zip swift-33639a52730936a442070f6454920213f3350602.tar.bz2 |
Limit NAT-PMP detection timeout to 10 seconds.
libnatpmp has a high (over 2 minutes) timeout for discovery of NAT-PMP
support. This leads to a bad user experience when there is no NAT-PMP
support in the network.
Test-Information:
Tested this in an university network where neither UPnP nor NAT-PMP is
available. File-transfers waited more than 2 minutes for an answer of
a NAT-PMP device before starting the file-transfer.
Change-Id: I3ceaac7f89c982ffa683ee367d5ea3c3d4a2c5ca
Diffstat (limited to 'Swiften/Network/PlatformNATTraversalWorker.cpp')
-rw-r--r-- | Swiften/Network/PlatformNATTraversalWorker.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/Swiften/Network/PlatformNATTraversalWorker.cpp b/Swiften/Network/PlatformNATTraversalWorker.cpp index 65ff577..5e2bc0c 100644 --- a/Swiften/Network/PlatformNATTraversalWorker.cpp +++ b/Swiften/Network/PlatformNATTraversalWorker.cpp @@ -141,6 +141,7 @@ NATTraversalInterface* PlatformNATTraversalWorker::getNATTraversalInterface() co miniUPnPInterface = new MiniUPnPInterface(); miniUPnPSupported = miniUPnPInterface->isAvailable(); } + SWIFT_LOG(debug) << "UPnP NAT traversal supported: " << miniUPnPSupported << std::endl; if (miniUPnPSupported) { return miniUPnPInterface; } @@ -151,6 +152,7 @@ NATTraversalInterface* PlatformNATTraversalWorker::getNATTraversalInterface() co natPMPInterface = new NATPMPInterface(); natPMPSupported = natPMPInterface->isAvailable(); } + SWIFT_LOG(debug) << "NAT-PMP NAT traversal supported: " << natPMPSupported << std::endl; if (natPMPSupported) { return natPMPInterface; } |