dan9i10/amnezia-client
1
0
Fork 0
mirror of https://github.com/amnezia-vpn/amnezia-client.git synced 2026-05-08 14:33:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: add NM_STATE_DISABLED and check getGatewayAndIface more carefully

Browse Source
This commit is contained in:
NickVs2015
2026-04-03 08:47:15 +03:00
parent f6806459fd
commit 560c4070b4
1 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
client/platforms/linux/linuxnetworkwatcherworker.cpp
View File

@@ -39,6 +39,7 @@
enum NMState { enum NMState {
NM_STATE_UNKNOWN = 0, NM_STATE_UNKNOWN = 0,
NM_STATE_ASLEEP = 10, NM_STATE_ASLEEP = 10,
NM_STATE_DISABLED = 10,
NM_STATE_DISCONNECTED = 20, NM_STATE_DISCONNECTED = 20,
NM_STATE_DISCONNECTING = 30, NM_STATE_DISCONNECTING = 30,
NM_STATE_CONNECTING = 40, NM_STATE_CONNECTING = 40,
@@ -209,7 +210,7 @@ void LinuxNetworkWatcherWorker::NMStateChanged(quint32 state)
{ {
logger.debug() << "NMStateChanged " << state; logger.debug() << "NMStateChanged " << state;
if (state == NM_STATE_ASLEEP) { if (state == NM_STATE_ASLEEP || state == NM_STATE_DISABLED) {
++m_pollGeneration; ++m_pollGeneration;
emit wakeup(); emit wakeup();
} else if (state >= NM_STATE_CONNECTED_SITE && m_previousNMState < NM_STATE_CONNECTED_SITE) { } else if (state >= NM_STATE_CONNECTED_SITE && m_previousNMState < NM_STATE_CONNECTED_SITE) {
@@ -228,9 +229,13 @@ void LinuxNetworkWatcherWorker::checkGatewayAndEmit(int generation, int count) {
} }
++count; ++count;
QString gateway = NetworkUtilities::getGatewayAndIface().first; auto result = NetworkUtilities::getGatewayAndIface();
const QString& gateway = result.first;
const QNetworkInterface& iface = result.second;
bool physicalGateway = !gateway.isEmpty() &&
!(iface.flags() & QNetworkInterface::IsPointToPoint);
if (!gateway.isEmpty()) { if (physicalGateway) {
logger.debug() << "Default gateway" << gateway << "ready after" logger.debug() << "Default gateway" << gateway << "ready after"
<< count << "poll(s), emitting networkChanged"; << count << "poll(s), emitting networkChanged";
emit networkChanged(); emit networkChanged();