From 7dcfed613f4f4221a24e0e121d4581fc08db91cc Mon Sep 17 00:00:00 2001 From: Klaus Basan Date: Mon, 27 Jan 2020 15:32:46 +0100 Subject: [PATCH] [AFV] style: use "m_" prefix as it makes the functions easier to read --- .../afv/connection/clientconnection.cpp | 6 ++--- .../afv/crypto/cryptodtoserializer.cpp | 24 +++++++++---------- .../afv/crypto/cryptodtoserializer.h | 20 ++++++++-------- 3 files changed, 25 insertions(+), 25 deletions(-) diff --git a/src/blackcore/afv/connection/clientconnection.cpp b/src/blackcore/afv/connection/clientconnection.cpp index e12e910b1..327a229d4 100644 --- a/src/blackcore/afv/connection/clientconnection.cpp +++ b/src/blackcore/afv/connection/clientconnection.cpp @@ -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(); @@ -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; } } diff --git a/src/blackcore/afv/crypto/cryptodtoserializer.cpp b/src/blackcore/afv/crypto/cryptodtoserializer.cpp index 9749125d1..ecc25f968 100644 --- a/src/blackcore/afv/crypto/cryptodtoserializer.cpp +++ b/src/blackcore/afv/crypto/cryptodtoserializer.cpp @@ -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(); + m_header = oh.get().as(); - 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(&id), sizeof(id)); - nonceBuffer.write(reinterpret_cast(&header.Sequence), sizeof(header.Sequence)); + nonceBuffer.write(reinterpret_cast(&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; } } } diff --git a/src/blackcore/afv/crypto/cryptodtoserializer.h b/src/blackcore/afv/crypto/cryptodtoserializer.h index 4545e910f..773b9c645 100644 --- a/src/blackcore/afv/crypto/cryptodtoserializer.h +++ b/src/blackcore/afv/crypto/cryptodtoserializer.h @@ -131,10 +131,10 @@ namespace BlackCore template 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(m_dataBuffer.size())); msgpack::object obj = oh2.get(); T dto = obj.as(); 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