diff --git a/CACIC_Comm.pas b/CACIC_Comm.pas index f2b0ca8..10b7b55 100644 --- a/CACIC_Comm.pas +++ b/CACIC_Comm.pas @@ -35,7 +35,8 @@ var tStringStrResponseCS : TStringStream; strWin32_NetworkAdapterConfiguration, strWin32_OperatingSystem, strWin32_SoftwareFeature, - strTeDebugging : String; + strTeDebugging, + strMac : String; Begin Try tStringStrResponseCS := TStringStream.Create(''); @@ -53,6 +54,9 @@ Begin strWin32_OperatingSystem := fetchWmiValues('Win32_OperatingSystem' ,objCacicCOMM.getLocalFolderName); strWin32_ComputerSystem := fetchWmiValues('Win32_ComputerSystem' ,objCacicCOMM.getLocalFolderName); strWin32_NetworkAdapterConfiguration := fetchWmiValues('Win32_NetworkAdapterConfiguration',objCacicCOMM.getLocalFolderName); + strMac := objCacicCOMM.getValueFromTags('MACAddress',fetchWMIvalues('Win32_NetworkAdapterConfiguration',objCacicCOMM.getLocalFolderName,'MACAddress')); + if pos('[', strMac) > 0 then + strMac := copy(strMac, 0, pos('[', strMac) - 1); // if (not (pos('get/test', pStrFullURL) > 0)) and (not (pos('get/config', pStrFullURL) > 0)) then // begin @@ -79,6 +83,7 @@ Begin Values['te_so' ] := objCacicCOMM.replaceInvalidHTTPChars(objCacicCOMM.getWindowsStrId() ); Values['te_versao_cacic' ] := objCacicCOMM.replaceInvalidHTTPChars(objCacicCOMM.getVersionInfo(objCacicCOMM.getLocalFolderName + objCacicCOMM.getMainProgramName)); Values['te_versao_gercols' ] := objCacicCOMM.replaceInvalidHTTPChars(objCacicCOMM.getVersionInfo(objCacicCOMM.getLocalFolderName + 'Modules\gercols.exe' )); + Values['te_node_address' ] := objCacicCOMM.replaceInvalidHTTPChars(objCacicCOMM.enCrypt(strMac, true, true)); End; if objCacicCOMM.isInDebugMode then diff --git a/cacic280.dproj b/cacic280.dproj index b02adbc..f8f323b 100644 --- a/cacic280.dproj +++ b/cacic280.dproj @@ -40,7 +40,7 @@ Delphi.Personality VCLApplication -FalseTrueFalseTrueFalse28112FalseFalseFalseFalseFalse10461252Dataprev - Emp. de TI da Prev.Social - URES/SESSSistema CACIC - Módulo Agente Principal2.8.1.12Baseado na licença GNU/LGPLCacic - Configurador Automático e Coletor de Informações Computacionais3.0cacic280.dpr +FalseTrueFalseTrueFalse28113FalseFalseFalseFalseFalse10461252Dataprev - Emp. de TI da Prev.Social - URES/SESSSistema CACIC - Módulo Agente Principal2.8.1.13Baseado na licença GNU/LGPLCacic - Configurador Automático e Coletor de Informações Computacionais3.0cacic280.dpr diff --git a/cacic280.res b/cacic280.res index 16ace17..36ca706 100644 Binary files a/cacic280.res and b/cacic280.res differ -- libgit2 0.21.2