From 4cd99c5b2f8062203b92cb10f528de4508480e77 Mon Sep 17 00:00:00 2001 From: Ylian Saint-Hilaire Date: Wed, 3 Aug 2022 12:30:30 -0700 Subject: [PATCH] In MeshCMD, amtterm will only show when using with latest version of the agent. --- agents/MeshCmd-signed.exe | Bin 4506560 -> 4507224 bytes agents/MeshCmd64-signed.exe | Bin 4119488 -> 4120152 bytes agents/meshcmd.js | 11 +++++------ 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/agents/MeshCmd-signed.exe b/agents/MeshCmd-signed.exe index 47521723a70dbd9e65b879ca349e4948416f4909..8923c07a3f165efe619ae35756994d244efae694 100644 GIT binary patch delta 2421 zcmc)JeNbg57WvI)BcGLi~$3ffCa!5Fo79hfnNc0 zU;!+F6<7$Y!6Lv09KZ!Uuo&2YC15GA1WB6TVa zj&e0xEy4*Mv?Y|#7-0%n0h@WY52V3WnjDQPTcOqFuZC}=4pXR*M)&N&=MODJS`Ch& zl>E87z=B1IPD**yWSpG$ij-0nTJl9q^C_t`T7Vk;cQ%i$B*Iz*)Y zw@Lj^DM8tPMS>9f*<3s?A(+dbs!EdacuE*Q1n-0(T@a1oDpw_6jEeZwb)L+Tib;^K z(a(>-E9PuIz+ZCA^z%*rPgBNuKAS(AGU{rAT*rASO*lzGZk9%e84?ra(hc--FKS<_ zyjU2XGZqv*;ohu1mLHT}b^EKY?~uKdmh>IV2Sd))j}7D<-&!%S_*(r|m*dm1?-U+2 zH$=6`acg1FjmU}PEG*J+?>B9}Z+H;}%@-my`=(eE6ZV~bxe`mGYegfiJwHYZLjHEI z)X~45n(UMp>rKZdoVHBuosp`zinG$&wmt23YbfUQ;{mbT2a2OcSl=^uxs3#0?HKxrv$sw5SGvg)>swUoVN?>@ai_cQe@{_+WyJt$pdzuh+?bOHll~ud*h#;vyWN( zr}(uQ-u6HEJUum?+%O)MS(1`=b9KSMj*XelH3MSfZB1tjXM4=~_le}*!Gm@8&ZJEi z3V796(qU^o}&5R-PWC-&Lxh=B-cG6Md zqG3F_PhV%ggL&Gm@T7LZ{cqzRbTx{PQKkjY}>q-<_yeL4UnHVuj=tf)K z4WZHTg0j-@Pwe|*iPe^Mn`Nf6@}<=-zm~DTCdSLJKWx_9?xs2~d8@us7n5nErv@|bb!=jX*MAm#ik}d5g_Sw`=zS|4&ta$8A2wY6_ycKs z%ZSr(&&3T>$NMq=6-70J`oCOrG4Wyaa6E4X-i?q+W?PThIaiJ*^=7WK3BMg(JQJCg zQ^^P#b3633DbVI>ZTv{_8mIInU4Er(B|DEqNLie?nwRA@4|-MEvz?rEe`L0 z(x6|s?ERDS^7rIJO}lTayKa^7JMPk|9drJe->R;R<95_EH0YP^4c+JvH@Y!)^ix01 z4XflkF7*-3!YglDw!5vLM(vT&4~c4&d$87)Y+^eR{V`0Q#R0yb*F{;%rB#iWuJ&b} zu85?!^V_8@r;5`zV;geZN58mHN2vGood}3M|2C6xU~>B;o0;$yw}~D4?dO?mIzQU~ zsrpF4wZ};&`#Y;UDzj74$`p*k2iul7Sq@ldv3K5mDh^$?zWB$gBnQN)tj#xR`I0eR Ln!Ua=40rqo`$onp delta 1810 zcmZY7c~}#78V7Kb1_)`miO7*MB1b?7Ashk{Yz{%_ArO#DDS?cb8YdwM@SxHVr9wd| z%EHKE#e-T<6pU*lxTPExkl=+D5w@UKsBDWzQS6c}>pe{`Pb^E~tXX6E~S-{+a( z{guRy;!0wRobXPMc73Iiz#+CY?bQ;BwS+}P@D3mWBVY_n02!D93V0V#ff+Cd7Qhl% z0c&6bYyk}{2X%O1gr!uU=?r$ZonOQ00!^`USKuw20nlZd;tsi z0XFal0U!_rfi*fUA$X&E@q$M%2+=KggzB;4zUol07K8x~2nXxH`?|hrt``ljtLIwd zZcW@ZcvU^u4rft#Bwc}m39psvmRH$MH-bv!Q=oDn$oCZ&4^6bcqhaR5DE?wtt zUIzhZLXPZ#r@aN8|{2$R=Yc>4r@ zxqH;>K^XrJ@?85S6Itq!u0;xPX_`Q_943diP^MIt#Sn{BB6zjHjDm|M`7}IeoJ-Sr zej+f7Ar{r(!Oa2ba>M1LE`6km7n@v?%U-dT~*C-*b`rgT1n+~sQ zt#``UozU-<@_}xuS%6uwIywuDCPG_Bqp0;~NXdj(U?VQp>jZ^{Ad8zvc3>W%WQ%x!9lH zce^#Vf}4?DQ89?KYyYJe{u$EUYM*3&lRTaIU0~Nl+Xzb2yPv5KAX<>*Z*79+3x8Q}E&Gu)r{en|i>x@mk_HEer%8X!2@?(=&frn>5 z9UHy)0ZH7o^1*o2)8l4!He=-R$YXOW){kbZf17*qskp4?&dh_{`@IcrFD6)KZvqGe zqh+K$#AR{bE4S_89NQaRl%zScz&D+eG$=#AsylzQ=#KiLwUO$_|KRGZAErl!9FAFN z6BC%KgX<%e_fqM#YSHBz0BrPn?w6?7Lq%Pe0!5*`Ky%GD{h8{U5eH zzds78y8QHc-Eh_ZxUpT=T$;P%mKCk{=?mzl9!gF$>J3OWbk2?DIXg$^c?jEWThb0= zpH*!6XIjmn`$xjFhAdadJMXud4C zcl4k=y-S_aVtZLUKlUPvasPsM!VETl$k=JcvTvjND`d4J<34pZ0UK^KRywjw|J!&* z!#sKQ2<1t8c^mb~d`#*^pDufz`L>w5m+lx0F~VQ1lK;#nU#PQj8lq^nmSLLG&(F|S z5nbnnzm--!yKihw`DJ!|ggupB(IowrK_B60&!xVaYTK%4oCqHb$zB;2r!72CyO80U z8R@5GZ!S4r`k4NtrtJIPY3c=@;ZngjKA)ekRG%wwH8{+h^rbxfl`b4>e15+6Vc8c$ S*G3C(h9m^J#{M2l?)e|%{{w&k diff --git a/agents/MeshCmd64-signed.exe b/agents/MeshCmd64-signed.exe index 423a670f0ff729c13be7ba8b05fc55f266ca72c6..6469acb4d88b9db4bdfff1cfbf5e4bc5809475c4 100644 GIT binary patch delta 2397 zcmc)Jc~Dc=9tUu<5JDuVEO`h;4~P&1v#>8oK*ypMYgH&MORLx9MuL|c$h{QN(g-M_ z3Wy+HN_7SWrB+R;3vojN4dR2UAPS_ej8azyTzOAg=qZY|^PD&D{n6>2`OHl+=l*^t z-}Adh!!WJq)G)1fJ&j@09bTGCd!N3bCHEptcaioxI>dmOkOjnoEFm^z1#zH>kTt}G zY@kWdWM~Rx3)w;TkORbn{sB2cQz0kF8F~kDfu=#zApp5TZqN+K9hwPwK%NjE@`7eT z-jEM88xlZ5NCb%u7iqpinT`?R3;7us5&r+gb?5c|PyiGN1wp}32o!2KuMgupIH;6> zFIVG)8bbwg1XtrKIf7BsHp?8T)AeC2ifsxDqS|Llrc#5h5~d;E6jq(!&qw5>N{s`l z6nG*jB#CNLJiUO2$6HDPS1G{LG0e*_1xTE8s4Pt4Kt=49a9scUaxbvXkiAV}q)~%K z5{}NHT4HdhmM(3h3xx)yT9!(KAE?Ti5Q zla7YLAIC1C5X2;@2!P_qN(?0criOnNjIAWqfJ{Qcs~|u|5{iS>XeI#=4GK~Y>R1Q{gCBnK^bBa5f@S}R z1OU62bMdN#U@U)XYr2%jlf&@?@SPB(2%=G3!Iyi5fh;eoS0J51#SpSc?f3}1WzNO} z{42*yJKp4Pnlk%Wv-zhfqplG$(*BJ!;YkWIG%6A`B$BeZOXxa3s?sFO7JbZWB|48u zb9phwrZaWYp>>}V+tOO_*4E;~4>I1hmGnOk)b_r}t|-e7u?F+Tp%(|-L`&x+B(fJx0U zI$dPPBVe}7WU`jba_%|vwZ;0z1I^kJUKDFqMsr;Cn)Aux1j&lCAMKC6@mbEo8^1`a0?2bf$H^(~a)u+Vb8H z7jK&5cF25sRq%>|k|R|H{X0^$rhs|(W^~NSrZUcp(99hZnNREn&bT{1ExaQ7fxdVO zmD(eFs`V3x_y+q2#EZgNR=o98e=|c2&Sbkk{{)YPW z9VP7d>=vK?DGqB?9(>kW<<5?+a@2ma>3G2bPDL=0SgB^66kRyC1`mqqcj~T@I5lzoZbHw?!!pFWXsyQ=#0GGr-`;P`S8p~JLQs^4fkK%|M};X zwgd>#PjdDin0@N zkHY&3e>&b>IC?vjrq8>snLZ?(YwMY&xBNt4&Z_Oar;p@6PU|i=wp4n!39GLCvPB>N zyraFKcaH0YVg8k!h%B+~_Q1ld6@%%IE+tRh>S%fwdAzs%`jeyyYXc8Euen=xa)s+z zzwlcX2OGD18daY#xz?tBO+kK>?7L;X@q0}3h87+4ZVoMeu}{;tEx%K__&96Xod$N# w@|C&FBW1qXef5#Nko}AUp0wQiA6jaHmv^Yq%elq-rLsJ&nD?v&cN+Hl4HaqAx&QzG delta 1786 zcmZY4do+}J7zc3UlE{cK$nDL#%(%>qVO@IXLM%~8L>I~6O_TA?HZ#cCG?B%rUG3`f zCP%d!-E5a*%h+f%)<$)9%V?&Cv|F@=SSy#^EcW5F^~b*Fe9n2#@BO{s@AEuvo+jOr zPm`|hBk3iNaS!h&MeAN|+pi*(sz~#6fgaEY24E2|1dD+YFa}G22_OSguoRd9bFd6p z083y6D8L%n09&ve*a3Us033l6K)?#%3_b!bz!kUwcR&R+-~l{=7w`sjzyM6(BUh1F z3~uQhj|F_?b3DI$cxlIFKkzZ|2LT`u1c8+K=T}HUJp#j9vX4INsIWdzks8jnUOa#3PD4JEE03^mkqG7?wsC204O^aD z!-=~`obBfa(6ML@>i9rMsBwd8#Sh^I;@Ivx11jn!pL@Gig7@mPhq!|Jn z$-?p_NRC8+XCe}jke*GChi_DOepUL@p`>yEmd(wNtL#1cRy<0TNI}KdzPa1F!+9AvXUnsXy@YQ zOb65J`rGPTH`o_UPbYpU>!R3LSRMcKkK`8><#%p1@opIXFt_iLShFR*7u`0pGhm!3 z)p84E=x6^Z$d#jt*VRwP-HsY{&3NgdX?44%y9;6pO?FS3RGMi|QPyVXy4h%#%+(H6 zmEP5PsP$aG+wz+PXK}A%z#X$jvG;gj+clap=Aim?d8RTyzH^{&xOBAZLCJ{s&9XI;ttVFg6rXasdd<#<8-{AWRyASQtXq>4_O^RgO&-6m>9g&w8(h-u zdyX5qe8Y*mt^fcQ@=Ll#^zxLj&pIj!7W`R?sPjhUtn& zC0inJABMqV-;+*aSB1;#;GEO`bE|khQXl0e)n;rTll(q_L^9CPFVfXdJ;>F6$hkzMMWM-@3}v{CIj^ zzIBIbN+?+3LfwZ&#%KDy@kjg+G6pK3H9%Q&y+Ga%uJUNn%3X;?FB; zmL=LXki<{F^DtXsSdm$|KgA-lGPX%c$1>~fgwbhZX*Ru2?^#`ZBRL$l<?4(_EbN=n1;gaytts_&;Z z^f#mB2ST%44N1dEns3%u1Z&ql-uPnlB3ZpFGkaCbp*DdcS!VO3?#ku)d_g@jR0`C9- diff --git a/agents/meshcmd.js b/agents/meshcmd.js index 2a83a6a0..39012bdd 100644 --- a/agents/meshcmd.js +++ b/agents/meshcmd.js @@ -25,7 +25,6 @@ limitations under the License. //console.displayStreamPipeMessages = 1; // Display stream pipe and un-pipes //var __gc = setInterval(function () { console.log('GC'); _debugGC() }, 2000); // -setModulePath('modules_meshcmd'); var fs = require('fs'); var os = require('os'); var net = require('net'); @@ -213,7 +212,7 @@ function run(argv) { console.log(' AmtWake - Intel AMT Wake Alarms.'); console.log(' AmtRPE - Intel AMT Remote Platform Erase.'); console.log(' AmtDDNS - Intel AMT DDNS settings.'); - console.log(' AmtTerm - Intel AMT Serial-over-LAN terminal.'); + if (console.canonical != null) { console.log(' AmtTerm - Intel AMT Serial-over-LAN terminal.'); } console.log('\r\nHelp on a specific action using:\r\n'); console.log(' meshcmd help [action]'); exit(0); return; @@ -442,7 +441,7 @@ function run(argv) { console.log(' --set [disabled/dhcp/enabled] Set the dynamic DNS mode.'); console.log(' --interval [minutes] Set update interval in minutes, default is 1440, minimum is 20.'); console.log(' --ttl [seconds] Set time to live, default is 900.'); - } else if (action == 'amtterm') { + } else if ((action == 'amtterm') && (console.canonical != null)) { console.log('AmtTerm is used to connect to the Serial-over-LAN port. Example usage:\r\n\r\n meshcmd amtterm --host 1.2.3.4 --user admin --pass mypassword'); console.log('\r\nRequired arguments:\r\n'); console.log(' --host [hostname] The IP address or DNS name of Intel AMT, 127.0.0.1 is default.'); @@ -837,7 +836,7 @@ function run(argv) { if ((settings.password == null) || (typeof settings.password != 'string') || (settings.password == '')) { console.log('No or invalid \"password\" specified, use --password [password].'); exit(1); return; } if ((settings.username == null) || (typeof settings.username != 'string') || (settings.username == '')) { settings.username = 'admin'; } performAmtFeatureConfig(args); - } else if (settings.action == 'amtterm') { + } else if ((settings.action == 'amtterm') && (console.canonical != null)) { if (settings.hostname == null) { settings.hostname = '127.0.0.1'; } if ((settings.password == null) || (typeof settings.password != 'string') || (settings.password == '')) { console.log('No or invalid \"password\" specified, use --password [password].'); exit(1); return; } if ((settings.username == null) || (typeof settings.username != 'string') || (settings.username == '')) { settings.username = 'admin'; } @@ -3004,13 +3003,13 @@ var solTimer = null; // Called to start serial-over-lan terminal function performAmtTerm(args) { - try { + //try { sol = require('amt-redir-duk')(require('amt-sol')()); sol.onStateChanged = onSolStateChange; sol.m.onData = onSolData; sol.m.debug = (settings.debuglevel > 0); sol.Start(settings.hostname, (settings.tls == true) ? 16995 : 16994, settings.username ? 'admin' : settings.username, settings.password, settings.tls); - } catch (ex) { console.log(ex); } + //} catch (ex) { console.log(ex); } } // Called when the serial-over-lan connection state changes