external/MeshCentral
1
0
Fork 0
mirror of https://github.com/Ylianst/MeshCentral.git synced 2025-03-09 15:40:18 +00:00
Code Issues Releases Wiki Activity

1. Removed debug message from SMBIOS

Browse source 
2. Added workaround for LME/HECI behavior change between AMT/7 and AMT/11
This commit is contained in:
Bryan Roe 2021-11-11 15:45:14 -08:00
parent 04392905d1
commit 29fd370fc9
4 changed files with 56 additions and 454 deletions
Download patch file Download diff file Expand all files Collapse all files

26
agents/modules_meshcore/amt-lme.js
View file

@ -139,6 +139,7 @@ function lme_heci(options) {
this._LME.on('connect', function ()
{
this._connected = true;
this._emitConnected = false;
this.on('data', function (chunk) {
// this = HECI
var cmd = chunk.readUInt8(0);
@ -181,7 +182,8 @@ function lme_heci(options) {
}
if (this[name][port] == null)
{
try {
try
{
// Bind a new server socket if not already present
this[name][port] = require('net').createServer();
this[name][port].descriptorMetadata = 'amt-lme (port: ' + port + ')';
@ -196,8 +198,21 @@ function lme_heci(options) {
this.HECI.LMS.bindDuplexStream(socket, socket.remoteFamily, socket.localPort - lme_port_offset);
});
this._binded[port] = true;
if (!this._emitConnected)
{
this._emitConnected = true;
this.LMS.emit('error', 'APF/BIND error');
}
this.LMS.emit('bind', this._binded);
} catch (ex) { console.log(ex, 'Port ' + port); }
} catch (ex)
{
console.info1(ex, 'Port ' + port);
if(!this._emitConnected)
{
this._emitConnected = true;
this.LMS.emit('error', 'APF/BIND error');
}
}
}
var outBuffer = Buffer.alloc(5);
outBuffer.writeUInt8(81, 0);
@ -408,7 +423,12 @@ function lme_heci(options) {
break;
}
});
this.LMS.emit('connect');
//
// Due to a change in behavior with AMT/11 (and possibly earlier), we are not going to emit 'connect' here, until
// we can verify that the first APF/Channel can be bound. Older AMT, like AMT/7 only allowed a single LME connection, so we
// used to emit connect here. However, newer AMT's will allow more than 1 LME connection, which will result in APF/Bind failure
//
//this.LMS.emit('connect');
this.resume();
});

1
agents/modules_meshcore/smbios.js
View file

@ -101,7 +101,6 @@ function SMBiosTables()
}
catch (ee)
{
console.log('oops');
}
}
i += (ret[SMtype].peek()._strings.length == 0) ? 2 : 1;