AZEN-SGG/amnezia-client
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Qt Remote objects done

Browse source
This commit is contained in:
pokamest 2021-02-02 22:51:31 +03:00
parent 048a673d31
commit b2392c1943
15 changed files with 240 additions and 423 deletions
Download patch file Download diff file Expand all files Collapse all files

24
client/protocols/openvpnprotocol.cpp
View file

@ -15,7 +15,7 @@ OpenVpnProtocol::OpenVpnProtocol(const QString& args, QObject* parent) :
//m_requestFromUserToStop(false)
{
setConfigFile(args);
connect(m_communicator, &Communicator::messageReceived, this, &OpenVpnProtocol::onMessageReceived);
//connect(m_communicator, &Communicator::messageReceived, this, &OpenVpnProtocol::onMessageReceived);
connect(&m_managementServer, &ManagementServer::readyRead, this, &OpenVpnProtocol::onReadyReadDataFromManagementServer);
}
@ -172,14 +172,26 @@ ErrorCode OpenVpnProtocol::start()
return ErrorCode::AmneziaServiceConnectionFailed;
}
process->setProgram(openVpnExecPath());
process->setArguments(QStringList() << "--config" << configPath()<<
"--management"<< m_managementHost<< QString::number(m_managementPort)<<
"--management-client"<<
"--log-append"<< vpnLogFileNamePath);
QStringList arguments({"--config" , configPath(),
"--management", m_managementHost, QString::number(m_managementPort),
"--management-client",
"--log-append", vpnLogFileNamePath
});
process->setArguments(arguments);
qDebug() << arguments.join(" ");
connect(process.data(), &IpcProcessInterfaceReplica::errorOccurred, [&](QProcess::ProcessError error) {
qDebug() << "IpcProcessInterfaceReplica errorOccurred" << error;
});
connect(process.data(), &IpcProcessInterfaceReplica::stateChanged, [&](QProcess::ProcessState newState) {
qDebug() << "IpcProcessInterfaceReplica stateChanged" << newState;
});
process->start();
//m_communicator->sendMessage(Message(Message::State::StartRequest, args));
startTimeoutTimer();
//startTimeoutTimer();
return ErrorCode::NoError;
}

22
client/protocols/vpnprotocol.cpp
View file

@ -5,7 +5,7 @@
#include "vpnprotocol.h"
#include "core/errorstrings.h"
Communicator* VpnProtocol::m_communicator = nullptr;
//Communicator* VpnProtocol::m_communicator = nullptr;
VpnProtocol::VpnProtocol(const QString& args, QObject* parent)
: QObject(parent),
@ -20,17 +20,17 @@ VpnProtocol::VpnProtocol(const QString& args, QObject* parent)
Q_UNUSED(args)
}
void VpnProtocol::initializeCommunicator(QObject* parent)
{
if (!m_communicator) {
m_communicator = new Communicator(parent);
}
}
//void VpnProtocol::initializeCommunicator(QObject* parent)
//{
// if (!m_communicator) {
// m_communicator = new Communicator(parent);
// }
//}
Communicator* VpnProtocol::communicator()
{
return m_communicator;
}
//Communicator* VpnProtocol::communicator()
//{
// return m_communicator;
//}
void VpnProtocol::setLastError(ErrorCode lastError)
{

4
client/protocols/vpnprotocol.h
View file

@ -22,7 +22,7 @@ public:
static Communicator* communicator();
static QString textConnectionState(ConnectionState connectionState);
static void initializeCommunicator(QObject* parent = nullptr);
//static void initializeCommunicator(QObject* parent = nullptr);
virtual bool onConnected() const;
@ -54,7 +54,7 @@ protected:
virtual void setBytesChanged(quint64 receivedBytes, quint64 sentBytes);
virtual void setConnectionState(VpnProtocol::ConnectionState state);
static Communicator* m_communicator;
//static Communicator* m_communicator;
ConnectionState m_connectionState;
QString m_routeGateway;