MyFavMirrors/MeshCentral
1
0
Fork 0
mirror of https://github.com/Ylianst/MeshCentral.git synced 2025-04-21 19:14:26 -04:00
Code Issues Packages Projects Releases Wiki Activity

Added traffic accounting to desktop multiplexor

Browse Source
This commit is contained in:
Ylian Saint-Hilaire 2021-05-05 13:17:58 -07:00
parent f61ab701a5
commit a25ce3c0db
2 changed files with 22 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
meshagent.js
View File

@ -43,14 +43,10 @@ module.exports.CreateMeshAgent = function (parent, db, ws, req, args, domain) {
// Perform data accounting // Perform data accounting
function dataAccounting() { function dataAccounting() {
const datain = (ws._socket.bytesRead - ws._socket.bytesReadEx); parent.trafficStats.AgentCtrlIn += (ws._socket.bytesRead - ws._socket.bytesReadEx);
const dataout = (ws._socket.bytesWritten - ws._socket.bytesWrittenEx); parent.trafficStats.AgentCtrlOut += (ws._socket.bytesWritten - ws._socket.bytesWrittenEx);
ws._socket.bytesReadEx = ws._socket.bytesRead; ws._socket.bytesReadEx = ws._socket.bytesRead;
ws._socket.bytesWrittenEx = ws._socket.bytesWritten; ws._socket.bytesWrittenEx = ws._socket.bytesWritten;
// Add to counters
parent.trafficStats.AgentCtrlIn += datain;
parent.trafficStats.AgentCtrlOut += dataout;
} }
// Send a message to the mesh agent // Send a message to the mesh agent

20
meshdesktopmultiplex.js
View File

@ -91,6 +91,9 @@ function CreateDesktopMultiplexor(parent, domain, nodeid, func) {
obj.startTime = null; // Starting time of the multiplex session. obj.startTime = null; // Starting time of the multiplex session.
obj.userIds = []; // List of userid's that have intertracted with this session. obj.userIds = []; // List of userid's that have intertracted with this session.
// Accounting
parent.trafficStats.desktopMultiplex.sessions++;
// Add an agent or viewer // Add an agent or viewer
obj.addPeer = function (peer) { obj.addPeer = function (peer) {
if (obj.viewers == null) { parent.parent.debug('relay', 'DesktopRelay: Error, addingPeer on disposed session'); return; } if (obj.viewers == null) { parent.parent.debug('relay', 'DesktopRelay: Error, addingPeer on disposed session'); return; }
@ -877,6 +880,11 @@ function CreateMeshRelayEx2(parent, ws, req, domain, user, cookie) {
obj.req = req; // Used in multi-server.js obj.req = req; // Used in multi-server.js
obj.viewOnly = ((cookie != null) && (cookie.vo == 1)); // set view only mode obj.viewOnly = ((cookie != null) && (cookie.vo == 1)); // set view only mode
// Setup traffic accounting
if (parent.trafficStats.desktopMultiplex == null) { parent.trafficStats.desktopMultiplex = { connections: 1, sessions: 0, in: 0, out: 0 }; } else { parent.trafficStats.desktopMultiplex.connections++; }
ws._socket.bytesReadEx = 0;
ws._socket.bytesWrittenEx = 0;
// Setup subscription for desktop sharing public identifier // Setup subscription for desktop sharing public identifier
// If the identifier is removed, drop the connection // If the identifier is removed, drop the connection
if ((cookie != null) && (typeof cookie.pid == 'string')) { if ((cookie != null) && (typeof cookie.pid == 'string')) {
@ -1067,6 +1075,12 @@ function CreateMeshRelayEx2(parent, ws, req, domain, user, cookie) {
// When data is received from the mesh relay web socket // When data is received from the mesh relay web socket
ws.on('message', function (data) { ws.on('message', function (data) {
// Data accounting
parent.trafficStats.desktopMultiplex.in += (this._socket.bytesRead - this._socket.bytesReadEx);
parent.trafficStats.desktopMultiplex.out += (this._socket.bytesWritten - this._socket.bytesWrittenEx);
this._socket.bytesReadEx = this._socket.bytesRead;
this._socket.bytesWrittenEx = this._socket.bytesWritten;
// If this data was received by the agent, decode it. // If this data was received by the agent, decode it.
if (this.me.deskMultiplexor != null) { this.me.deskMultiplexor.processData(this.me, data); } if (this.me.deskMultiplexor != null) { this.me.deskMultiplexor.processData(this.me, data); }
}); });
@ -1081,6 +1095,12 @@ function CreateMeshRelayEx2(parent, ws, req, domain, user, cookie) {
// If the relay web socket is closed, close both sides. // If the relay web socket is closed, close both sides.
ws.on('close', function (req) { ws.on('close', function (req) {
// Data accounting
parent.trafficStats.desktopMultiplex.in += (this._socket.bytesRead - this._socket.bytesReadEx);
parent.trafficStats.desktopMultiplex.out += (this._socket.bytesWritten - this._socket.bytesWrittenEx);
this._socket.bytesReadEx = this._socket.bytesRead;
this._socket.bytesWrittenEx = this._socket.bytesWritten;
//console.log('ws-close', req); //console.log('ws-close', req);
obj.close(); obj.close();
}); });