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

[AFV] style: use "m_" prefix as it makes the functions easier to read

Browse Source
This commit is contained in:
Klaus Basan
2020-01-27 15:32:46 +01:00
committed by Mat Sutcliffe
parent 34817a83d5
commit 7dcfed613f
3 changed files with 25 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/blackcore/afv/connection/clientconnection.cpp
View File

@@ -156,7 +156,7 @@ namespace BlackCore
CryptoDtoSerializer::Deserializer deserializer = CryptoDtoSerializer::deserialize(*m_connection.m_voiceCryptoChannel, messageDdata, loopback);
if (deserializer.dtoNameBuffer == AudioRxOnTransceiversDto::getShortDtoName())
if (deserializer.m_dtoNameBuffer == AudioRxOnTransceiversDto::getShortDtoName())
{
// qDebug() << "Received audio data";
const AudioRxOnTransceiversDto audioOnTransceiverDto = deserializer.getDto<AudioRxOnTransceiversDto>();
@@ -165,14 +165,14 @@ namespace BlackCore
emit audioReceived(audioOnTransceiverDto);
}
}
else if (deserializer.dtoNameBuffer == HeartbeatAckDto::getShortDtoName())
else if (deserializer.m_dtoNameBuffer == HeartbeatAckDto::getShortDtoName())
{
m_connection.setTsHeartbeatToNow();
if (CBuildConfig::isLocalDeveloperDebugBuild()) { CLogMessage(this).debug(u"Received voice server heartbeat"); }
}
else
{
CLogMessage(this).warning(u"Received unknown data: %1 %2") << QString(deserializer.dtoNameBuffer) << deserializer.dataLength;
CLogMessage(this).warning(u"Received unknown data: %1 %2") << QString(deserializer.m_dtoNameBuffer) << deserializer.m_dataLength;
}
}

24
src/blackcore/afv/crypto/cryptodtoserializer.cpp
View File

@@ -28,19 +28,19 @@ namespace BlackCore
QBuffer buffer(&data);
buffer.open(QIODevice::ReadOnly);
buffer.read((char *)&headerLength, sizeof(headerLength));
buffer.read((char *)&m_headerLength, sizeof(m_headerLength));
QByteArray headerBuffer = buffer.read(headerLength);
QByteArray headerBuffer = buffer.read(m_headerLength);
msgpack::object_handle oh = msgpack::unpack(headerBuffer.data(), headerBuffer.size());
header = oh.get().as<CryptoDtoHeaderDto>();
m_header = oh.get().as<CryptoDtoHeaderDto>();
if (header.Mode == CryptoDtoMode::AEAD_ChaCha20Poly1305)
if (m_header.Mode == CryptoDtoMode::AEAD_ChaCha20Poly1305)
{
int aeLength = buffer.size() - (2 + headerLength);
int aeLength = buffer.size() - (2 + m_headerLength);
const QByteArray aePayloadBuffer = buffer.read(aeLength);
const QByteArray adBuffer = data.left(2 + headerLength);
const QByteArray adBuffer = data.left(2 + m_headerLength);
QByteArray nonce;
nonce.fill(0, crypto_aead_chacha20poly1305_IETF_NPUBBYTES);
@@ -48,7 +48,7 @@ namespace BlackCore
nonceBuffer.open(QIODevice::WriteOnly);
uint32_t id = 0;
nonceBuffer.write(reinterpret_cast<const char *>(&id), sizeof(id));
nonceBuffer.write(reinterpret_cast<const char *>(&header.Sequence), sizeof(header.Sequence));
nonceBuffer.write(reinterpret_cast<const char *>(&m_header.Sequence), sizeof(m_header.Sequence));
nonceBuffer.close();
QByteArray decryptedPayload;
@@ -73,12 +73,12 @@ namespace BlackCore
QBuffer decryptedPayloadBuffer(&decryptedPayload);
decryptedPayloadBuffer.open(QIODevice::ReadOnly);
decryptedPayloadBuffer.read((char *)&dtoNameLength, sizeof(dtoNameLength));
dtoNameBuffer = decryptedPayloadBuffer.read(dtoNameLength);
decryptedPayloadBuffer.read((char *)&m_dtoNameLength, sizeof(m_dtoNameLength));
m_dtoNameBuffer = decryptedPayloadBuffer.read(m_dtoNameLength);
decryptedPayloadBuffer.read((char *)&dataLength, sizeof(dataLength));
dataBuffer = decryptedPayloadBuffer.read(dataLength);
verified = true;
decryptedPayloadBuffer.read((char *)&m_dataLength, sizeof(m_dataLength));
m_dataBuffer = decryptedPayloadBuffer.read(m_dataLength);
m_verified = true;
}
}
}

20
src/blackcore/afv/crypto/cryptodtoserializer.h
View File

@@ -131,10 +131,10 @@ namespace BlackCore
template<typename T>
T getDto()
{
if (! verified) return {};
if (dtoNameBuffer == T::getDtoName() || dtoNameBuffer == T::getShortDtoName())
if (! m_verified) return {};
if (m_dtoNameBuffer == T::getDtoName() || m_dtoNameBuffer == T::getShortDtoName())
{
msgpack::object_handle oh2 = msgpack::unpack(dataBuffer.data(), dataBuffer.size());
msgpack::object_handle oh2 = msgpack::unpack(m_dataBuffer.data(), static_cast<std::size_t>(m_dataBuffer.size()));
msgpack::object obj = oh2.get();
T dto = obj.as<T>();
return dto;
@@ -143,21 +143,21 @@ namespace BlackCore
}
//! Header data @{
quint16 headerLength;
CryptoDtoHeaderDto header;
quint16 m_headerLength;
CryptoDtoHeaderDto m_header;
//! @}
//! Name data @{
quint16 dtoNameLength;
QByteArray dtoNameBuffer;
quint16 m_dtoNameLength;
QByteArray m_dtoNameBuffer;
//! @}
//! Data @{
quint16 dataLength;
QByteArray dataBuffer;
quint16 m_dataLength;
QByteArray m_dataBuffer;
//! @}
bool verified = false; //!< is verified
bool m_verified = false; //!< is verified
};
//! Deserialize