flightsimulatorplatfrom/pilotclient
1
0
Fork 0
mirror of https://github.com/swift-project/pilotclient.git synced 2026-04-05 01:05:34 +08:00
Code Issues Packages Projects Releases Wiki Activity

Ref T295, based on bug report of RP (no WIFI detected) creating a network report

Browse Source 
* network report when starting swift
* also ignore inactive configs when checking for "the bearer bug"

references:
https://stackoverflow.com/questions/51824242/disable-qt-bearer-management-at-runtime
https://swift-project.slack.com/archives/G7GD2UP9C/p1534181224000115
https://swift-project.slack.com/archives/G96QTUBEG/p1534162173000320
This commit is contained in:
Klaus Basan
2018-08-13 23:23:33 +02:00
parent 35f15b302b
commit 0327776edd
6 changed files with 115 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

72
src/blackmisc/network/networkutils.cpp
View File

@@ -34,6 +34,7 @@
#include <QTextStream>
#include <QUrl>
#include <QUrlQuery>
#include <QStringBuilder>
#include <QEventLoop>
#include <QVariant>
#include <QtDebug>
@@ -386,7 +387,7 @@ namespace BlackMisc
return CNetworkUtils::createNetworkReport(CUrl(), am);
}
CStatusMessageList CNetworkUtils::createNetworkReport(const CUrl &url, const QNetworkAccessManager *am)
CStatusMessageList CNetworkUtils::createNetworkReport(const CUrl &url, const QNetworkAccessManager *qam)
{
static const CLogCategoryList cats({CLogCategory::network()});
CStatusMessageList msgs;
@@ -410,25 +411,74 @@ namespace BlackMisc
}
}
if (am)
if (qam)
{
const bool accessible = am->networkAccessible() == QNetworkAccessManager::Accessible;
const QNetworkConfiguration c = am->configuration();
static const QMetaEnum enumAccessible = QMetaEnum::fromType<QNetworkAccessManager::NetworkAccessibility>();
const QString msg = QString("Accessible: %1 (%2) config: %3").arg(
boolToYesNo(accessible),
enumAccessible.valueToKey(am->networkAccessible()),
networkConfigurationToString(c));
const QString msg = CNetworkUtils::createNetworkAccessManagerReport(qam);
const bool accessible = qam->networkAccessible() == QNetworkAccessManager::Accessible;
msgs.push_back(CStatusMessage(cats, accessible ? CStatusMessage::SeverityInfo : CStatusMessage::SeverityError, msg));
}
return msgs;
}
QString CNetworkUtils::createNetworkConfigurationReport(const QNetworkConfigurationManager *qcm, const QNetworkAccessManager *qam, const QString &separator)
{
if (!qcm) { return QStringLiteral("No configuration manager"); }
static const QString empty;
QString report;
int c = 0;
int active = 0;
int inActive = 0;
int valid = 0;
for (const QNetworkConfiguration &config : qcm->allConfigurations())
{
if (config.state() == QNetworkConfiguration::Active) { active++; }
else { inActive++; }
if (config.isValid()) { valid++; }
report +=
(report.isEmpty() ? empty : separator) %
QString::number(++c) % QStringLiteral(": ") %
CNetworkUtils::networkConfigurationToString(config);
}
if (c < 1)
{
report = QStringLiteral("No network configurations!");
}
else
{
static const QString count("Network configurations: active %1 / inactive %2 / valid %3");
report +=
(report.isEmpty() ? empty : separator) %
count.arg(active).arg(inActive).arg(valid);
}
if (qam)
{
report +=
(report.isEmpty() ? empty : separator) %
QStringLiteral("QAM: ") %
CNetworkUtils::createNetworkAccessManagerReport(qam);
}
return report;
}
QString CNetworkUtils::createNetworkAccessManagerReport(const QNetworkAccessManager *qam)
{
static const QMetaEnum enumAccessible = QMetaEnum::fromType<QNetworkAccessManager::NetworkAccessibility>();
static const QString info("Accessible: '%1' (%2) config: '%3'");
const bool accessible = qam->networkAccessible() == QNetworkAccessManager::Accessible;
return info.arg(boolToYesNo(accessible), enumAccessible.valueToKey(qam->networkAccessible()), CNetworkUtils::networkConfigurationToString(qam->configuration()));
}
QString CNetworkUtils::networkConfigurationToString(const QNetworkConfiguration &configuration)
{
static const QString s("%1 %2 valid: %3 %4 %5");
static const QString s("'%1' '%2' valid: '%3' '%4' '%5'");
const QString stateFlagsStr = networkStatesToString(configuration.state());
return s.arg(configuration.name(), configuration.identifier(), boolToYesNo(configuration.isValid()), stateFlagsStr, networkTypeToString(configuration.type()));
}

9
src/blackmisc/network/networkutils.h
View File

@@ -18,6 +18,7 @@
#include <QNetworkRequest>
#include <QNetworkAccessManager>
#include <QNetworkConfigurationManager>
#include <QNetworkConfiguration>
#include <QString>
#include <QStringList>
@@ -158,7 +159,13 @@ namespace BlackMisc
//! Status about network, can be used when an URL fails to resolve issues
//! \remark that can take a moment to complete, as it checks network
static BlackMisc::CStatusMessageList createNetworkReport(const CUrl &url, const QNetworkAccessManager *am = nullptr);
static BlackMisc::CStatusMessageList createNetworkReport(const CUrl &url, const QNetworkAccessManager *qam = nullptr);
//! Info about network configurations
static QString createNetworkConfigurationReport(const QNetworkConfigurationManager *qcm, const QNetworkAccessManager *qam, const QString &separator = "\n");
//! Report for QAM
static QString createNetworkAccessManagerReport(const QNetworkAccessManager *qam);
//! Configuration as string
static QString networkConfigurationToString(const QNetworkConfiguration &configuration);