LMS: consolidate RedirectionService WsMan

Consolidate RedirectionService WsMan client into one class to
eliminate code duplication.

Signed-off-by: Alexander Usyskin <alexander.usyskin@intel.com>
Signed-off-by: Tomas Winkler <tomas.winkler@intel.com>

MEWMIProv/Src/WSmanCommands.cpp

@@ -14,7 +14,7 @@
 #include "WSmanCommands.h"
 #include "SIOWSManClient.h"
 #include "KVMWSManClient.h"
-#include "RedirectionServiceWSManClient.h"
+#include "AMTRedirectionServiceWSManClient.h"
 #include "StringManipulator.h"
 using namespace std;
 
@@ -40,7 +40,7 @@ UINT32 WSmanCommands::TerminateKVMSession(void)
 
 UINT32 WSmanCommands::isIDEREnabled(bool *enabled)
 {
-	RedirectionServiceWSManClient redirectionClient;
+	AMTRedirectionServiceWSManClient redirectionClient;
 	unsigned short state;
 	*enabled = false;
 
@@ -69,7 +69,7 @@ UINT32 WSmanCommands::isIDEREnabled(bool *enabled)
 
 UINT32 WSmanCommands::isSOLEnabled(bool *enabled)
 {
-	RedirectionServiceWSManClient redirectionClient;
+	AMTRedirectionServiceWSManClient redirectionClient;
 	unsigned short state;
 	*enabled = false;
 

WsmanClient/AMTRedirectionServiceWSManClient.cpp

@@ -1,6 +1,6 @@
 /* SPDX-License-Identifier: Apache-2.0 */
 /*
- * Copyright (C) 2009-2019 Intel Corporation
+ * Copyright (C) 2009-2020 Intel Corporation
  */
 /*++
 
@@ -56,6 +56,18 @@ bool AMTRedirectionServiceWSManClient::TerminateSession(unsigned int SessionType
 	return true;
 }
 
+bool AMTRedirectionServiceWSManClient::RedirectionState(unsigned short *state)
+{
+	if (!Init(true))
+		return false;
+	if (m_service.EnabledStateExists())
+	{
+		*state = m_service.EnabledState();
+		return true;
+	}
+	return false;
+}
+
 bool AMTRedirectionServiceWSManClient::Init(bool forceGet)
 {
 	if (!forceGet && m_isInit)

WsmanClient/AMTRedirectionServiceWSManClient.h

@@ -1,6 +1,6 @@
 /* SPDX-License-Identifier: Apache-2.0 */
 /*
- * Copyright (C) 2009-2019 Intel Corporation
+ * Copyright (C) 2009-2020 Intel Corporation
  */
 #pragma once
 
@@ -24,6 +24,7 @@ class WSMAN_DLL_API AMTRedirectionServiceWSManClient :
 	AMTRedirectionServiceWSManClient(void);
 	virtual ~AMTRedirectionServiceWSManClient(void);
 	bool TerminateSession(unsigned int SessionType);
+	bool RedirectionState(unsigned short *state);
 	bool Init(bool forceGet= false);
 private:
 

WsmanClient/CMakeLists.txt

@@ -1,5 +1,5 @@
 # SPDX-License-Identifier: Apache-2.0
-# Copyright (C) 2010-2019 Intel Corporation
+# Copyright (C) 2010-2020 Intel Corporation
 cmake_minimum_required (VERSION 3.1)
 
 add_subdirectory ("${TOP_DIR}/CIM_Framework" "CIM_Framework")
@@ -21,7 +21,6 @@ add_library (LmsWsmanClient SHARED
   KVMScreenSettingClient.cpp
   KVMWSManClient.cpp
   PowerManagementCapabilitiesWsManClient.cpp
-  RedirectionServiceWSManClient.cpp
   SIOWSManClient.cpp
   SyncIpClient.cpp
   TimeSynchronizationClient.cpp