Skip to content

Commit

Permalink
LMS: WsmanClient: cleanup
Browse files Browse the repository at this point in the history 
Drop unused fqdn retrievers.
Drop using namespace std;
Initialize variables at construction phase.
Fix white spaces.

Singed-off-by: Alexander Usyskin <alexander.usyskin@intel.com>
Signed-off-by: Tomas Winkler <tomas.winkler@intel.com>
  • Loading branch information
@ausyskin
ausyskin authored and Tomas Winkler committed Aug 5, 2019
1 parent 2fc1b5f commit 60a9567
Show file tree
Hide file tree
Showing 22 changed files with 123 additions and 389 deletions.
21 changes: 6 additions & 15 deletions WsmanClient/AMTEthernetPortSettingsClient.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,23 +13,16 @@
#include "global.h"
#include "WsmanClientCatch.h"

AMTEthernetPortSettingsClient::AMTEthernetPortSettingsClient()
AMTEthernetPortSettingsClient::AMTEthernetPortSettingsClient() :
m_isInit(false), m_LinkControl(0), m_LinkPreference(0), m_LinkProtection(5)
{
m_isInit = false;
m_LinkControl = 0;
m_LinkPreference = 0;
m_LinkProtection = 5;
}

AMTEthernetPortSettingsClient::AMTEthernetPortSettingsClient(const std::string &User, const std::string &Password) : BaseWSManClient(User, Password)
AMTEthernetPortSettingsClient::AMTEthernetPortSettingsClient(const std::string &User, const std::string &Password) :
BaseWSManClient(User, Password), m_isInit(false), m_LinkControl(0), m_LinkPreference(0), m_LinkProtection(5)
{
m_isInit = false;
m_LinkControl = 0;
m_LinkPreference = 0;
m_LinkProtection = 5;
}


AMTEthernetPortSettingsClient::~AMTEthernetPortSettingsClient()
{
}
Expand All @@ -43,7 +36,7 @@ bool AMTEthernetPortSettingsClient::Init(bool forceGet, bool actionGet)
try
{
if (!m_endpoint)
SetEndpoint(false);
SetEndpoint();
std::lock_guard<std::mutex> lock(WsManSemaphore());

using Intel::Manageability::Cim::Typed::AMT_EthernetPortSettings;
Expand Down Expand Up @@ -115,6 +108,4 @@ bool AMTEthernetPortSettingsClient::SetLinkPreference(unsigned int LinkPreferenc
if (!Init(true,false))
return false;
return true;
}


}
15 changes: 5 additions & 10 deletions WsmanClient/AMTFCFHWSmanClient.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,14 +20,13 @@

using namespace Intel::Manageability::Cim::Typed;

AMTFCFHWSmanClient::AMTFCFHWSmanClient()
AMTFCFHWSmanClient::AMTFCFHWSmanClient() : m_isInit(false)
{
m_isInit = false;

}
AMTFCFHWSmanClient::AMTFCFHWSmanClient(const std::string &User, const std::string &Password) : BaseWSManClient(User, Password)

AMTFCFHWSmanClient::AMTFCFHWSmanClient(const std::string &User, const std::string &Password) :
BaseWSManClient(User, Password), m_isInit(false)
{
m_isInit = false;
}

AMTFCFHWSmanClient::~AMTFCFHWSmanClient()
Expand All @@ -44,7 +43,7 @@ bool AMTFCFHWSmanClient::Init()
try {
if (!m_endpoint)
{
SetEndpoint(false);
SetEndpoint();

m_isInit = true;

Expand All @@ -54,8 +53,6 @@ bool AMTFCFHWSmanClient::Init()
return m_isInit;
}



bool AMTFCFHWSmanClient::userInitiatedPolicyRuleExists(short* pExist)
{
if (!Init())
Expand Down Expand Up @@ -136,8 +133,6 @@ bool AMTFCFHWSmanClient::userInitiatedPolicyRuleForLocalMpsExists(short* pExist)
return false;
}



bool AMTFCFHWSmanClient::snmpEventSubscriberExists(short* pExist)
{
if (!Init())
Expand Down
8 changes: 3 additions & 5 deletions WsmanClient/AMTRedirectionServiceWSManClient.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@

using namespace Intel::Manageability::Cim::Typed;


typedef enum _TEMINATE_SESSION_QUALIFIER
{
TEMINATE_SESSION_QUALIFIER_SUCCESS = 0x0,
Expand All @@ -24,14 +23,14 @@ typedef enum _TEMINATE_SESSION_QUALIFIER
TEMINATE_SESSION_QUALIFIER_RESERVED = 0x4
} TEMINATE_SESSION_QUALIFIER;

AMTRedirectionServiceWSManClient::AMTRedirectionServiceWSManClient(void)
AMTRedirectionServiceWSManClient::AMTRedirectionServiceWSManClient(void) : m_isInit(false)
{
m_isInit = false;
}

AMTRedirectionServiceWSManClient::~AMTRedirectionServiceWSManClient(void)
{
}

bool AMTRedirectionServiceWSManClient::TerminateSession(unsigned int SessionType)
{
UNS_DEBUG("AMTRedirectionServiceWSManClient::TerminateSession(%d)\n",SessionType);
Expand All @@ -46,7 +45,6 @@ bool AMTRedirectionServiceWSManClient::TerminateSession(unsigned int SessionType
AMT_RedirectionService::TerminateSession_INPUT request;
request.SessionType(SessionType);
unsigned int returnedVal = m_service.TerminateSession(request);
//m_service.InvokeTerminateSession(request, response,m_client);
UNS_DEBUG("AMTRedirectionServiceWSManClient::TerminateSession(%d) ReturnValue=%d\n", SessionType, returnedVal);
if (returnedVal != TEMINATE_SESSION_QUALIFIER_SUCCESS && returnedVal != TEMINATE_SESSION_QUALIFIER_INVALID_STATE) // may fail if there is no active session, in this case return true
{
Expand All @@ -69,7 +67,7 @@ bool AMTRedirectionServiceWSManClient::Init(bool forceGet)
try
{
if (!m_endpoint)
SetEndpoint(false);
SetEndpoint();
//Lock WsMan to prevent reentry
std::lock_guard<std::mutex> lock(WsManSemaphore());
m_service.WsmanClient(m_client.get());
Expand Down
64 changes: 30 additions & 34 deletions WsmanClient/AuditLogWSManClient.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,14 +14,10 @@
#include <iomanip>
#include "WsmanClientCatch.h"

#define _CRT_SECURE_NO_WARNINGS

using namespace std;
using namespace Intel::Manageability::Cim::Typed;

AuditLogWSManClient::AuditLogWSManClient()
AuditLogWSManClient::AuditLogWSManClient() : m_isInit(false)
{
m_isInit = false;
}

AuditLogWSManClient::~AuditLogWSManClient(){}
Expand Down Expand Up @@ -82,7 +78,7 @@ bool AuditLogWSManClient::Init(bool forceGet)
try
{
if (!m_endpoint)
SetEndpoint(false);
SetEndpoint();

//Lock WsMan to prevent reentry
std::lock_guard<std::mutex> lock(WsManSemaphore());
Expand Down Expand Up @@ -350,13 +346,13 @@ bool AuditLogWSManClient::parseLogs(std::string &out, const std::vector<BinaryDa

break;
case KERBEROS_SID:
parsed << hex << uppercase;
parsed << std::hex << std::uppercase;

for (unsigned int i=1 ; i<=sizeof(uint32_t) ; i++)
{
parsed << (int)((uint8_t*)(&structedRecord.KerberosInitiatorData.UserInDomain))[sizeof(uint32_t)-i] << " ";
}
parsed << dec << nouppercase;
parsed << std::dec << std::nouppercase;
if (NULL != name)
{
delete[] name;
Expand All @@ -374,13 +370,13 @@ bool AuditLogWSManClient::parseLogs(std::string &out, const std::vector<BinaryDa
}

// Display domain data to screen
parsed << hex << uppercase;
parsed << std::hex << std::uppercase;
for (unsigned int i=0 ; (i<structedRecord.KerberosInitiatorData.Domain.size()) &&
(i<structedRecord.KerberosInitiatorData.DomainLength); i++)
{
parsed << (int)structedRecord.KerberosInitiatorData.Domain[i] << " ";
}
parsed << dec << nouppercase;
parsed << std::dec << std::nouppercase;

break;
case LOCAL_INITIATOR:
Expand Down Expand Up @@ -452,11 +448,14 @@ bool AuditLogWSManClient::parseLogs(std::string &out, const std::vector<BinaryDa

// Display Extended Data
parsed << "]]></InitiatorNetAddress>\n<ExtendedData><![CDATA[";
try {
try
{
parsed << DisplayExtendedData(structedRecord.AuditAppID,
structedRecord.EventID, structedRecord.ExtendedData,
structedRecord.ExtendedDataLength) ;
} catch( exception &e) {
}
catch(std::exception &e)
{
const char* reason = e.what();
UNS_DEBUG("%C\n", reason);
parsed << "Exception while parsing extended data";
Expand Down Expand Up @@ -1061,14 +1060,14 @@ std::string AuditLogWSManClient::DisplayBasicUsernameSidInformation(uint8_t* ext
if (KERBEROS_SID == initiatorType)
{
ss << "SID";
ss << ":" << hex << uppercase;
ss << ":" << std::hex << std::uppercase;

for (size_t j=0 ; (j<sizeof(uint32_t)) && (i<extendedDataLen) ; j++)
{
ss << " " << (int)extData[i];
i++;
}
ss << dec << nouppercase << ". ";
ss << std::dec << std::nouppercase << ". ";

if ( i < extendedDataLen)
{
Expand All @@ -1091,12 +1090,12 @@ std::string AuditLogWSManClient::DisplayBasicUsernameSidInformation(uint8_t* ext
}
else if (KERBEROS_SID == initiatorType)
{
ss << "Domain:" << hex << uppercase;
ss << "Domain:" << std::hex << std::uppercase;
for (int j=0 ; (j<length) && (i<extendedDataLen) ; i++, j++)
{
ss << " " << (int)extData[i];
}
ss << dec << nouppercase << ". ";
ss << std::dec << std::nouppercase << ". ";
}
}
return ss.str();
Expand Down Expand Up @@ -1294,13 +1293,13 @@ std::string AuditLogWSManClient::DisplaySecurityAdminTlsCertificateRelatedEvent(
int i = 0;
if (i<extendedDataLen)
{
ss << "Certificate Serial Number: " << hex << uppercase;
ss << "Certificate Serial Number: " << std::hex << std::uppercase;
for (int x=0 ; (x<CERT_SERIAL_NUM_MAX_LEN) && (i<extendedDataLen); x++)
{
ss << (int)extData[i] << " ";
i++;
}
ss << dec << nouppercase;
ss << std::dec << std::nouppercase;
}
return ss.str();
}
Expand Down Expand Up @@ -1332,12 +1331,12 @@ std::string AuditLogWSManClient::DisplaySecurityAdminPowerPackageModifiedEvent(u
stringstream ss;
ss << "Power Package Modified to: ";
stringstream data;
data << hex << uppercase << setfill('0');
data << std::hex << std::uppercase << std::setfill('0');
for (int k=0; k<16; k++)
{
data << setw(2) << (int)extData[k];
data << std::setw(2) << (int)extData[k];
}
data << dec << nouppercase;
data << std::dec << std::nouppercase;
for (int k=0; k<12; k++)
{
if (data.str().compare(powerPolicyFW[k]) == 0)
Expand Down Expand Up @@ -1435,13 +1434,13 @@ std::string AuditLogWSManClient::DisplayRemoteControlBootOptionsRelatedEvent(uin
int i=0;
if (i<extendedDataLen)
{
ss << "Boot Options: " << hex << uppercase;
ss << "Boot Options: " << std::hex << std::uppercase;
for (int x=0 ; (x<BOOT_OPTIONS_LEN) && (i<extendedDataLen); x++)
{
ss << (int)extData[i] << " ";
i++;
}
ss << dec << nouppercase;
ss << std::dec << std::nouppercase;
}
return ss.str();
}
Expand Down Expand Up @@ -1852,7 +1851,7 @@ std::string AuditLogWSManClient::DisplayNetworkAdminIPv6ParamsEvent(uint8_t* ext
{
if (MANUAL_ID == interfaceIDGenType)
{
ss << "Interface ID: " << hex << uppercase;
ss << "Interface ID: " << std::hex << std::uppercase;
for (int j=0 ; (j<INTERFCAE_ID_LEN) && (i<extendedDataLen); j++)
{
if ((int)extData[i] < 10)
Expand All @@ -1862,7 +1861,7 @@ std::string AuditLogWSManClient::DisplayNetworkAdminIPv6ParamsEvent(uint8_t* ext
ss << (int)extData[i];
i++;
}
ss << dec << nouppercase << ". ";
ss << std::dec << std::nouppercase << ". ";
}
else
{
Expand All @@ -1875,7 +1874,7 @@ std::string AuditLogWSManClient::DisplayNetworkAdminIPv6ParamsEvent(uint8_t* ext
{
if ((i+16) <= extendedDataLen)
{
ss << addresses[j] << hex << uppercase;
ss << addresses[j] << std::hex << std::uppercase;
for ( int k = 0; k < 16; k++ )
{
if (!(k%2) && (int)extData[i+k] == 0 && (int)extData[i+k+1] == 0) // put 0 instead of 0000
Expand All @@ -1894,7 +1893,7 @@ std::string AuditLogWSManClient::DisplayNetworkAdminIPv6ParamsEvent(uint8_t* ext
ss << ":";
}
}
ss << dec << nouppercase << " ";
ss << std::dec << std::nouppercase << " ";
i+=16;
}
}
Expand Down Expand Up @@ -2000,7 +1999,7 @@ std::string AuditLogWSManClient::DisplayEventManagerAlertRelatedEvent(uint8_t* e
{
if ((i+16)<=extendedDataLen)
{
ss << "Alert Target IP Address: " << hex << uppercase;
ss << "Alert Target IP Address: " << std::hex << std::uppercase;
for ( int k = 0; k < 16; k++ )
{
if (k%2 == 0 && (int)extData[i+k] == 0 && (int)extData[i+k+1] == 0)
Expand All @@ -2020,7 +2019,7 @@ std::string AuditLogWSManClient::DisplayEventManagerAlertRelatedEvent(uint8_t* e
}
}
i+=16;
ss << dec << nouppercase;
ss << std::dec << std::nouppercase;
}
}

Expand Down Expand Up @@ -2569,15 +2568,12 @@ std::string AuditLogWSManClient::DisplayWatchdogActionPairingChangedEvent(uint8_
std::string AuditLogWSManClient::DisplayUnknownEvent(uint8_t* extData, uint8_t extendedDataLen)
{
stringstream ss;
ss << "Unknown Event: Length = " << (unsigned int)extendedDataLen << ". Data =" << hex << uppercase;
ss << "Unknown Event: Length = " << (unsigned int)extendedDataLen << ". Data =" << std::hex << std::uppercase;

for(int i=0 ; i<extendedDataLen; i++)
{
ss << " " << (int)extData[i];
}
ss << dec << nouppercase << ". ";
ss << std::dec << std::nouppercase << ". ";
return ss.str();
}



Loading

0 comments on commit 60a9567

Please sign in to comment.