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

Ref T730, CPP check issues fixed

Browse Source
This commit is contained in:
Klaus Basan
2019-10-11 15:05:11 +02:00
committed by Mat Sutcliffe
parent 1d9cd50463
commit 30baa12a86
11 changed files with 221 additions and 222 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/blackcore/afv/audio/callsignsampleprovider.cpp
View File

@@ -187,10 +187,11 @@ namespace BlackCore
{ {
if (m_receiver->getFrequencyHz() < 30000000) if (m_receiver->getFrequencyHz() < 30000000)
{ {
/**
double crackleFactor = (((qExp(m_distanceRatio) * qPow(m_distanceRatio, -4.0)) / 350.0) - 0.00776652); double crackleFactor = (((qExp(m_distanceRatio) * qPow(m_distanceRatio, -4.0)) / 350.0) - 0.00776652);
if (crackleFactor < 0.0f) { crackleFactor = 0.00f; } if (crackleFactor < 0.0f) { crackleFactor = 0.00f; }
if (crackleFactor > 0.20f) { crackleFactor = 0.20f; } if (crackleFactor > 0.20f) { crackleFactor = 0.20f; }
**/
m_hfWhiteNoise->setGain(m_hfWhiteNoiseGainMin); m_hfWhiteNoise->setGain(m_hfWhiteNoiseGainMin);
m_acBusNoise->setGain(m_acBusGainMin + 0.001f); m_acBusNoise->setGain(m_acBusGainMin + 0.001f);

9
src/blackcore/afv/audio/input.cpp
View File

@@ -156,14 +156,11 @@ namespace BlackCore
samples = convertFromStereoToMono(samples); samples = convertFromStereoToMono(samples);
} }
int value = 0;
for (qint16 &sample : samples) for (qint16 &sample : samples)
{ {
value = qRound(sample * m_volume); int value = qRound(sample * m_volume);
if (value > std::numeric_limits<qint16>::max()) if (value > std::numeric_limits<qint16>::max()) value = std::numeric_limits<qint16>::max();
value = std::numeric_limits<qint16>::max(); if (value < std::numeric_limits<qint16>::min()) value = std::numeric_limits<qint16>::min();
if (value < std::numeric_limits<qint16>::min())
value = std::numeric_limits<qint16>::min();
sample = static_cast<qint16>(value); sample = static_cast<qint16>(value);
qint16 sampleInput = qAbs(sample); qint16 sampleInput = qAbs(sample);

30
src/blackcore/afv/crypto/cryptodtochannel.cpp
View File

@@ -7,6 +7,9 @@
*/ */
#include "cryptodtochannel.h" #include "cryptodtochannel.h"
#include "blackmisc/verify.h"
using namespace BlackMisc;
namespace BlackCore namespace BlackCore
{ {
@@ -14,26 +17,18 @@ namespace BlackCore
{ {
namespace Crypto namespace Crypto
{ {
CCryptoDtoChannel::CCryptoDtoChannel(QString channelTag, const QByteArray &aeadReceiveKey, const QByteArray &aeadTransmitKey, int receiveSequenceHistorySize) CCryptoDtoChannel::CCryptoDtoChannel(const QString &channelTag, const QByteArray &aeadReceiveKey, const QByteArray &aeadTransmitKey, int receiveSequenceHistorySize):
{ m_aeadTransmitKey(aeadTransmitKey), m_aeadReceiveKey(aeadReceiveKey), m_receiveSequenceSizeMaxSize(receiveSequenceHistorySize), m_channelTag(channelTag)
m_channelTag = channelTag;
m_aeadReceiveKey = aeadReceiveKey;
m_aeadTransmitKey = aeadTransmitKey;
m_receiveSequenceSizeMaxSize = receiveSequenceHistorySize; {
if (m_receiveSequenceSizeMaxSize < 1) { m_receiveSequenceSizeMaxSize = 1; } if (m_receiveSequenceSizeMaxSize < 1) { m_receiveSequenceSizeMaxSize = 1; }
m_receiveSequenceHistory.fill(0, m_receiveSequenceSizeMaxSize); m_receiveSequenceHistory.fill(0, m_receiveSequenceSizeMaxSize);
m_receiveSequenceHistoryDepth = 0; m_receiveSequenceHistoryDepth = 0;
} }
CCryptoDtoChannel::CCryptoDtoChannel(CryptoDtoChannelConfigDto channelConfig, int receiveSequenceHistorySize) CCryptoDtoChannel::CCryptoDtoChannel(const CryptoDtoChannelConfigDto &channelConfig, int receiveSequenceHistorySize) :
m_aeadTransmitKey(channelConfig.aeadTransmitKey), m_aeadReceiveKey(channelConfig.aeadReceiveKey), m_receiveSequenceSizeMaxSize(receiveSequenceHistorySize), m_hmacKey(channelConfig.hmacKey), m_channelTag(channelConfig.channelTag)
{ {
m_channelTag = channelConfig.channelTag;
m_aeadReceiveKey = channelConfig.aeadReceiveKey;
m_aeadTransmitKey = channelConfig.aeadTransmitKey;
m_hmacKey = channelConfig.hmacKey;
m_receiveSequenceSizeMaxSize = receiveSequenceHistorySize;
if (m_receiveSequenceSizeMaxSize < 1) { m_receiveSequenceSizeMaxSize = 1; } if (m_receiveSequenceSizeMaxSize < 1) { m_receiveSequenceSizeMaxSize = 1; }
m_receiveSequenceHistory.fill(0, m_receiveSequenceSizeMaxSize); m_receiveSequenceHistory.fill(0, m_receiveSequenceSizeMaxSize);
m_receiveSequenceHistoryDepth = 0; m_receiveSequenceHistoryDepth = 0;
@@ -46,7 +41,8 @@ namespace BlackCore
case CryptoDtoMode::AEAD_ChaCha20Poly1305: return m_aeadTransmitKey; case CryptoDtoMode::AEAD_ChaCha20Poly1305: return m_aeadTransmitKey;
case CryptoDtoMode::Undefined: case CryptoDtoMode::Undefined:
case CryptoDtoMode::None: case CryptoDtoMode::None:
qFatal("GetTransmitKey called with wrong argument."); BLACK_VERIFY_X(false, Q_FUNC_INFO, "GetTransmitKey called with wrong argument.");
break;
} }
return {}; return {};
@@ -63,7 +59,8 @@ namespace BlackCore
case CryptoDtoMode::AEAD_ChaCha20Poly1305: return m_aeadTransmitKey; case CryptoDtoMode::AEAD_ChaCha20Poly1305: return m_aeadTransmitKey;
case CryptoDtoMode::Undefined: case CryptoDtoMode::Undefined:
case CryptoDtoMode::None: case CryptoDtoMode::None:
qFatal("GetTransmitKey called with wrong argument."); BLACK_VERIFY_X(false, Q_FUNC_INFO, "GetTransmitKey called with wrong argument.");
break;
} }
return {}; return {};
@@ -81,7 +78,8 @@ namespace BlackCore
case CryptoDtoMode::AEAD_ChaCha20Poly1305: return m_aeadReceiveKey; case CryptoDtoMode::AEAD_ChaCha20Poly1305: return m_aeadReceiveKey;
case CryptoDtoMode::Undefined: case CryptoDtoMode::Undefined:
case CryptoDtoMode::None: case CryptoDtoMode::None:
qFatal("getReceiveKey called with wrong argument."); BLACK_VERIFY_X(false, Q_FUNC_INFO, "GetReceiveKey called with wrong argument.");
break;
} }
return {}; return {};

4
src/blackcore/afv/crypto/cryptodtochannel.h
View File

@@ -31,10 +31,10 @@ namespace BlackCore
{ {
public: public:
//! Ctor //! Ctor
CCryptoDtoChannel(QString channelTag, const QByteArray &aeadReceiveKey, const QByteArray &aeadTransmitKey, int receiveSequenceHistorySize = 10); CCryptoDtoChannel(const QString &channelTag, const QByteArray &aeadReceiveKey, const QByteArray &aeadTransmitKey, int receiveSequenceHistorySize = 10);
//! Ctor //! Ctor
CCryptoDtoChannel(CryptoDtoChannelConfigDto channelConfig, int receiveSequenceHistorySize = 10); CCryptoDtoChannel(const CryptoDtoChannelConfigDto &channelConfig, int receiveSequenceHistorySize = 10);
//! Transmit key @{ //! Transmit key @{
QByteArray getTransmitKey(CryptoDtoMode mode); QByteArray getTransmitKey(CryptoDtoMode mode);

1
src/blackcore/context/contextnetworkimpl.cpp
View File

@@ -879,7 +879,6 @@ namespace BlackCore
{ {
if (!m_fsdClient) { return {}; } if (!m_fsdClient) { return {}; }
return m_fsdClient->getPresetValues(); return m_fsdClient->getPresetValues();
return {};
} }
CAtcStation CContextNetwork::getOnlineStationForCallsign(const CCallsign &callsign) const CAtcStation CContextNetwork::getOnlineStationForCallsign(const CCallsign &callsign) const

3
src/blackcore/fsd/clientidentification.cpp
View File

@@ -47,7 +47,8 @@ namespace BlackCore
{ {
BlackMisc::CLogMessage(static_cast<ClientIdentification *>(nullptr)).warning(u"Wrong number of arguments."); BlackMisc::CLogMessage(static_cast<ClientIdentification *>(nullptr)).warning(u"Wrong number of arguments.");
return {}; return {};
}; }
ClientIdentification packet(tokens[0], tokens[2].toUShort(nullptr, 16), tokens[3], tokens[4].toInt(), tokens[5].toInt(), ClientIdentification packet(tokens[0], tokens[2].toUShort(nullptr, 16), tokens[3], tokens[4].toInt(), tokens[5].toInt(),
tokens[6], tokens[7], tokens.size() > 8 ? tokens[8] : QString()); tokens[6], tokens[7], tokens.size() > 8 ? tokens[8] : QString());
return packet; return packet;

5
src/blackcore/fsd/clientidentification.h
View File

@@ -12,6 +12,7 @@
#define BLACKCORE_FSD_CLIENTIDENTIFICATION_H #define BLACKCORE_FSD_CLIENTIDENTIFICATION_H
#include "messagebase.h" #include "messagebase.h"
#include "blackconfig/buildconfig.h"
namespace BlackCore namespace BlackCore
{ {
@@ -34,8 +35,8 @@ namespace BlackCore
std::uint16_t m_clientId; std::uint16_t m_clientId;
QString m_clientName; QString m_clientName;
int m_clientVersionMajor; int m_clientVersionMajor = BlackConfig::CBuildConfig::getVersion().majorVersion();
int m_clientVersionMinor; int m_clientVersionMinor = BlackConfig::CBuildConfig::getVersion().minorVersion();
QString m_userCid; QString m_userCid;
QString m_sysUid; QString m_sysUid;
QString m_initialChallenge; QString m_initialChallenge;

29
src/blackmisc/network/external/qjsonwebtoken.cpp vendored
View File

@@ -13,18 +13,20 @@ QJsonWebToken::QJsonWebToken()
// create the header with default algorithm // create the header with default algorithm
setAlgorithmStr("HS256"); setAlgorithmStr("HS256");
m_jdocPayload = QJsonDocument::fromJson("{}"); m_jdocPayload = QJsonDocument::fromJson("{}");
// default for random generation // default for random generation
m_intRandLength = 10; m_intRandLength = 10;
m_strRandAlphanum = "0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz"; m_strRandAlphanum = "0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz";
} }
QJsonWebToken::QJsonWebToken(const QJsonWebToken &other) QJsonWebToken::QJsonWebToken(const QJsonWebToken &other) :
m_jdocHeader(other.m_jdocHeader),
m_jdocPayload(other.m_jdocPayload),
m_byteSignature(other.m_byteSignature),
m_strSecret(other.m_strSecret),
m_strAlgorithm(other.m_strAlgorithm)
{ {
this->m_jdocHeader = other.m_jdocHeader; // void
this->m_jdocPayload = other.m_jdocPayload;
this->m_byteSignature = other.m_byteSignature;
this->m_strSecret = other.m_strSecret;
this->m_strAlgorithm = other.m_strAlgorithm;
} }
QJsonDocument QJsonWebToken::getHeaderJDoc() const QJsonDocument QJsonWebToken::getHeaderJDoc() const
@@ -45,7 +47,7 @@ bool QJsonWebToken::setHeaderJDoc(const QJsonDocument &jdocHeader)
} }
// check if supported algorithm // check if supported algorithm
QString strAlgorithm = jdocHeader.object().value("alg").toString(""); const QString strAlgorithm = jdocHeader.object().value("alg").toString("");
if (!isAlgorithmSupported(strAlgorithm)) if (!isAlgorithmSupported(strAlgorithm))
{ {
return false; return false;
@@ -214,8 +216,8 @@ bool QJsonWebToken::setToken(const QString &strToken)
// check all parts are valid using another instance, // check all parts are valid using another instance,
// so we dont overwrite this instance in case of error // so we dont overwrite this instance in case of error
QJsonWebToken tempTokenObj; QJsonWebToken tempTokenObj;
if ( !tempTokenObj.setHeaderQStr(QByteArray::fromBase64(listJwtParts.at(0).toUtf8())) || if (!tempTokenObj.setHeaderQStr(QByteArray::fromBase64(listJwtParts.at(0).toUtf8())) ||
!tempTokenObj.setPayloadQStr(QByteArray::fromBase64(listJwtParts.at(1).toUtf8())) ) !tempTokenObj.setPayloadQStr(QByteArray::fromBase64(listJwtParts.at(1).toUtf8())))
{ {
// try unencoded // try unencoded
if (!tempTokenObj.setHeaderQStr(listJwtParts.at(0)) || if (!tempTokenObj.setHeaderQStr(listJwtParts.at(0)) ||
@@ -232,7 +234,8 @@ bool QJsonWebToken::setToken(const QString &strToken)
setHeaderQStr(tempTokenObj.getHeaderQStr()); setHeaderQStr(tempTokenObj.getHeaderQStr());
setPayloadQStr(tempTokenObj.getPayloadQStr()); setPayloadQStr(tempTokenObj.getPayloadQStr());
if (isBase64Encoded) if (isBase64Encoded)
{ // unencode {
// unencode
m_byteSignature = QByteArray::fromBase64(listJwtParts.at(2).toUtf8()); m_byteSignature = QByteArray::fromBase64(listJwtParts.at(2).toUtf8());
} }
else else
@@ -252,7 +255,7 @@ QString QJsonWebToken::getRandAlphanum() const
void QJsonWebToken::setRandAlphanum(const QString &strRandAlphanum) void QJsonWebToken::setRandAlphanum(const QString &strRandAlphanum)
{ {
if(strRandAlphanum.isNull()) if (strRandAlphanum.isNull())
{ {
return; return;
} }
@@ -264,9 +267,9 @@ int QJsonWebToken::getRandLength() const
return m_intRandLength; return m_intRandLength;
} }
void QJsonWebToken::setRandLength(const int &intRandLength) void QJsonWebToken::setRandLength(int intRandLength)
{ {
if(intRandLength < 0 || intRandLength > 1e6) if (intRandLength < 0 || intRandLength > 1e6)
{ {
return; return;
} }

6
src/blackmisc/network/external/qjsonwebtoken.h vendored
View File

@@ -332,7 +332,7 @@ public:
\sa QJsonWebToken::getRandLength() \sa QJsonWebToken::getRandLength()
*/ */
void setRandLength(const int &intRandLength); void setRandLength(int intRandLength);
/** /**
@@ -397,8 +397,8 @@ private:
QString m_strSecret; QString m_strSecret;
QString m_strAlgorithm; QString m_strAlgorithm;
int m_intRandLength ; int m_intRandLength = 10;
QString m_strRandAlphanum; QString m_strRandAlphanum = "0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz";
// helpers // helpers
QByteArray m_byteAllData; QByteArray m_byteAllData;

9
src/blacksound/sampleprovider/resourcesound.cpp
View File

@@ -21,20 +21,19 @@ namespace BlackSound
{ {
namespace SampleProvider namespace SampleProvider
{ {
CResourceSound::CResourceSound() CResourceSound::CResourceSound() : m_data(new CResourceSoundData)
{ {
m_data = new CResourceSoundData; // void
} }
CResourceSound::CResourceSound(const QString &audioFileName) CResourceSound::CResourceSound(const QString &audioFileName) : m_data(new CResourceSoundData)
{ {
m_data = new CResourceSoundData;
m_data->fileName = audioFileName; m_data->fileName = audioFileName;
} }
bool CResourceSound::load() bool CResourceSound::load()
{ {
if (m_data->fileName.isEmpty()) { return false; } if (!m_data || m_data->fileName.isEmpty()) { return false; }
CWavFile wavFile; CWavFile wavFile;
m_data->samples.clear(); m_data->samples.clear();