MeshCentral/MeshAgent
1
0
Fork 0
mirror of https://github.com/Ylianst/MeshAgent synced 2025-12-21 10:43:36 +00:00
Code Issues Releases Wiki Activity

1. Added info logging to heci onconnect

Browse Source 
2. Updated amt-mei to use a singleton for PTHI
This commit is contained in:
Bryan Roe
2021-07-14 09:38:17 -07:00
parent 1f5022ed16
commit e861afc5a6
2 changed files with 94 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files

72
modules/amt-mei.js
View File

@@ -15,7 +15,10 @@ limitations under the License.
*/ */
var Q = require('queue'); var Q = require('queue');
function amt_heci() { var g_internal = null;
function amt_heci()
{
var emitterUtils = require('events').inherits(this); var emitterUtils = require('events').inherits(this);
emitterUtils.createEvent('error'); emitterUtils.createEvent('error');
@@ -23,23 +26,31 @@ function amt_heci() {
var sendConsole = function (msg) { try { require('MeshAgent').SendCommand({ "action": "msg", "type": "console", "value": msg }); } catch (ex) { } } var sendConsole = function (msg) { try { require('MeshAgent').SendCommand({ "action": "msg", "type": "console", "value": msg }); } catch (ex) { } }
this._ObjectID = "pthi"; this._ObjectID = "pthi";
this._rq = new Q(); var that = this;
this._setupPTHI = function _setupPTHI() if (g_internal == null)
{ {
g_internal = { _rq: new Q(), _amt: null };
g_internal._setupPTHI = function _g_setupPTHI()
{
console.info1('setupPTHI()');
this._amt = heci.create(); this._amt = heci.create();
this._amt.descriptorMetadata = "amt-pthi"; this._amt.descriptorMetadata = "amt-pthi";
this._amt.BiosVersionLen = 65; this._amt.BiosVersionLen = 65;
this._amt.UnicodeStringLen = 20; this._amt.UnicodeStringLen = 20;
this._amt.Parent = that;
this._amt.Parent = this;
this._amt.on('error', function _amtOnError(e) this._amt.on('error', function _amtOnError(e)
{ {
if(this.Parent._rq.isEmpty()) console.info1('PTHIError: ' + e);
if (this.Parent._rq.isEmpty())
{ {
console.info1(' Queue is empty');
this.Parent.emit('error', e); // No pending requests, so propagate the error up this.Parent.emit('error', e); // No pending requests, so propagate the error up
} }
else else
{ {
console.info1(' Queue is NOT empty');
// There is a pending request, so fail the pending request // There is a pending request, so fail the pending request
var user = this.Parent._rq.deQueue(); var user = this.Parent._rq.deQueue();
var params = user.optional; var params = user.optional;
@@ -47,7 +58,7 @@ function amt_heci() {
params.unshift({ Status: -1 }); // Relay an error params.unshift({ Status: -1 }); // Relay an error
callback.apply(this.Parent, params); callback.apply(this.Parent, params);
if(!this.Parent._rq.isEmpty()) if (!this.Parent._rq.isEmpty())
{ {
// There are still more pending requests, so try to re-helpconnect MEI // There are still more pending requests, so try to re-helpconnect MEI
this.connect(heci.GUIDS.AMT, { noPipeline: 1 }); this.connect(heci.GUIDS.AMT, { noPipeline: 1 });
@@ -60,32 +71,41 @@ function amt_heci() {
{ {
//console.log("Received: " + chunk.length + " bytes"); //console.log("Received: " + chunk.length + " bytes");
var header = this.Parent.getCommand(chunk); var header = this.Parent.getCommand(chunk);
//console.log("CMD = " + header.Command + " (Status: " + header.Status + ") Response = " + header.IsResponse); console.info1("CMD = " + header.Command + " (Status: " + header.Status + ") Response = " + header.IsResponse);
var user = this.Parent._rq.deQueue(); var user = g_internal._rq.deQueue();
var params = user.optional; var params = user.optional;
var callback = user.func; var callback = user.func;
params.unshift(header); params.unshift(header);
callback.apply(this.Parent, params); callback.apply(this.Parent, params);
if(this.Parent._rq.isEmpty()) if (g_internal._rq.isEmpty())
{ {
console.info1('No more requests, disconnecting');
// No More Requests, we can close PTHI // No More Requests, we can close PTHI
this.Parent._amt.disconnect(); g_internal._amt.disconnect();
this.Parent._amt = null; g_internal._amt = null;
} }
else else
{ {
// Send the next request // Send the next request
this.write(this.Parent._rq.peekQueue().send); console.info1('Sending Next Request');
this.write(g_internal._rq.peekQueue().send);
} }
}); });
// Start sending requests // Start sending requests
this.write(this.Parent._rq.peekQueue().send); this.write(g_internal._rq.peekQueue().send);
}); });
}; };
}
function trim(x) { var y = x.indexOf('\0'); if (y >= 0) { return x.substring(0, y); } else { return x; } } function trim(x) { var y = x.indexOf('\0'); if (y >= 0) { return x.substring(0, y); } else { return x; } }
this.getCommand = function getCommand(chunk) { this.getCommand = function getCommand(chunk) {
var command = chunk.length == 0 ? (this._rq.peekQueue().cmd | 0x800000) : chunk.readUInt32LE(4); var command = chunk.length == 0 ? (this._rq.peekQueue().cmd | 0x800000) : chunk.readUInt32LE(4);
@@ -99,15 +119,24 @@ function amt_heci() {
var args = []; var args = [];
for (var i = 3; i < arguments.length; ++i) { args.push(arguments[i]); } for (var i = 3; i < arguments.length; ++i) { args.push(arguments[i]); }
console.info1('sendCommand(' + arguments[0] + ')', this._hashCode());
var header = Buffer.from('010100000000000000000000', 'hex'); var header = Buffer.from('010100000000000000000000', 'hex');
header.writeUInt32LE(arguments[0] | 0x04000000, 4); header.writeUInt32LE(arguments[0] | 0x04000000, 4);
header.writeUInt32LE(arguments[1] == null ? 0 : arguments[1].length, 8); header.writeUInt32LE(arguments[1] == null ? 0 : arguments[1].length, 8);
this._rq.enQueue({ cmd: arguments[0], func: arguments[2], optional: args , send: (arguments[1] == null ? header : Buffer.concat([header, arguments[1]]))});
if(!this._amt) //this._rq.enQueue({ cmd: arguments[0], func: arguments[2], optional: args, send: (arguments[1] == null ? header : Buffer.concat([header, arguments[1]])) });
//if(!this._amt)
//{
// this._setupPTHI();
// this._amt.connect(heci.GUIDS.AMT, { noPipeline: 1 });
//}
g_internal._rq.enQueue({ cmd: arguments[0], func: arguments[2], optional: args, send: (arguments[1] == null ? header : Buffer.concat([header, arguments[1]])) });
if (!g_internal._amt)
{ {
this._setupPTHI(); g_internal._setupPTHI();
this._amt.connect(heci.GUIDS.AMT, { noPipeline: 1 }); g_internal._amt.connect(heci.GUIDS.AMT, { noPipeline: 1 });
} }
} }
@@ -116,10 +145,11 @@ function amt_heci() {
for (var i = 1; i < arguments.length; ++i) { optional.push(arguments[i]); } for (var i = 1; i < arguments.length; ++i) { optional.push(arguments[i]); }
this.sendCommand(26, null, function (header, fn, opt) { this.sendCommand(26, null, function (header, fn, opt) {
if (header.Status == 0) { if (header.Status == 0) {
var i, CodeVersion = header.Data, val = { BiosVersion: CodeVersion.slice(0, this._amt.BiosVersionLen).toString(), Versions: [] }, v = CodeVersion.slice(this._amt.BiosVersionLen + 4); var i, CodeVersion = header.Data, val = { BiosVersion: CodeVersion.slice(0, g_internal._amt.BiosVersionLen).toString(), Versions: [] }, v = CodeVersion.slice(g_internal._amt.BiosVersionLen + 4);
for (i = 0; i < CodeVersion.readUInt32LE(this._amt.BiosVersionLen) ; ++i) { for (i = 0; i < CodeVersion.readUInt32LE(g_internal._amt.BiosVersionLen) ; ++i)
val.Versions[i] = { Description: v.slice(2, v.readUInt16LE(0) + 2).toString(), Version: v.slice(4 + this._amt.UnicodeStringLen, 4 + this._amt.UnicodeStringLen + v.readUInt16LE(2 + this._amt.UnicodeStringLen)).toString() }; {
v = v.slice(4 + (2 * this._amt.UnicodeStringLen)); val.Versions[i] = { Description: v.slice(2, v.readUInt16LE(0) + 2).toString(), Version: v.slice(4 + g_internal._amt.UnicodeStringLen, 4 + g_internal._amt.UnicodeStringLen + v.readUInt16LE(2 + g_internal._amt.UnicodeStringLen)).toString() };
v = v.slice(4 + (2 * g_internal._amt.UnicodeStringLen));
} }
if (val.BiosVersion.indexOf('\0') > 0) { val.BiosVersion = val.BiosVersion.substring(0, val.BiosVersion.indexOf('\0')); } if (val.BiosVersion.indexOf('\0') > 0) { val.BiosVersion = val.BiosVersion.substring(0, val.BiosVersion.indexOf('\0')); }
opt.unshift(val); opt.unshift(val);

3
modules/heci.js
View File

@@ -175,9 +175,10 @@ function heci_create()
.createEvent('error') .createEvent('error')
.addMethod('connect', function _connect(guid, options) .addMethod('connect', function _connect(guid, options)
{ {
console.info1('connect()'); console.info1('connect(' + guid + ')');
this.doIoctl(this.heciParent.IOCTL.CLIENT_CONNECT, guid, Buffer.alloc(16), function _onconnect(status, buffer, opt) this.doIoctl(this.heciParent.IOCTL.CLIENT_CONNECT, guid, Buffer.alloc(16), function _onconnect(status, buffer, opt)
{ {
console.info1('doIoctl(): onConnect => ' + status);
if(status!=0) if(status!=0)
{ {
console.info1('HECI Connection Error [' + this.LastError + ']'); console.info1('HECI Connection Error [' + this.LastError + ']');