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

bypass handle status connected vpn with WG

Browse source
This commit is contained in:
Macbook 2024-12-09 22:14:39 +07:00
parent a1304017ce
commit 307576e4bc
1 changed files with 13 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

14
client/platforms/ios/ios_controller.mm
View file

@ -59,6 +59,7 @@ Vpn::ConnectionState iosStatusToState(NEVPNStatus status) {
namespace { namespace {
IosController* s_instance = nullptr; IosController* s_instance = nullptr;
QTimer *m_handshakeTimer = nullptr; QTimer *m_handshakeTimer = nullptr;
bool is_WireGuard = false;
} }
IosController::IosController() : QObject() IosController::IosController() : QObject()
@ -206,21 +207,27 @@ bool IosController::connectVpn(amnezia::Proto proto, const QJsonObject& configur
if (proto == amnezia::Proto::OpenVpn) { if (proto == amnezia::Proto::OpenVpn) {
is_WireGuard = false;
return setupOpenVPN(); return setupOpenVPN();
} }
if (proto == amnezia::Proto::Cloak) { if (proto == amnezia::Proto::Cloak) {
is_WireGuard = false;
return setupCloak(); return setupCloak();
} }
if (proto == amnezia::Proto::WireGuard) { if (proto == amnezia::Proto::WireGuard) {
is_WireGuard = true;
return setupWireGuard(); return setupWireGuard();
} }
if (proto == amnezia::Proto::Awg) { if (proto == amnezia::Proto::Awg) {
is_WireGuard = true;
return setupAwg(); return setupAwg();
} }
if (proto == amnezia::Proto::Xray) { if (proto == amnezia::Proto::Xray) {
is_WireGuard = false;
return setupXray(); return setupXray();
} }
if (proto == amnezia::Proto::SSXray) { if (proto == amnezia::Proto::SSXray) {
is_WireGuard = false;
return setupSSXray(); return setupSSXray();
} }
@ -261,7 +268,11 @@ void IosController::vpnStatusDidChange(void *pNotification)
if (session /* && session == TunnelManager.session */ ) { if (session /* && session == TunnelManager.session */ ) {
qDebug() << "IosController::vpnStatusDidChange" << iosStatusToState(session.status) << session; qDebug() << "IosController::vpnStatusDidChange" << iosStatusToState(session.status) << session;
if (is_WireGuard && session.status == NEVPNStatusConnected)
{
// use last_handshake_time for check status connected for WireGuard
return;
}
if (session.status == NEVPNStatusDisconnected) { if (session.status == NEVPNStatusDisconnected) {
if (@available(iOS 16.0, *)) { if (@available(iOS 16.0, *)) {
[session fetchLastDisconnectErrorWithCompletionHandler:^(NSError * _Nullable error) { [session fetchLastDisconnectErrorWithCompletionHandler:^(NSError * _Nullable error) {
@ -874,6 +885,7 @@ void IosController::stopForHandshake() {
} }
m_handshakeTimer->deleteLater(); m_handshakeTimer->deleteLater();
m_handshakeTimer = nullptr; m_handshakeTimer = nullptr;
is_WireGuard = false;
qDebug() << "Handshake monitoring stopped."; qDebug() << "Handshake monitoring stopped.";
} else { } else {