Updated all MeshAgents.
Ylian Saint-Hilaire committed
Apr 8, 2020 at 16:21 UTC
6c7e0f934b7a5f77a6ac499c9b1528a451c544ad
22 files changed
+27
-29
agents/MeshCmd-signed.exe
Binary files a/agents/MeshCmd-signed.exe and b/agents/MeshCmd-signed.exe differ
agents/MeshCmd64-signed.exe
Binary files a/agents/MeshCmd64-signed.exe and b/agents/MeshCmd64-signed.exe differ
agents/MeshService-signed.exe
Binary files a/agents/MeshService-signed.exe and b/agents/MeshService-signed.exe differ
agents/MeshService.exe
Binary files a/agents/MeshService.exe and b/agents/MeshService.exe differ
agents/MeshService64-signed.exe
Binary files a/agents/MeshService64-signed.exe and b/agents/MeshService64-signed.exe differ
agents/MeshService64.exe
Binary files a/agents/MeshService64.exe and b/agents/MeshService64.exe differ
agents/meshagent_arm
Binary files a/agents/meshagent_arm and b/agents/meshagent_arm differ
agents/meshagent_arm-linaro
Binary files a/agents/meshagent_arm-linaro and b/agents/meshagent_arm-linaro differ
agents/meshagent_arm64
Binary files a/agents/meshagent_arm64 and b/agents/meshagent_arm64 differ
agents/meshagent_armhf
Binary files a/agents/meshagent_armhf and b/agents/meshagent_armhf differ
agents/meshagent_freebsd_x86-64
Binary files a/agents/meshagent_freebsd_x86-64 and b/agents/meshagent_freebsd_x86-64 differ
agents/meshagent_mips
Binary files a/agents/meshagent_mips and b/agents/meshagent_mips differ
agents/meshagent_osx-x86-64
Binary files a/agents/meshagent_osx-x86-64 and b/agents/meshagent_osx-x86-64 differ
agents/meshagent_pogo
Binary files a/agents/meshagent_pogo and b/agents/meshagent_pogo differ
agents/meshagent_poky
Binary files a/agents/meshagent_poky and b/agents/meshagent_poky differ
agents/meshagent_poky64
Binary files a/agents/meshagent_poky64 and b/agents/meshagent_poky64 differ
agents/meshagent_x86
Binary files a/agents/meshagent_x86 and b/agents/meshagent_x86 differ
agents/meshagent_x86-64
Binary files a/agents/meshagent_x86-64 and b/agents/meshagent_x86-64 differ
agents/meshagent_x86-64_nokvm
Binary files a/agents/meshagent_x86-64_nokvm and b/agents/meshagent_x86-64_nokvm differ
agents/meshagent_x86_nokvm
Binary files a/agents/meshagent_x86_nokvm and b/agents/meshagent_x86_nokvm differ
amt/amt-wsman-comm.js
+26
-28
@@ -167,7 +167,32 @@ var CreateWsmanComm = function (host, port, user, pass, tls, tlsoptions, parent,
167
obj.socketState = 1;
168
obj.kerberosDone = 0;
169
170
- if (obj.mode==1 ) { //Direct
170
+ if ((obj.parent != null) && (obj.mode === 2) || (obj.mode === 3)) { // CIRA and APF
171
+ if (obj.mode == 2) { // CIRA
172
+ var ciraconn = obj.parent.mpsserver.ciraConnections[obj.host];
173
+ obj.socket = obj.parent.mpsserver.SetupCiraChannel(ciraconn, obj.port);
174
+ } else { // APF
175
+ var apfconn = obj.parent.apfserver.apfConnections[obj.host];
176
+ obj.socket = obj.parent.apfserver.SetupCiraChannel(apfconn, obj.port);
177
+ }
178
+ obj.socket.onData = function (ccon, data) { obj.xxOnSocketData(data); }
179
+ obj.socket.onStateChange = function (ccon, state) {
180
+ if (state == 0) {
181
+ try {
182
+ obj.socketParseState = 0;
183
+ obj.socketAccumulator = '';
184
+ obj.socketHeader = null;
185
+ obj.socketData = '';
186
+ obj.socketState = 0;
187
+ obj.xxOnSocketClosed();
188
+ } catch (e) { }
189
+ } else if (state == 2) {
190
+ // channel open success
191
+ obj.xxOnSocketConnected();
192
+ }
193
+ }
194
+ } else {
195
+ // Direct connection
196
if (obj.xtls != 1) {
197
// Connect without TLS
198
obj.socket = new obj.net.Socket();
@@ -196,33 +221,6 @@ var CreateWsmanComm = function (host, port, user, pass, tls, tlsoptions, parent,
221
obj.socket.on('error', function (e) { if (e.message && e.message.indexOf('sslv3 alert bad record mac') >= 0) { obj.xtlsMethod = 1 - obj.xtlsMethod; } });
222
}
223
obj.socket.setNoDelay(true); // Disable nagle. We will encode each WSMAN request as a single send block and want to send it at once. This may help Intel AMT handle pipelining?
199
- } else if (obj.mode==2 || obj.mode==3) { // CIRA and APF
200
- if (obj.mode==2) { // CIRA
201
- var ciraconn = obj.parent.mpsserver.ciraConnections[obj.host];
202
- obj.socket = obj.parent.mpsserver.SetupCiraChannel(ciraconn, obj.port);
203
- } else { //APF
204
- var apfconn = obj.parent.apfserver.apfConnections[obj.host];
205
- obj.socket = obj.parent.apfserver.SetupCiraChannel(apfconn, obj.port);
206
- }
207
- obj.socket.onData = function (ccon, data) {
208
- obj.xxOnSocketData(data);
209
- }
210
-
211
- obj.socket.onStateChange = function (ccon, state) {
212
- if (state == 0) {
213
- try {
214
- obj.socketParseState = 0;
215
- obj.socketAccumulator = '';
216
- obj.socketHeader = null;
217
- obj.socketData = '';
218
- obj.socketState = 0;
219
- obj.xxOnSocketClosed();
220
- } catch (e) { }
221
- } else if (state == 2) {
222
- // channel open success
223
- obj.xxOnSocketConnected();
224
- }
225
- }
224
}
225
}
226
package.json
+1
-1
@@ -1,6 +1,6 @@
1
{
2
"name": "meshcentral",
3
- "version": "0.5.1-j",
3
+ "version": "0.5.1-k",
4
"keywords": [
5
"Remote Management",
6
"Intel AMT",