diff --git a/agents/MeshCmd-signed.exe b/agents/MeshCmd-signed.exe index 9d9893ef..2ac56596 100644 Binary files a/agents/MeshCmd-signed.exe and b/agents/MeshCmd-signed.exe differ diff --git a/agents/MeshCmd64-signed.exe b/agents/MeshCmd64-signed.exe index 731fc622..b5c2a12b 100644 Binary files a/agents/MeshCmd64-signed.exe and b/agents/MeshCmd64-signed.exe differ diff --git a/agents/MeshService-signed.exe b/agents/MeshService-signed.exe index 42d454d4..169cce29 100644 Binary files a/agents/MeshService-signed.exe and b/agents/MeshService-signed.exe differ diff --git a/agents/MeshService64-signed.exe b/agents/MeshService64-signed.exe index 7fa327e1..d1f1d83b 100644 Binary files a/agents/MeshService64-signed.exe and b/agents/MeshService64-signed.exe differ diff --git a/meshuser.js b/meshuser.js index 57c260c7..216b4a36 100644 --- a/meshuser.js +++ b/meshuser.js @@ -1604,7 +1604,7 @@ module.exports.CreateMeshUser = function (parent, db, ws, req, args, domain, use // Generate a 8 digit integer with even random probability for each value. function getRandomEightDigitInteger() { var bigInt; - do { bigInt = obj.parent.crypto.randomBytes(4).readUInt32BE(0); } while (bigInt > 4200000000); + do { bigInt = obj.parent.crypto.randomBytes(4).readUInt32BE(0); } while (bigInt >= 4200000000); return bigInt % 100000000; } diff --git a/package.json b/package.json index 6a26399f..e3613df5 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "meshcentral", - "version": "0.2.7-j", + "version": "0.2.7-k", "keywords": [ "Remote Management", "Intel AMT", diff --git a/public/scripts/agent-desktop-0.0.2.js b/public/scripts/agent-desktop-0.0.2.js index 166393f3..7afd3730 100644 --- a/public/scripts/agent-desktop-0.0.2.js +++ b/public/scripts/agent-desktop-0.0.2.js @@ -70,6 +70,7 @@ var CreateAgentRemoteDesktop = function (canvasid, scrolldiv) { obj.xxStateChange = function (newstate) { if (obj.State == newstate) return; obj.State = newstate; + obj.CanvasId.style.cursor = 'default'; //console.log('xxStateChange', newstate); switch (newstate) { case 0: { diff --git a/public/scripts/amt-desktop-0.0.2.js b/public/scripts/amt-desktop-0.0.2.js index 00cd7b4a..e1f1c2df 100644 --- a/public/scripts/amt-desktop-0.0.2.js +++ b/public/scripts/amt-desktop-0.0.2.js @@ -68,9 +68,9 @@ var CreateAmtRemoteDesktop = function (divid, scrolldiv) { obj.canvas.fillRect(0, 0, obj.width, obj.height); obj.canvas.canvas.width = obj.rwidth = obj.width = 640; obj.canvas.canvas.height = obj.rheight = obj.height = 400; - QS(obj.canvasid).cursor = 'auto'; + QS(obj.canvasid).cursor = 'default'; } else { - if (!obj.showmouse) { QS(obj.canvasid).cursor = 'none'; } + QS(obj.canvasid).cursor = obj.showmouse ?'default':'none'; } } diff --git a/public/scripts/amt-redir-ws-0.1.0.js b/public/scripts/amt-redir-ws-0.1.0.js index 21dd8f05..a243d332 100644 --- a/public/scripts/amt-redir-ws-0.1.0.js +++ b/public/scripts/amt-redir-ws-0.1.0.js @@ -60,7 +60,7 @@ var CreateAmtRedirect = function (module, authCookie) { } obj.xxOnMessage = function (e) { - if (obj.debugmode == 1) { console.log('Recv', e.data); } + //if (obj.debugmode == 1) { console.log('Recv', e.data); } obj.inDataCount++; if (typeof e.data == 'object') { var f = new FileReader(); @@ -88,6 +88,7 @@ var CreateAmtRedirect = function (module, authCookie) { }; obj.xxOnSocketData = function (data) { + //if (obj.debugmode == 1) { console.log('Recv', data.length, rstr2hex(data)); } if (!data || obj.connectstate == -1) return; if (typeof data === 'object') { @@ -249,7 +250,7 @@ var CreateAmtRedirect = function (module, authCookie) { obj.xxSend = function (x) { //obj.Debug("Redir Send(" + x.length + "): " + rstr2hex(x)); if (obj.socket != null && obj.socket.readyState == WebSocket.OPEN) { - if (obj.debugmode == 1) { console.log('Send', x); } + //if (obj.debugmode == 1) { console.log('Send', x.length, rstr2hex(x)); } var b = new Uint8Array(x.length); for (var i = 0; i < x.length; ++i) { b[i] = x.charCodeAt(i); } obj.socket.send(b.buffer);