Ylianst/MeshCentral
1
0
Fork 0
mirror of https://github.com/Ylianst/MeshCentral.git synced 2024-11-22 22:17:31 +03:00
Code Issues Packages Projects Releases Wiki Activity

Intel AMT manager fixes.

Browse Source
This commit is contained in:
Ylian Saint-Hilaire 2021-01-07 00:11:02 -08:00
parent da1af63e2f
commit 96545c6c5d
2 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
amt/amt-wsman-comm.js
View File

@ -249,7 +249,7 @@ var CreateWsmanComm = function (host, port, user, pass, tls, tlsoptions, mpsConn
obj.socket = obj.tls.connect(obj.port, obj.host, options, obj.xxOnSocketConnected); obj.socket = obj.tls.connect(obj.port, obj.host, options, obj.xxOnSocketConnected);
obj.socket.setEncoding('binary'); obj.socket.setEncoding('binary');
obj.socket.setTimeout(6000); // Set socket idle timeout obj.socket.setTimeout(60000); // Set socket idle timeout
obj.socket.on('error', function (ex) { obj.xtlsMethod = 1 - obj.xtlsMethod; }); obj.socket.on('error', function (ex) { obj.xtlsMethod = 1 - obj.xtlsMethod; });
obj.socket.on('close', obj.xxOnSocketClosed); obj.socket.on('close', obj.xxOnSocketClosed);
obj.socket.on('timeout', obj.xxOnSocketTimeout); obj.socket.on('timeout', obj.xxOnSocketTimeout);
@ -269,7 +269,7 @@ var CreateWsmanComm = function (host, port, user, pass, tls, tlsoptions, mpsConn
// Direct connect without TLS // Direct connect without TLS
obj.socket = new obj.net.Socket(); obj.socket = new obj.net.Socket();
obj.socket.setEncoding('binary'); obj.socket.setEncoding('binary');
obj.socket.setTimeout(6000); // Set socket idle timeout obj.socket.setTimeout(60000); // Set socket idle timeout
obj.socket.on('data', obj.xxOnSocketData); obj.socket.on('data', obj.xxOnSocketData);
obj.socket.on('close', obj.xxOnSocketClosed); obj.socket.on('close', obj.xxOnSocketClosed);
obj.socket.on('timeout', obj.xxOnSocketTimeout); obj.socket.on('timeout', obj.xxOnSocketTimeout);
@ -286,7 +286,7 @@ var CreateWsmanComm = function (host, port, user, pass, tls, tlsoptions, mpsConn
} }
obj.socket = obj.tls.connect(obj.port, obj.host, options, obj.xxOnSocketConnected); obj.socket = obj.tls.connect(obj.port, obj.host, options, obj.xxOnSocketConnected);
obj.socket.setEncoding('binary'); obj.socket.setEncoding('binary');
obj.socket.setTimeout(6000); // Set socket idle timeout obj.socket.setTimeout(60000); // Set socket idle timeout
obj.socket.on('data', obj.xxOnSocketData); obj.socket.on('data', obj.xxOnSocketData);
obj.socket.on('close', obj.xxOnSocketClosed); obj.socket.on('close', obj.xxOnSocketClosed);
obj.socket.on('timeout', obj.xxOnSocketTimeout); obj.socket.on('timeout', obj.xxOnSocketTimeout);

11
amtmanager.js
View File

@ -115,6 +115,8 @@ module.exports.CreateAmtManager = function (parent) {
// Remove an Intel AMT managed device // Remove an Intel AMT managed device
function removeAmtDevice(dev) { function removeAmtDevice(dev) {
parent.debug('amt', "Remove device", dev.nodeid, dev.connType);
// Find the device in the list // Find the device in the list
var devices = obj.amtDevices[dev.nodeid]; var devices = obj.amtDevices[dev.nodeid];
if (devices == null) return false; if (devices == null) return false;
@ -133,12 +135,14 @@ module.exports.CreateAmtManager = function (parent) {
if (devices.length == 0) { delete obj.amtDevices[dev.nodeid]; } else { obj.amtDevices[dev.nodeid] = devices; } if (devices.length == 0) { delete obj.amtDevices[dev.nodeid]; } else { obj.amtDevices[dev.nodeid] = devices; }
// Notify connection closure if this is a LMS connection // Notify connection closure if this is a LMS connection
if (dev.connType == 2) { dev.controlMsg({ action: "close" }); } if (dev.connType == 2) { dev.controlMsg({ action: 'close' }); }
return true; return true;
} }
// Remove all Intel AMT devices for a given nodeid // Remove all Intel AMT devices for a given nodeid
function removeDevice(nodeid) { function removeDevice(nodeid) {
parent.debug('amt', "Remove nodeid", nodeid);
// Find the devices in the list // Find the devices in the list
var devices = obj.amtDevices[nodeid]; var devices = obj.amtDevices[nodeid];
if (devices == null) return false; if (devices == null) return false;
@ -152,9 +156,12 @@ module.exports.CreateAmtManager = function (parent) {
// Clean up this device // Clean up this device
if (dev.amtstack != null) { dev.amtstack.wsman.comm.FailAllError = 999; delete dev.amtstack; } // Disconnect any active connections. if (dev.amtstack != null) { dev.amtstack.wsman.comm.FailAllError = 999; delete dev.amtstack; } // Disconnect any active connections.
if (dev.polltimer != null) { clearInterval(dev.polltimer); delete dev.polltimer; } if (dev.polltimer != null) { clearInterval(dev.polltimer); delete dev.polltimer; }
// Notify connection closure if this is a LMS connection
if (dev.connType == 2) { dev.controlMsg({ action: 'close' }); }
} }
// Remove all devices // Remove all Intel AMT management sessions for this nodeid
delete obj.amtDevices[nodeid]; delete obj.amtDevices[nodeid];
return true; return true;
} }