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

Missing def check

Browse Source
This commit is contained in:
Dmitriy Karpushin
2023-03-15 17:46:22 +03:00
parent 8fa409d6c1
commit 5f85bf62f5
2 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
client/vpnconnection.cpp
+8 -6
View File
@@ -378,6 +378,13 @@ void VpnConnection::connectToVpn(int serverIndex,
if (e) emit VpnProtocol::Error; if (e) emit VpnProtocol::Error;
} }
void VpnConnection::createProtocolConnections() {
connect(m_vpnProtocol.data(), &VpnProtocol::protocolError, this, &VpnConnection::vpnProtocolError);
connect(m_vpnProtocol.data(), SIGNAL(connectionStateChanged(VpnProtocol::VpnConnectionState)), this, SLOT(onConnectionStateChanged(VpnProtocol::VpnConnectionState)));
connect(m_vpnProtocol.data(), SIGNAL(bytesChanged(quint64, quint64)), this, SLOT(onBytesChanged(quint64, quint64)));
}
#ifdef Q_OS_ANDROID
void VpnConnection::restoreConnection() { void VpnConnection::restoreConnection() {
createAndroidConnections(); createAndroidConnections();
@@ -402,12 +409,6 @@ void VpnConnection::createAndroidConnections(DockerContainer container)
connect(AndroidController::instance(), &AndroidController::statusUpdated, androidVpnProtocol, &AndroidVpnProtocol::connectionDataUpdated); connect(AndroidController::instance(), &AndroidController::statusUpdated, androidVpnProtocol, &AndroidVpnProtocol::connectionDataUpdated);
} }
void VpnConnection::createProtocolConnections() {
connect(m_vpnProtocol.data(), &VpnProtocol::protocolError, this, &VpnConnection::vpnProtocolError);
connect(m_vpnProtocol.data(), SIGNAL(connectionStateChanged(VpnProtocol::VpnConnectionState)), this, SLOT(onConnectionStateChanged(VpnProtocol::VpnConnectionState)));
connect(m_vpnProtocol.data(), SIGNAL(bytesChanged(quint64, quint64)), this, SLOT(onBytesChanged(quint64, quint64)));
}
AndroidVpnProtocol* VpnConnection::createDefaultAndroidVpnProtocol(DockerContainer container) AndroidVpnProtocol* VpnConnection::createDefaultAndroidVpnProtocol(DockerContainer container)
{ {
Proto proto = ContainerProps::defaultProtocol(container); Proto proto = ContainerProps::defaultProtocol(container);
@@ -415,6 +416,7 @@ AndroidVpnProtocol* VpnConnection::createDefaultAndroidVpnProtocol(DockerContain
return androidVpnProtocol; return androidVpnProtocol;
} }
#endif
QString VpnConnection::bytesPerSecToText(quint64 bytes) QString VpnConnection::bytesPerSecToText(quint64 bytes)
{ {
client/vpnconnection.h
+1 -1
View File
@@ -111,8 +111,8 @@ private:
#endif #endif
#ifdef Q_OS_ANDROID #ifdef Q_OS_ANDROID
AndroidVpnProtocol* androidVpnProtocol = nullptr; AndroidVpnProtocol* androidVpnProtocol = nullptr;
AndroidVpnProtocol* createDefaultAndroidVpnProtocol(DockerContainer container);
AndroidVpnProtocol* createDefaultAndroidVpnProtocol(DockerContainer container);
void createAndroidConnections(); void createAndroidConnections();
void createAndroidConnections(DockerContainer container); void createAndroidConnections(DockerContainer container);
#endif #endif