external/MeshCentral
1
0
Fork 0
mirror of https://github.com/Ylianst/MeshCentral.git synced 2025-02-12 19:11:51 +00:00
Code Issues Releases Wiki Activity

Removed the agent relay timeout that causes disconnections after 5 seconds (#4352)

Browse source
This commit is contained in:
Ylian Saint-Hilaire 2022-08-01 11:00:26 -07:00
parent 9b69b9949d
commit 5f04c7a5d2
1 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
agents/meshcore.js
View file

@ -1885,8 +1885,8 @@ function onTunnelUpgrade(response, s, head) {
s.tunnel = this; s.tunnel = this;
s.descriptorMetadata = "MeshAgent_relayTunnel"; 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.setTimeout(require('MeshAgent').idleTimeout * 1000);
s.on('timeout', function () s.on('timeout', function ()
@ -2086,15 +2086,18 @@ function onTunnelData(data) {
if ((data == 'c') || (data == 'cr')) if ((data == 'c') || (data == 'cr'))
{ {
this.httprequest.state = 1; /*sendConsoleText("Tunnel #" + this.httprequest.index + " now active", this.httprequest.sessionid);*/ 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.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.on('timeout', function ()
{ {
this.end(); this.end();
}); });
*/
} }
} }
else else
{ {
/*
// We received some data, so we will reset the idle timeout of the websocket // We received some data, so we will reset the idle timeout of the websocket
this.removeAllListeners('timeout'); this.removeAllListeners('timeout');
@ -2107,6 +2110,7 @@ function onTunnelData(data) {
this.setTimeout(require('MeshAgent').idleTimeout * 1000); this.setTimeout(require('MeshAgent').idleTimeout * 1000);
}); });
} }
*/
// Handle tunnel data // 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 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