andrei/amnezia-client
1
0
Fork 0
mirror of https://github.com/amnezia-vpn/amnezia-client.git synced 2026-06-24 02:00:24 +07:00
Code Issues Packages Projects Releases 10 Wiki Activity

wait for response from service before object destroy

Browse Source
This commit is contained in:
Mykola Baibuz
2025-08-27 00:06:01 +03:00
parent fdd2c12647
commit 4f17085c99
11 changed files with 45 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files
client/protocols/openvpnprotocol.cpp
+2 -1
View File
@@ -56,7 +56,8 @@ void OpenVpnProtocol::stop()
}
#if defined(Q_OS_WIN) || defined(Q_OS_LINUX) || defined(Q_OS_MACOS)
IpcClient::Interface()->disableKillSwitch();
QRemoteObjectPendingReply<bool> disableKillSwitchResp = IpcClient::Interface()->disableKillSwitch();
disableKillSwitchResp.waitForFinished(1000);
#endif
setConnectionState(Vpn::ConnectionState::Disconnected);
client/protocols/xrayprotocol.cpp
+5 -2
View File
@@ -167,8 +167,10 @@ ErrorCode XrayProtocol::startTun2Sock()
void XrayProtocol::stop()
{
#if defined(Q_OS_WIN) || defined(Q_OS_LINUX) || defined(Q_OS_MACOS)
IpcClient::Interface()->disableKillSwitch();
IpcClient::Interface()->StartRoutingIpv6();
QRemoteObjectPendingReply<bool> disableKillSwitchResp = IpcClient::Interface()->disableKillSwitch();
disableKillSwitchResp.waitForFinished(1000);
QRemoteObjectPendingReply<bool> StartRoutingIpv6Resp = IpcClient::Interface()->StartRoutingIpv6();
StartRoutingIpv6Resp.waitForFinished(1000);
#endif
qDebug() << "XrayProtocol::stop()";
m_xrayProcess.disconnect();
@@ -176,6 +178,7 @@ void XrayProtocol::stop()
m_xrayProcess.waitForFinished(3000);
if (m_t2sProcess) {
m_t2sProcess->stop();
QThread::msleep(200);
}
setConnectionState(Vpn::ConnectionState::Disconnected);
ipc/ipc_interface.rep
+2 -2
View File
@@ -25,8 +25,8 @@ class IpcInterface
SLOT( bool createTun(const QString &dev, const QString &subnet) );
SLOT( bool deleteTun(const QString &dev) );
SLOT( void StartRoutingIpv6() );
SLOT( void StopRoutingIpv6() );
SLOT( bool StartRoutingIpv6() );
SLOT( bool StopRoutingIpv6() );
SLOT( bool disableKillSwitch() );
SLOT( bool disableAllTraffic() );
ipc/ipcserver.cpp
+4 -4
View File
@@ -157,13 +157,13 @@ bool IpcServer::updateResolvers(const QString &ifname, const QList<QHostAddress>
return Router::updateResolvers(ifname, resolvers);
}
void IpcServer::StartRoutingIpv6()
bool IpcServer::StartRoutingIpv6()
{
Router::StartRoutingIpv6();
return Router::StartRoutingIpv6();
}
void IpcServer::StopRoutingIpv6()
bool IpcServer::StopRoutingIpv6()
{
Router::StopRoutingIpv6();
return Router::StopRoutingIpv6();
}
void IpcServer::setLogsEnabled(bool enabled)
ipc/ipcserver.h
+2 -2
View File
@@ -32,8 +32,8 @@ public:
virtual void setLogsEnabled(bool enabled) override;
virtual bool createTun(const QString &dev, const QString &subnet) override;
virtual bool deleteTun(const QString &dev) override;
virtual void StartRoutingIpv6() override;
virtual void StopRoutingIpv6() override;
virtual bool StartRoutingIpv6() override;
virtual bool StopRoutingIpv6() override;
virtual bool disableAllTraffic() override;
virtual bool addKillSwitchAllowedRange(QStringList ranges) override;
virtual bool resetKillSwitchAllowedRange(QStringList ranges) override;
service/server/router.cpp
+8 -8
View File
@@ -100,25 +100,25 @@ bool Router::updateResolvers(const QString& ifname, const QList<QHostAddress>& r
}
void Router::StopRoutingIpv6()
bool Router::StopRoutingIpv6()
{
#ifdef Q_OS_WIN
RouterWin::Instance().StopRoutingIpv6();
return RouterWin::Instance().StopRoutingIpv6();
#elif defined (Q_OS_MAC)
// todo fixme
return true;// todo fixme
#elif defined Q_OS_LINUX
RouterLinux::Instance().StopRoutingIpv6();
return RouterLinux::Instance().StopRoutingIpv6();
#endif
}
void Router::StartRoutingIpv6()
bool Router::StartRoutingIpv6()
{
#ifdef Q_OS_WIN
RouterWin::Instance().StartRoutingIpv6();
return RouterWin::Instance().StartRoutingIpv6();
#elif defined (Q_OS_MAC)
// todo fixme
return true;// todo fixme
#elif defined Q_OS_LINUX
RouterLinux::Instance().StartRoutingIpv6();
return RouterLinux::Instance().StartRoutingIpv6();
#endif
}
service/server/router.h
+2 -2
View File
@@ -23,8 +23,8 @@ public:
static void resetIpStack();
static bool createTun(const QString &dev, const QString &subnet);
static bool deleteTun(const QString &dev);
static void StartRoutingIpv6();
static void StopRoutingIpv6();
static bool StartRoutingIpv6();
static bool StopRoutingIpv6();
static bool updateResolvers(const QString& ifname, const QList<QHostAddress>& resolvers);
};
service/server/router_linux.cpp
+12 -10
View File
@@ -281,7 +281,7 @@ bool RouterLinux::updateResolvers(const QString& ifname, const QList<QHostAddres
return m_dnsUtil->updateResolvers(ifname, resolvers);
}
void RouterLinux::StartRoutingIpv6()
bool RouterLinux::StartRoutingIpv6()
{
QProcess process;
QStringList commands;
@@ -291,12 +291,12 @@ void RouterLinux::StartRoutingIpv6()
if (!process.waitForStarted(1000))
{
qDebug().noquote() << "Could not start activate ipv6\n";
return;
return false;
}
else if (!process.waitForFinished(2000))
{
qDebug().noquote() << "Could not activate ipv6\n";
return;
return false;
}
commands.clear();
@@ -305,19 +305,20 @@ void RouterLinux::StartRoutingIpv6()
if (!process.waitForStarted(1000))
{
qDebug().noquote() << "Could not start activate ipv6\n";
return;
return false;
}
else if (!process.waitForFinished(2000))
{
qDebug().noquote() << "Could not activate ipv6\n";
return;
return false;
}
commands.clear();
qDebug().noquote() << "StartRoutingIpv6 OK";
return true;
}
void RouterLinux::StopRoutingIpv6()
bool RouterLinux::StopRoutingIpv6()
{
QProcess process;
QStringList commands;
@@ -327,12 +328,12 @@ void RouterLinux::StopRoutingIpv6()
if (!process.waitForStarted(1000))
{
qDebug().noquote() << "Could not start disable ipv6\n";
return;
return false;
}
else if (!process.waitForFinished(2000))
{
qDebug().noquote() << "Could not disable ipv6\n";
return;
return false;
}
commands.clear();
@@ -341,14 +342,15 @@ void RouterLinux::StopRoutingIpv6()
if (!process.waitForStarted(1000))
{
qDebug().noquote() << "Could not start disable ipv6\n";
return;
return false;
}
else if (!process.waitForFinished(2000))
{
qDebug().noquote() << "Could not disable ipv6\n";
return;
return false;
}
commands.clear();
qDebug().noquote() << "StopRoutingIpv6 OK";
return true;
}
service/server/router_linux.h
+2 -2
View File
@@ -33,8 +33,8 @@ public:
bool flushDns();
bool createTun(const QString &dev, const QString &subnet);
bool deleteTun(const QString &dev);
void StartRoutingIpv6();
void StopRoutingIpv6();
bool StartRoutingIpv6();
bool StopRoutingIpv6();
bool updateResolvers(const QString& ifname, const QList<QHostAddress>& resolvers);
public slots:
service/server/router_win.cpp
+4 -2
View File
@@ -445,7 +445,7 @@ bool RouterWin::updateResolvers(const QString& ifname, const QList<QHostAddress>
}
void RouterWin::StopRoutingIpv6()
bool RouterWin::StopRoutingIpv6()
{
{
QProcess p;
@@ -465,9 +465,10 @@ void RouterWin::StopRoutingIpv6()
p.start(command);
p.waitForFinished();
}
return true;
}
void RouterWin::StartRoutingIpv6()
bool RouterWin::StartRoutingIpv6()
{
{
QProcess p;
@@ -487,5 +488,6 @@ void RouterWin::StartRoutingIpv6()
p.start(command);
p.waitForFinished();
}
return true;
}
service/server/router_win.h
+2 -2
View File
@@ -42,8 +42,8 @@ public:
bool flushDns();
void resetIpStack();
void StartRoutingIpv6();
void StopRoutingIpv6();
bool StartRoutingIpv6();
bool StopRoutingIpv6();
void suspendWcmSvc(bool suspend);
bool updateResolvers(const QString& ifname, const QList<QHostAddress>& resolvers);