From 3d6649282822f79e40a771ea8ecd0cd9410f80f9 Mon Sep 17 00:00:00 2001
From: Adam Ierymenko <adam.ierymenko@gmail.com>
Date: Mon, 30 Nov 2015 14:17:58 -0800
Subject: [PATCH] Also add a timeout for the actual NAT-PMP port mapping step.

---
 osdep/PortMapper.cpp | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/osdep/PortMapper.cpp b/osdep/PortMapper.cpp
index fe98a04ae..a33bd0e65 100644
--- a/osdep/PortMapper.cpp
+++ b/osdep/PortMapper.cpp
@@ -124,6 +124,7 @@ public:
 					}
 
 				  sendnewportmappingrequest(&natpmp,NATPMP_PROTOCOL_UDP,localPort,tryPort,(ZT_PORTMAPPER_REFRESH_DELAY * 2) / 1000);
+					myTimeout = OSUtils::now() + 10000;
 					do {
 				    fd_set fds;
 				    struct timeval timeout;
@@ -132,6 +133,8 @@ public:
 				    getnatpmprequesttimeout(&natpmp, &timeout);
 				    select(FD_SETSIZE, &fds, NULL, NULL, &timeout);
 				    r = readnatpmpresponseorretry(&natpmp, &response);
+						if (OSUtils::now() >= myTimeout)
+							break;
 				  } while (r == NATPMP_TRYAGAIN);
 					if (r == 0) {
 						publicAddress.setPort(response.pnu.newportmapping.mappedpublicport);