From 68d9394d9fb3d0bbb3d46953714303bbfc565569 Mon Sep 17 00:00:00 2001
From: "vladimir.kuznetsov" <nethiuswork@gmail.com>
Date: Mon, 5 Jun 2023 17:49:20 +0300
Subject: [PATCH] fixed windows build errors after refactoring

---
 client/configurators/ssh_configurator.cpp     |  6 ++--
 .../protocols/ikev2_vpn_protocol_windows.cpp  | 30 +++++++++----------
 2 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/client/configurators/ssh_configurator.cpp b/client/configurators/ssh_configurator.cpp
index e1435bc37..d94e44684 100644
--- a/client/configurators/ssh_configurator.cpp
+++ b/client/configurators/ssh_configurator.cpp
@@ -69,14 +69,14 @@ void SshConfigurator::openSshTerminal(const ServerCredentials &credentials)
     p->setProcessEnvironment(prepareEnv());
     p->setProgram(qApp->applicationDirPath() + "\\cygwin\\putty.exe");
 
-    if (credentials.password.contains("PRIVATE KEY")) {
+    if (credentials.secretData.contains("PRIVATE KEY")) {
         // todo: connect by key
 //        p->setNativeArguments(QString("%1@%2")
-//            .arg(credentials.userName).arg(credentials.hostName).arg(credentials.password));
+//            .arg(credentials.userName).arg(credentials.hostName).arg(credentials.secretData));
     }
     else {
         p->setNativeArguments(QString("%1@%2 -pw %3")
-            .arg(credentials.userName).arg(credentials.hostName).arg(credentials.password));
+            .arg(credentials.userName).arg(credentials.hostName).arg(credentials.secretData));
     }
 #else
     p->setProgram("/bin/bash");
diff --git a/client/protocols/ikev2_vpn_protocol_windows.cpp b/client/protocols/ikev2_vpn_protocol_windows.cpp
index 7564f969f..5c471e220 100644
--- a/client/protocols/ikev2_vpn_protocol_windows.cpp
+++ b/client/protocols/ikev2_vpn_protocol_windows.cpp
@@ -35,14 +35,14 @@ Ikev2Protocol::~Ikev2Protocol()
 
 void Ikev2Protocol::stop()
 {
-    setConnectionState(VpnProtocol::Disconnecting);
+    setConnectionState(Vpn::ConnectionState::Disconnecting);
     {
         if (! disconnect_vpn() ){
             qDebug()<<"We don't disconnect";
-            setConnectionState(VpnProtocol::Error);
+            setConnectionState(Vpn::ConnectionState::Error);
         }
         else {
-            setConnectionState(VpnProtocol::Disconnected);
+            setConnectionState(Vpn::ConnectionState::Disconnected);
         }
     }
 }
@@ -55,40 +55,40 @@ void Ikev2Protocol::newConnectionStateEventReceived(UINT unMsg, tagRASCONNSTATE
     {
     case RASCS_OpenPort:
         //qDebug()<<__FUNCTION__ << __LINE__;
-        setConnectionState(Preparing);
+        setConnectionState(Vpn::ConnectionState::Preparing);
         break;
     case RASCS_PortOpened:
         //qDebug()<<__FUNCTION__ << __LINE__;
-        setConnectionState(Preparing);
+        setConnectionState(Vpn::ConnectionState::Preparing);
         break;
     case RASCS_ConnectDevice:
         //qDebug()<<__FUNCTION__ << __LINE__;
-        setConnectionState(Preparing);
+        setConnectionState(Vpn::ConnectionState::Preparing);
         break;
     case RASCS_DeviceConnected:
         //qDebug()<<__FUNCTION__ << __LINE__;
-        setConnectionState(Preparing);
+        setConnectionState(Vpn::ConnectionState::Preparing);
         break;
     case RASCS_AllDevicesConnected:
         //qDebug()<<__FUNCTION__ << __LINE__;
-        setConnectionState(Preparing);
+        setConnectionState(Vpn::ConnectionState::Preparing);
         break;
     case RASCS_Authenticate:
         //qDebug()<<__FUNCTION__ << __LINE__;
-        setConnectionState(Preparing);
+        setConnectionState(Vpn::ConnectionState::Preparing);
         break;
     case RASCS_AuthNotify:
         //qDebug()<<__FUNCTION__ << __LINE__;
         if (dwError != 0) {
             //qDebug() << "have error" << dwError;
-            setConnectionState(Disconnected);
+            setConnectionState(Vpn::ConnectionState::Disconnected);
         } else {
             //qDebug() << "RASCS_AuthNotify but no error" << dwError;
         }
         break;
     case RASCS_AuthRetry:
         //qDebug()<<__FUNCTION__ << __LINE__;
-        setConnectionState(Preparing);
+        setConnectionState(Vpn::ConnectionState::Preparing);
         break;
     case RASCS_AuthCallback:
         qDebug()<<__FUNCTION__ << __LINE__;
@@ -151,16 +151,16 @@ void Ikev2Protocol::newConnectionStateEventReceived(UINT unMsg, tagRASCONNSTATE
         qDebug()<<__FUNCTION__ << __LINE__;
         break;
     case RASCS_PasswordExpired:
-        setConnectionState(Error);
+        setConnectionState(Vpn::ConnectionState::Error);
         qDebug()<<__FUNCTION__ << __LINE__;
         break;
 
     case RASCS_Connected: // = RASCS_DONE:
-        setConnectionState(Connected);
+        setConnectionState(Vpn::ConnectionState::Connected);
         //qDebug()<<__FUNCTION__ << __LINE__;
         break;
     case RASCS_Disconnected:
-        setConnectionState(Disconnected);
+        setConnectionState(Vpn::ConnectionState::Disconnected);
         //qDebug()<<__FUNCTION__ << __LINE__;
         break;
     default:
@@ -177,7 +177,7 @@ void Ikev2Protocol::readIkev2Configuration(const QJsonObject &configuration)
 ErrorCode Ikev2Protocol::start()
 {
     QByteArray cert = QByteArray::fromBase64(m_config[config_key::cert].toString().toUtf8());
-    setConnectionState(Connecting);
+    setConnectionState(Vpn::ConnectionState::Connecting);
 
     QTemporaryFile certFile;
     certFile.setAutoRemove(false);