From 3cec0dc2a795d500cd57e2a13cc5dd4331cf1b07 Mon Sep 17 00:00:00 2001 From: Mykola Baibuz Date: Thu, 29 Aug 2024 23:18:21 +0300 Subject: [PATCH] Restart IPSec service before VPN connect --- client/protocols/ikev2_vpn_protocol_linux.cpp | 5 ++--- ipc/ipcserver.cpp | 6 +++--- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/client/protocols/ikev2_vpn_protocol_linux.cpp b/client/protocols/ikev2_vpn_protocol_linux.cpp index 692531db..57b0953f 100644 --- a/client/protocols/ikev2_vpn_protocol_linux.cpp +++ b/client/protocols/ikev2_vpn_protocol_linux.cpp @@ -45,7 +45,6 @@ void Ikev2Protocol::stop() qDebug() << "IpsecProtocol::stop()"; } - void Ikev2Protocol::readIkev2Configuration(const QJsonObject &configuration) { QJsonObject ikev2_data = configuration.value(ProtocolProps::key_proto_config_data(Proto::Ikev2)).toObject(); @@ -89,12 +88,12 @@ ErrorCode Ikev2Protocol::start() } //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ bool Ikev2Protocol::create_new_vpn(const QString & vpn_name, - const QString & serv_addr){ + const QString & serv_addr) { qDebug() << "Ikev2Protocol::create_new_vpn()"; return true; } //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -bool Ikev2Protocol::delete_vpn_connection(const QString &vpn_name){ +bool Ikev2Protocol::delete_vpn_connection(const QString &vpn_name) { return false; } diff --git a/ipc/ipcserver.cpp b/ipc/ipcserver.cpp index bcf78216..13418d3a 100644 --- a/ipc/ipcserver.cpp +++ b/ipc/ipcserver.cpp @@ -311,7 +311,7 @@ bool IpcServer::disableKillSwitch() bool IpcServer::startIPsec(QString tunnelName) { #ifdef Q_OS_LINUX -/* QProcess processSystemd; + QProcess processSystemd; QStringList commandsSystemd; commandsSystemd << "systemctl" << "restart" << "ipsec"; processSystemd.start("sudo", commandsSystemd); @@ -327,8 +327,8 @@ bool IpcServer::startIPsec(QString tunnelName) } commandsSystemd.clear(); - QThread::msleep(2000); -*/ + QThread::msleep(5000); + QProcess process; QStringList commands; commands << "ipsec" << "up" << QString("%1").arg(tunnelName);