From 5f04c7a5d26c56fb25820b1ac5c33af228a7abb6 Mon Sep 17 00:00:00 2001
From: Ylian Saint-Hilaire <ysainthilaire@hotmail.com>
Date: Mon, 1 Aug 2022 11:00:26 -0700
Subject: [PATCH] Removed the agent relay timeout that causes disconnections
 after 5 seconds (#4352)

---
 agents/meshcore.js | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/agents/meshcore.js b/agents/meshcore.js
index 0d81ae11..cd2f66c9 100644
--- a/agents/meshcore.js
+++ b/agents/meshcore.js
@@ -1885,8 +1885,8 @@ function onTunnelUpgrade(response, s, head) {
     s.tunnel = this;
     s.descriptorMetadata = "MeshAgent_relayTunnel";
 
-
-    if (this.tcpport != null || this.udpport != null)
+    //if (this.tcpport != null || this.udpport != null)
+    if (require('MeshAgent').idleTimeout != null)
     {
         s.setTimeout(require('MeshAgent').idleTimeout * 1000);
         s.on('timeout', function ()
@@ -2086,15 +2086,18 @@ function onTunnelData(data) {
         if ((data == 'c') || (data == 'cr'))
         {
             this.httprequest.state = 1; /*sendConsoleText("Tunnel #" + this.httprequest.index + " now active", this.httprequest.sessionid);*/
+            /*
             this.setTimeout(global._tunnelTimeout == null ? 5000 : global._tunnelTimeout); // Once we receive 'c', we will only wait the tunnel timeout (5 seconds) before we close the tunnel
             this.on('timeout', function ()
             {
                 this.end();
             });
+            */
         }
     }
     else
     {
+        /*
         // We received some data, so we will reset the idle timeout of the websocket
         this.removeAllListeners('timeout');
 
@@ -2107,6 +2110,7 @@ function onTunnelData(data) {
                 this.setTimeout(require('MeshAgent').idleTimeout * 1000);
             });
         }
+        */
 
         // Handle tunnel data
         if (this.httprequest.protocol == 0) { // 1 = Terminal (admin), 2 = Desktop, 5 = Files, 6 = PowerShell (admin), 7 = Plugin Data Exchange, 8 = Terminal (user), 9 = PowerShell (user), 10 = FileTransfer