From cf54f6f34bf67043b3f2f16dc452689e7aa2aacd Mon Sep 17 00:00:00 2001 From: Ylian Saint-Hilaire Date: Mon, 15 Jun 2020 16:37:02 -0700 Subject: [PATCH] Code cleanup. --- agents/meshcmd.js | 6 +- agents/modules_meshcmd/amt.js | 2 +- agents/modules_meshcore/amt.js | 2 +- agents/modules_meshcore/wifi-scanner.js | 10 +- amt/amt.js | 2 +- public/commander.htm | 1429 ++++++++++++----------- public/scripts/amt-0.2.0-min.js | 2 +- public/scripts/amt-0.2.0.js | 2 +- public/scripts/amt-wsman-0.2.0-min.js | 2 +- public/styles/style.css | 1 - public/translator.htm | 20 +- swarmserver.js | 2 +- views/default-mobile.handlebars | 10 +- views/default.handlebars | 112 +- webserver.js | 2 +- 15 files changed, 802 insertions(+), 802 deletions(-) diff --git a/agents/meshcmd.js b/agents/meshcmd.js index c6117a2a..44c19fff 100644 --- a/agents/meshcmd.js +++ b/agents/meshcmd.js @@ -769,11 +769,11 @@ function run(argv) { 7 = Hibernate 8 = Power Off - Soft 9 = Power Cycle (Off Hard) - 10 = Master Bus Reset + 10 = Main Bus Reset 11 = Diagnostic Interrupt (NMI) 12 = Power Off - Soft Graceful 13 = Power Off - Hard Graceful - 14 = Master Bus Reset Graceful + 14 = Main Bus Reset Graceful 15 = Power Cycle (Off - Soft Graceful) 16 = Power Cycle (Off - Hard Graceful) */ @@ -2869,7 +2869,7 @@ function performAmtPowerActionEx(stack, name, response, status) { } } -var DMTFPowerStates = ['', '', "Power on", "Light sleep", "Deep sleep", "Power cycle (Soft off)", "Off - Hard", "Hibernate (Off soft)", "Soft off", "Power cycle (Off-hard)", "Master bus reset", "Diagnostic interrupt (NMI)", "Not applicable", "Off - Soft graceful", "Off - Hard graceful", "Master bus reset graceful", "Power cycle (Off - Soft graceful)", "Power cycle (Off - Hard graceful)", "Diagnostic interrupt (INIT)"]; +var DMTFPowerStates = ['', '', "Power on", "Light sleep", "Deep sleep", "Power cycle (Soft off)", "Off - Hard", "Hibernate (Off soft)", "Soft off", "Power cycle (Off-hard)", "Main bus reset", "Diagnostic interrupt (NMI)", "Not applicable", "Off - Soft graceful", "Off - Hard graceful", "Main bus reset graceful", "Power cycle (Off - Soft graceful)", "Power cycle (Off - Hard graceful)", "Diagnostic interrupt (INIT)"]; function performAmtPowerActionEx2(stack, name, response, status) { if (status == 200) { var powerNumber = parseInt(response.Body.PowerState); diff --git a/agents/modules_meshcmd/amt.js b/agents/modules_meshcmd/amt.js index c764f66d..80e991c0 100644 --- a/agents/modules_meshcmd/amt.js +++ b/agents/modules_meshcmd/amt.js @@ -613,7 +613,7 @@ function AmtStackCreateService(wsmanStack) { 1611: 'TLS Trusted Root Certificate Removed', 1612: 'TLS Preshared Key Set', 1613: 'Kerberos Settings Modified', - 1614: 'Kerberos Master Key Modified', + 1614: 'Kerberos Main Key Modified', 1615: 'Flash Wear out Counters Reset', 1616: 'Power Package Modified', 1617: 'Set Realm Authentication Mode', diff --git a/agents/modules_meshcore/amt.js b/agents/modules_meshcore/amt.js index c764f66d..80e991c0 100644 --- a/agents/modules_meshcore/amt.js +++ b/agents/modules_meshcore/amt.js @@ -613,7 +613,7 @@ function AmtStackCreateService(wsmanStack) { 1611: 'TLS Trusted Root Certificate Removed', 1612: 'TLS Preshared Key Set', 1613: 'Kerberos Settings Modified', - 1614: 'Kerberos Master Key Modified', + 1614: 'Kerberos Main Key Modified', 1615: 'Flash Wear out Counters Reset', 1616: 'Power Package Modified', 1617: 'Set Realm Authentication Mode', diff --git a/agents/modules_meshcore/wifi-scanner.js b/agents/modules_meshcore/wifi-scanner.js index 32da8677..30c5f133 100644 --- a/agents/modules_meshcore/wifi-scanner.js +++ b/agents/modules_meshcore/wifi-scanner.js @@ -50,12 +50,12 @@ function WiFiScanner() { if (process.platform == 'win32') { - this.master = require('ScriptContainer').Create(15, ContainerPermissions.DEFAULT); - this.master.parent = this; - this.master.on('data', function (j) { this.parent.emit('accessPoint', new AccessPoint(j.ssid, j.bssid, j.lq)); }); + this.main = require('ScriptContainer').Create(15, ContainerPermissions.DEFAULT); + this.main.parent = this; + this.main.on('data', function (j) { this.parent.emit('accessPoint', new AccessPoint(j.ssid, j.bssid, j.lq)); }); - this.master.addModule('wifi-scanner-windows', getJSModule('wifi-scanner-windows')); - this.master.ExecuteString(WindowsChildScript); + this.main.addModule('wifi-scanner-windows', getJSModule('wifi-scanner-windows')); + this.main.ExecuteString(WindowsChildScript); } else if (process.platform == 'linux') { diff --git a/amt/amt.js b/amt/amt.js index bf19a84d..24956db0 100644 --- a/amt/amt.js +++ b/amt/amt.js @@ -618,7 +618,7 @@ function AmtStackCreateService(wsmanStack) { 1611: 'TLS Trusted Root Certificate Removed', 1612: 'TLS Preshared Key Set', 1613: 'Kerberos Settings Modified', - 1614: 'Kerberos Master Key Modified', + 1614: 'Kerberos Main Key Modified', 1615: 'Flash Wear out Counters Reset', 1616: 'Power Package Modified', 1617: 'Set Realm Authentication Mode', diff --git a/public/commander.htm b/public/commander.htm index ae07d41a..4dc9dbec 100644 --- a/public/commander.htm +++ b/public/commander.htm @@ -1,4 +1,4 @@ -
  
Disconnected