@@ -4816,6 +4819,7 @@
desktopNode = desktop = null;
QV('DeskFocus', false);
QV('termdisplays', false);
+ QV('deskRecordIcon', false);
deskFocusBtn.value = 'All Focus';
if (fullscreen == true) { deskToggleFull(); }
webRtcDesktopReset();
@@ -4823,6 +4827,9 @@
break;
case 2:
break;
+ case 3:
+ if (desktop.serverIsRecording == true) { QV('deskRecordIcon', true); }
+ break;
default:
//console.log('Unknown onDesktopStateChange state', state);
break;
@@ -5380,12 +5387,14 @@
// Disconnected, clear the terminal
QE('termSizeList', true);
QH('termtitle', '');
+ QV('termRecordIcon', false);
xterminal.m.TermResetScreen();
xterminal.m.TermDraw();
if (terminal != null) { terminal.Stop(); terminal = null; }
break;
case 3:
QE('termSizeList', false);
+ if (xterminal.serverIsRecording == true) { QV('termRecordIcon', true); }
break;
default:
QE('termSizeList', false);
@@ -5531,12 +5540,14 @@
p13filetreelocation = [];
QH('p13currentpath', '');
QE('p13FolderUp', false);
+ QV('filesRecordIcon', false);
p13setActions();
if (files != null) { files.Stop(); files = null; }
break;
case 3:
p13targetpath = '';
files.sendText({ action: 'ls', reqid: 1, path: '' });
+ if (files.serverIsRecording == true) { QV('filesRecordIcon', true); }
break;
default:
//console.log('Unknown onFilesStateChange state', state);
diff --git a/views/messenger-min.handlebars b/views/messenger-min.handlebars
index d9fc54dc..e0ea5675 100644
--- a/views/messenger-min.handlebars
+++ b/views/messenger-min.handlebars
@@ -1 +1 @@
-
MeshMessenger
\ No newline at end of file
+
MeshMessenger
\ No newline at end of file
diff --git a/views/messenger.handlebars b/views/messenger.handlebars
index f0adcc0d..0ea4f482 100644
--- a/views/messenger.handlebars
+++ b/views/messenger.handlebars
@@ -579,7 +579,7 @@
socket.onerror = function (e) { /*console.error(e);*/ }
socket.onclose = function () { disconnect(); }
socket.onmessage = function (msg) {
- if ((state < 2) && (typeof msg.data == 'string') && (msg.data == 'c')) {
+ if ((state < 2) && (typeof msg.data == 'string') && ((msg.data == 'c') || (msg.data == 'cr'))) {
hangUpButtonClick(0, true);
hangUpButtonClick(1, true);
hangUpButtonClick(2, true);
diff --git a/webserver.js b/webserver.js
index b03eaab8..afc0c8b8 100644
--- a/webserver.js
+++ b/webserver.js
@@ -1978,6 +1978,7 @@ module.exports.CreateWebServer = function (parent, db, args, certificates) {
var firstBlock = JSON.stringify({ magic: 'MeshCentralRelaySession', ver: 1, userid: user._id, username: user.name, ipaddr: cleanRemoteAddr(ws._socket.remoteAddress), nodeid: node._id, intelamt: true, protocol: (req.query.p == 2) ? 101 : 100, time: new Date().toLocaleString() })
recordingEntry(fd, 1, 0, firstBlock, function () { });
ws.logfile = { fd: fd, lock: false };
+ if (req.query.p == 2) { ws.send(Buffer.from(String.fromCharCode(0xF0), 'binary')); } // Intel AMT Redirection: Indicate the session is being recorded
}
}
@@ -2073,7 +2074,12 @@ module.exports.CreateWebServer = function (parent, db, args, certificates) {
if (ws.forwardclient && ws.forwardclient.close) { ws.forwardclient.close(); } // TODO: If TLS is used, we need to close the socket that is wrapped by TLS
// Close the recording file
- if (ws.logfile != null) { obj.fs.close(ws.logfile.fd); ws.logfile = null; }
+ if (ws.logfile != null) {
+ recordingEntry(ws.logfile.fd, 3, 0, 'MeshCentralMCREC', function (fd, ws) {
+ obj.fs.close(fd);
+ ws.logfile = null;
+ }, ws);
+ }
});
// If the web socket is closed, close the associated TCP connection.
@@ -2082,7 +2088,12 @@ module.exports.CreateWebServer = function (parent, db, args, certificates) {
if (ws.forwardclient && ws.forwardclient.close) { ws.forwardclient.close(); } // TODO: If TLS is used, we need to close the socket that is wrapped by TLS
// Close the recording file
- if (ws.logfile != null) { obj.fs.close(ws.logfile.fd); ws.logfile = null; }
+ if (ws.logfile != null) {
+ recordingEntry(ws.logfile.fd, 3, 0, 'MeshCentralMCREC', function (fd, ws) {
+ obj.fs.close(fd);
+ ws.logfile = null;
+ }, ws);
+ }
});
ws.forwardclient.onStateChange = function (ciraconn, state) {
@@ -2156,7 +2167,12 @@ module.exports.CreateWebServer = function (parent, db, args, certificates) {
if (ws.forwardclient) { try { ws.forwardclient.destroy(); } catch (e) { } }
// Close the recording file
- if (ws.logfile != null) { obj.fs.close(ws.logfile.fd); ws.logfile = null; }
+ if (ws.logfile != null) {
+ recordingEntry(ws.logfile.fd, 3, 0, 'MeshCentralMCREC', function (fd) {
+ obj.fs.close(fd);
+ ws.logfile = null;
+ });
+ }
});
// If the web socket is closed, close the associated TCP connection.
@@ -2165,7 +2181,12 @@ module.exports.CreateWebServer = function (parent, db, args, certificates) {
if (ws.forwardclient) { try { ws.forwardclient.destroy(); } catch (e) { } }
// Close the recording file
- if (ws.logfile != null) { obj.fs.close(ws.logfile.fd); ws.logfile = null; }
+ if (ws.logfile != null) {
+ recordingEntry(ws.logfile.fd, 3, 0, 'MeshCentralMCREC', function (fd) {
+ obj.fs.close(fd);
+ ws.logfile = null;
+ });
+ }
});
// Compute target port
@@ -3467,7 +3488,7 @@ module.exports.CreateWebServer = function (parent, db, args, certificates) {
function cleanRemoteAddr(addr) { if (addr.startsWith('::ffff:')) { return addr.substring(7); } else { return addr; } }
// Record a new entry in a recording log
- function recordingEntry(fd, type, flags, data, func) {
+ function recordingEntry(fd, type, flags, data, func, tag) {
try {
if (typeof data == 'string') {
// String write
@@ -3477,7 +3498,7 @@ module.exports.CreateWebServer = function (parent, db, args, certificates) {
header.writeInt32BE(blockData.length, 4); // Size
header.writeIntBE(new Date(), 10, 6); // Time
var block = Buffer.concat([header, blockData]);
- obj.fs.write(fd, block, 0, block.length, func);
+ obj.fs.write(fd, block, 0, block.length, function () { func(fd, tag); });
} else {
// Binary write
var header = Buffer.alloc(16); // Header: Type (2) + Flags (2) + Size(4) + Time(8)
@@ -3486,9 +3507,9 @@ module.exports.CreateWebServer = function (parent, db, args, certificates) {
header.writeInt32BE(data.length, 4); // Size
header.writeIntBE(new Date(), 10, 6); // Time
var block = Buffer.concat([header, data]);
- obj.fs.write(fd, block, 0, block.length, func);
+ obj.fs.write(fd, block, 0, block.length, function () { func(fd, tag); });
}
- } catch (ex) { console.log(ex); func(); }
+ } catch (ex) { console.log(ex); func(fd, tag); }
}
return obj;
New