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

[WIP] move connection state call to main thread

Browse source
This commit is contained in:
Alex Kh 2021-12-08 17:10:15 +04:00
parent 87c00b3804
commit 1a333f7968
1 changed files with 41 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

54
client/protocols/ios_vpnprotocol.mm
View file

@ -88,7 +88,11 @@ void IOSVpnProtocol::stop()
{ {
if (!m_controller) { if (!m_controller) {
qDebug() << "Not correctly initialized"; qDebug() << "Not correctly initialized";
emit connectionStateChanged(Disconnected);
dispatch_async(dispatch_get_main_queue(), ^{
emit connectionStateChanged(Disconnected);
});
return; return;
} }
@ -243,29 +247,39 @@ void IOSVpnProtocol::setupWireguardProtocol(const QtJson::JsonObject &result)
case ConnectionStateError: { case ConnectionStateError: {
[m_controller dealloc]; [m_controller dealloc];
m_controller = nullptr; m_controller = nullptr;
emit connectionStateChanged(VpnConnectionState::Error); dispatch_async(dispatch_get_main_queue(), ^{
emit connectionStateChanged(VpnConnectionState::Error);
});
return; return;
} }
case ConnectionStateConnected: { case ConnectionStateConnected: {
Q_ASSERT(date); Q_ASSERT(date);
QDateTime qtDate(QDateTime::fromNSDate(date)); QDateTime qtDate(QDateTime::fromNSDate(date));
emit connectionStateChanged(VpnConnectionState::Connected); dispatch_async(dispatch_get_main_queue(), ^{
emit connectionStateChanged(VpnConnectionState::Connected);
});
return; return;
} }
case ConnectionStateDisconnected: case ConnectionStateDisconnected:
// Just in case we are connecting, let's call disconnect. // Just in case we are connecting, let's call disconnect.
[m_controller disconnect]; [m_controller disconnect];
emit connectionStateChanged(VpnConnectionState::Disconnected); dispatch_async(dispatch_get_main_queue(), ^{
emit connectionStateChanged(VpnConnectionState::Disconnected);
});
return; return;
} }
} }
callback:^(BOOL a_connected) { callback:^(BOOL a_connected) {
qDebug() << "State changed: " << a_connected; qDebug() << "State changed: " << a_connected;
if (a_connected) { if (a_connected) {
emit connectionStateChanged(Connected); dispatch_async(dispatch_get_main_queue(), ^{
emit connectionStateChanged(Connected);
});
return; return;
} }
emit connectionStateChanged(Disconnected); dispatch_async(dispatch_get_main_queue(), ^{
emit connectionStateChanged(Disconnected);
});
}]; }];
} }
@ -290,29 +304,39 @@ void IOSVpnProtocol::setupOpenVPNProtocol(const QtJson::JsonObject &result)
case ConnectionStateError: { case ConnectionStateError: {
[m_controller dealloc]; [m_controller dealloc];
m_controller = nullptr; m_controller = nullptr;
emit connectionStateChanged(VpnConnectionState::Error); dispatch_async(dispatch_get_main_queue(), ^{
emit connectionStateChanged(VpnConnectionState::Error);
});
return; return;
} }
case ConnectionStateConnected: { case ConnectionStateConnected: {
Q_ASSERT(date); Q_ASSERT(date);
QDateTime qtDate(QDateTime::fromNSDate(date)); QDateTime qtDate(QDateTime::fromNSDate(date));
emit connectionStateChanged(VpnConnectionState::Connected); dispatch_async(dispatch_get_main_queue(), ^{
emit connectionStateChanged(VpnConnectionState::Connected);
});
return; return;
} }
case ConnectionStateDisconnected: case ConnectionStateDisconnected:
// Just in case we are connecting, let's call disconnect. // Just in case we are connecting, let's call disconnect.
[m_controller disconnect]; [m_controller disconnect];
emit connectionStateChanged(VpnConnectionState::Disconnected); dispatch_async(dispatch_get_main_queue(), ^{
emit connectionStateChanged(VpnConnectionState::Disconnected);
});
return; return;
} }
} }
callback:^(BOOL a_connected) { callback:^(BOOL a_connected) {
qDebug() << "OVPN State changed: " << a_connected; qDebug() << "OVPN State changed: " << a_connected;
if (a_connected) { if (a_connected) {
emit connectionStateChanged(Connected); dispatch_async(dispatch_get_main_queue(), ^{
emit connectionStateChanged(Connected);
});
return; return;
} }
emit connectionStateChanged(Disconnected); dispatch_async(dispatch_get_main_queue(), ^{
emit connectionStateChanged(Disconnected);
});
}]; }];
} }
@ -367,7 +391,9 @@ void IOSVpnProtocol::launchWireguardTunnel(const QtJson::JsonObject &result)
reason:0 reason:0
failureCallback:^() { failureCallback:^() {
qDebug() << "Wireguard Protocol - connection failed"; qDebug() << "Wireguard Protocol - connection failed";
emit connectionStateChanged(Disconnected); dispatch_async(dispatch_get_main_queue(), ^{
emit connectionStateChanged(Disconnected);
});
}]; }];
} }
@ -379,7 +405,9 @@ void IOSVpnProtocol::launchOpenVPNTunnel(const QtJson::JsonObject &result)
[m_controller connectWithOvpnConfig:ovpnConfig.toNSString() [m_controller connectWithOvpnConfig:ovpnConfig.toNSString()
failureCallback:^{ failureCallback:^{
qDebug() << "IOSVPNProtocol - connection failed"; qDebug() << "IOSVPNProtocol - connection failed";
emit connectionStateChanged(Disconnected); dispatch_async(dispatch_get_main_queue(), ^{
emit connectionStateChanged(Disconnected);
});
}]; }];
} }