1*4882a593SmuzhiyunFrom a26255c81add60f5c933aab36255ce78089f48c5 Mon Sep 17 00:00:00 2001 2*4882a593SmuzhiyunFrom: Jeffy Chen <jeffy.chen@rock-chips.com> 3*4882a593SmuzhiyunDate: Sat, 27 Mar 2021 04:08:12 +0800 4*4882a593SmuzhiyunSubject: [PATCH 25/28] bearer: Support prefer using active network 5*4882a593Smuzhiyun 6*4882a593SmuzhiyunSet env "QT_NETWORK_PREFER_ACTIVE" to enable it. 7*4882a593Smuzhiyun 8*4882a593SmuzhiyunSigned-off-by: Jeffy Chen <jeffy.chen@rock-chips.com> 9*4882a593Smuzhiyun--- 10*4882a593Smuzhiyun src/network/bearer/qnetworkconfigmanager_p.cpp | 7 ++++++- 11*4882a593Smuzhiyun 1 file changed, 6 insertions(+), 1 deletion(-) 12*4882a593Smuzhiyun 13*4882a593Smuzhiyundiff --git a/src/network/bearer/qnetworkconfigmanager_p.cpp b/src/network/bearer/qnetworkconfigmanager_p.cpp 14*4882a593Smuzhiyunindex f0aa452d..1cdb9f91 100644 15*4882a593Smuzhiyun--- a/src/network/bearer/qnetworkconfigmanager_p.cpp 16*4882a593Smuzhiyun+++ b/src/network/bearer/qnetworkconfigmanager_p.cpp 17*4882a593Smuzhiyun@@ -101,6 +101,11 @@ QNetworkConfiguration QNetworkConfigurationManagerPrivate::defaultConfiguration( 18*4882a593Smuzhiyun { 19*4882a593Smuzhiyun QMutexLocker locker(&mutex); 20*4882a593Smuzhiyun 21*4882a593Smuzhiyun+ QNetworkConfigurationPrivatePointer defaultConfiguration; 22*4882a593Smuzhiyun+ 23*4882a593Smuzhiyun+ if (getenv("QT_NETWORK_PREFER_ACTIVE")) 24*4882a593Smuzhiyun+ goto prefer_active; 25*4882a593Smuzhiyun+ 26*4882a593Smuzhiyun for (QBearerEngine *engine : sessionEngines) { 27*4882a593Smuzhiyun QNetworkConfigurationPrivatePointer ptr = engine->defaultConfiguration(); 28*4882a593Smuzhiyun if (ptr) { 29*4882a593Smuzhiyun@@ -113,7 +118,6 @@ QNetworkConfiguration QNetworkConfigurationManagerPrivate::defaultConfiguration( 30*4882a593Smuzhiyun // Engines don't have a default configuration. 31*4882a593Smuzhiyun 32*4882a593Smuzhiyun // Return first active snap 33*4882a593Smuzhiyun- QNetworkConfigurationPrivatePointer defaultConfiguration; 34*4882a593Smuzhiyun 35*4882a593Smuzhiyun for (QBearerEngine *engine : sessionEngines) { 36*4882a593Smuzhiyun const auto locker = qt_scoped_lock(engine->mutex); 37*4882a593Smuzhiyun@@ -139,6 +143,7 @@ QNetworkConfiguration QNetworkConfigurationManagerPrivate::defaultConfiguration( 38*4882a593Smuzhiyun return config; 39*4882a593Smuzhiyun } 40*4882a593Smuzhiyun 41*4882a593Smuzhiyun+prefer_active: 42*4882a593Smuzhiyun /* 43*4882a593Smuzhiyun No Active or Discovered SNAPs, find the perferred access point. 44*4882a593Smuzhiyun The following priority order is used: 45*4882a593Smuzhiyun-- 46*4882a593Smuzhiyun2.20.1 47*4882a593Smuzhiyun 48