2 files changed, 14 insertions, 2 deletions
diff --git a/Swiften/Network/NATPMPInterface.cpp b/Swiften/Network/NATPMPInterface.cpp
index 5fe7fc2..064cfc8 100644
--- a/Swiften/Network/NATPMPInterface.cpp
+++ b/Swiften/Network/NATPMPInterface.cpp
@@ -52,15 +52,20 @@ boost::optional<HostAddress> NATPMPInterface::getPublicIP() {
 	do {
 	  fd_set fds;
 	  struct timeval timeout;
 	  FD_ZERO(&fds);
 	  FD_SET(p->natpmp.s, &fds);
 	  getnatpmprequesttimeout(&p->natpmp, &timeout);
+
+	  // Limit NAT-PMP timeout to ten seconds.
+	  timeout.tv_sec = 10;
+	  timeout.tv_usec = 0;
+
 	  select(FD_SETSIZE, &fds, NULL, NULL, &timeout);
 	  r = readnatpmpresponseorretry(&p->natpmp, &response);
-	} while (r == NATPMP_TRYAGAIN);
+	} while (false /*r == NATPMP_TRYAGAIN*/);
 
 	if (r == 0) {
 		return boost::optional<HostAddress>(HostAddress(reinterpret_cast<const unsigned char*>(&(response.pnu.publicaddress.addr)), 4));
 	}
 	else {
 		SWIFT_LOG(debug) << "Inavlid NAT-PMP response." << std::endl;
@@ -85,15 +90,20 @@ boost::optional<NATPortMapping> NATPMPInterface::addPortForward(int localPort, i
 	do {
 		fd_set fds;
 		struct timeval timeout;
 		FD_ZERO(&fds);
 		FD_SET(p->natpmp.s, &fds);
 		getnatpmprequesttimeout(&p->natpmp, &timeout);
+
+		// Limit NAT-PMP timeout to ten seconds.
+		timeout.tv_sec = 10;
+		timeout.tv_usec = 0;
+
 		select(FD_SETSIZE, &fds, NULL, NULL, &timeout);
 		r = readnatpmpresponseorretry(&p->natpmp, &response);
-	} while(r == NATPMP_TRYAGAIN);
+	} while(false /*r == NATPMP_TRYAGAIN*/);
 
 	if (r == 0) {
 		NATPortMapping result(response.pnu.newportmapping.privateport, response.pnu.newportmapping.mappedpublicport, NATPortMapping::TCP, boost::numeric_cast<int>(response.pnu.newportmapping.lifetime));
 		return result;
 	}
 	else {
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
@@ -138,22 +138,24 @@ PlatformNATTraversalWorker::~PlatformNATTraversalWorker() {
 NATTraversalInterface* PlatformNATTraversalWorker::getNATTraversalInterface() const {
 #ifdef HAVE_LIBMINIUPNPC
 	if (boost::logic::indeterminate(miniUPnPSupported)) {
 		miniUPnPInterface = new MiniUPnPInterface();
 		miniUPnPSupported = miniUPnPInterface->isAvailable();
 	}
+	SWIFT_LOG(debug) << "UPnP NAT traversal supported: " << miniUPnPSupported << std::endl;
 	if (miniUPnPSupported) {
 		return miniUPnPInterface;
 	}
 #endif
 
 #ifdef HAVE_LIBNATPMP
 	if (boost::logic::indeterminate(natPMPSupported)) {
 		natPMPInterface = new NATPMPInterface();
 		natPMPSupported = natPMPInterface->isAvailable();
 	}
+	SWIFT_LOG(debug) << "NAT-PMP NAT traversal supported: " << natPMPSupported << std::endl;
 	if (natPMPSupported) {
 		return natPMPInterface;
 	}
 #endif
 
 	return nullNATTraversalInterface;