1 files changed, 20 insertions, 2 deletions

diff --git a/toxcore/DHT.c b/toxcore/DHT.c
index d5808313..02175c2a 100644
--- a/toxcore/DHT.c
+++ b/toxcore/DHT.c
@@ -46,11 +46,13 @@
 /* Ping interval in seconds for each random sending of a get nodes request. */
 #define GET_NODE_INTERVAL 5
 
-#define MAX_PUNCHING_PORTS 32
+#define MAX_PUNCHING_PORTS 48
 
 /* Interval in seconds between punching attempts*/
 #define PUNCH_INTERVAL 3
 
+#define MAX_NORMAL_PUNCHING_TRIES 5
+
 #define NAT_PING_REQUEST    0
 #define NAT_PING_RESPONSE   1
 
@@ -1793,7 +1795,7 @@ static void punch_holes(DHT *dht, IP ip, uint16_t *port_list, uint16_t numports,
         pinging.port = htons(firstport);
         send_ping_request(dht->ping, pinging, dht->friends_list[friend_num].client_id);
     } else {
-        for (i = dht->friends_list[friend_num].nat.punching_index; i != top; i++) {
+        for (i = dht->friends_list[friend_num].nat.punching_index; i != top; ++i) {
             /* TODO: Improve port guessing algorithm. */
             uint16_t port = port_list[(i / 2) % numports] + (i / (2 * numports)) * ((i % 2) ? -1 : 1);
             IP_Port pinging;
@@ -1804,6 +1806,22 @@ static void punch_holes(DHT *dht, IP ip, uint16_t *port_list, uint16_t numports,
 
         dht->friends_list[friend_num].nat.punching_index = i;
     }
+
+    if (dht->friends_list[friend_num].nat.tries > MAX_NORMAL_PUNCHING_TRIES) {
+        top = dht->friends_list[friend_num].nat.punching_index2 + MAX_PUNCHING_PORTS;
+        uint16_t port = 1024;
+        IP_Port pinging;
+        ip_copy(&pinging.ip, &ip);
+
+        for (i = dht->friends_list[friend_num].nat.punching_index2; i != top; ++i) {
+            pinging.port = htons(port + i);
+            send_ping_request(dht->ping, pinging, dht->friends_list[friend_num].client_id);
+        }
+
+        dht->friends_list[friend_num].nat.punching_index2 = i - (MAX_PUNCHING_PORTS / 2);
+    }
+
+    ++dht->friends_list[friend_num].nat.tries;
 }
 
 static void do_NAT(DHT *dht)