From 3446ddc61110399c82b9e26119343280699458b6 Mon Sep 17 00:00:00 2001
From: Ylian Saint-Hilaire <ysainthilaire@hotmail.com>
Date: Mon, 18 Feb 2019 17:14:00 -0800
Subject: [PATCH] Added relay session count.

---
 meshrelay.js |  3 +++
 meshuser.js  | 10 +++++++++-
 webserver.js |  2 ++
 3 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/meshrelay.js b/meshrelay.js
index fcbf8f2c..2a4d8845 100644
--- a/meshrelay.js
+++ b/meshrelay.js
@@ -25,6 +25,7 @@ module.exports.CreateMeshRelay = function (parent, ws, req, domain, user, cookie
     obj.remoteaddr = obj.ws._socket.remoteAddress;
     obj.domain = domain;
     if (obj.remoteaddr.startsWith('::ffff:')) { obj.remoteaddr = obj.remoteaddr.substring(7); }
+    obj.parent.relaySessionCount++;
 
     // Mesh Rights
     const MESHRIGHT_EDITMESH = 1;
@@ -193,12 +194,14 @@ module.exports.CreateMeshRelay = function (parent, ws, req, domain, user, cookie
 
     // If error, close both sides of the relay.
     ws.on('error', function (err) {
+        obj.parent.relaySessionErrorCount++;
         console.log('Relay error from ' + obj.remoteaddr + ', ' + err.toString().split('\r')[0] + '.');
         closeBothSides();
     });
 
     // If the relay web socket is closed, close both sides.
     ws.on('close', function (req) {
+        obj.parent.relaySessionCount--;
         closeBothSides();
     });
 
diff --git a/meshuser.js b/meshuser.js
index 3a487163..204ab0b4 100644
--- a/meshuser.js
+++ b/meshuser.js
@@ -181,7 +181,15 @@ module.exports.CreateMeshUser = function (parent, db, ws, req, args, domain, use
                 var os = require('os');
                 var stats = { action: 'serverstats', totalmem: os.totalmem(), freemem: os.freemem() };
                 if (obj.parent.parent.platform != 'win32') { stats.cpuavg = os.loadavg(); } // else { stats.cpuavg = [ 0.2435345, 0.523234234, 0.6435345345 ]; }
-                var serverStats = { "User Accounts": Object.keys(obj.parent.users).length, "Device Groups": Object.keys(obj.parent.meshes).length, "Agent Sessions": Object.keys(obj.parent.wsagents).length, "Connected Users": Object.keys(obj.parent.wssessions).length, "Users Sessions": Object.keys(obj.parent.wssessions2).length };
+                var serverStats = {
+                    "User Accounts": Object.keys(obj.parent.users).length,
+                    "Device Groups": Object.keys(obj.parent.meshes).length,
+                    "Agent Sessions": Object.keys(obj.parent.wsagents).length,
+                    "Connected Users": Object.keys(obj.parent.wssessions).length,
+                    "Users Sessions": Object.keys(obj.parent.wssessions2).length,
+                    "Relay Sessions": obj.parent.relaySessionCount,
+                    "Relay Errors": obj.parent.relaySessionErrorCount
+                };
                 if (obj.parent.parent.mpsserver != null) { serverStats['Connected Intel&reg; AMT'] = Object.keys(obj.parent.parent.mpsserver.ciraConnections).length; }
                 stats.values = { "Server State": serverStats }
                 try { ws.send(JSON.stringify(stats)); } catch (ex) { }
diff --git a/webserver.js b/webserver.js
index 24118953..f91bec76 100644
--- a/webserver.js
+++ b/webserver.js
@@ -78,6 +78,8 @@ module.exports.CreateWebServer = function (parent, db, args, certificates) {
     obj.agentBlockedIp = args.agentblockedip;  // List of blocked IP addresses for agents
     obj.tlsSniCredentials = null;
     obj.dnsDomains = {};
+    obj.relaySessionCount = 0;
+    obj.relaySessionErrorCount = 0;
 
     // Mesh Rights
     const MESHRIGHT_EDITMESH = 1;